[DATE2DATE] fix delta in between date_from and date_to

[burette/pos_membership.git] / pos_membership.py

diff --git a/pos_membership.py b/pos_membership.py
index b53eac3..cb81c4c 100644 (file)
--- a/pos_membership.py
+++ b/pos_membership.py
@@ -27,7 +27,6 @@ import time
 from datetime import datetime, date
 from dateutil.relativedelta import relativedelta
 
-
 STATE = [
     ('none', 'Non Member'),
     ('canceled', 'Cancelled Member'),
@@ -689,6 +688,29 @@ class pos_order(osv.osv):
         print("DEV: [pos_membership] [pos_order] [create]: res=%s" % (str(res)))
         return res
 
+    def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
+        if not part:
+            return {'value': {}}
+        res = super(pos_order, self).onchange_partner_id(cr, uid, ids, part=part, context=context)
+        membership_stop = self.pool.get('res.partner').browse(cr, uid, part, context=context).membership_stop
+        res['value']['membership_stop'] = membership_stop
+        return res
+
+    def _get_membership_stop(self, cr, uid, ids, name, args, context=None):
+        """This function return the end date of the partner in pos order."""
+        res = {}
+        for order in self.browse(cr, uid, ids):
+            res[order.id] = order.partner_id.membership_stop
+        return res
+
+    _columns = {
+        'membership_stop': fields.function(
+            _get_membership_stop,
+            string='Membership stop',
+            type='date',
+            help='The end date of the last membership of this partner.',
+        ),
+    }
 pos_order()
 
 class pos_order_line(osv.osv):
@@ -716,7 +738,7 @@ class pos_order_line(osv.osv):
                           and context.get('date_from')
                           and datetime.strptime(context('date_from'), "%Y-%m-%d")
                           or date.today())
-                        date_to   = date_from + relativedelta(months = +12) # TODO: parameterize this delta?
+                        date_to   = date_from + relativedelta(months=+12, days=-1) # TODO: parameterize this delta?
                         date_from = date_from.strftime("%Y-%m-%d")
                         date_to   = date_to  .strftime("%Y-%m-%d")
                     print ("DEV: [pos_membership] [pos_order_line] [write] date_from: %s" % str(date_from))
@@ -794,9 +816,9 @@ class pos_order_line(osv.osv):
                   and context.get('date_from')
                   and datetime.strptime(context.get('date_from'), "%Y-%m-%d")
                   or date.today())
-                date_to   = date_from + relativedelta(days = +364) # TODO: parameterize this delta?
+                date_to   = date_from + relativedelta(months=+12, days=-1) # TODO: parameterize this delta?
                 date_from = date_from.strftime("%Y-%m-%d")
-                date_to   = date_to  .strftime("%Y-%m-%d")
+                date_to   = date_to.strftime("%Y-%m-%d")
             print ("DEV: [pos_membership] [pos_order_line] [create] date_from: %s" % str(date_from))
             print ("DEV: [pos_membership] [pos_order_line] [create] date_to  : %s" % str(date_to))
             member_line_obj.create(cr, uid, {