[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 fcfe106..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'),
@@ -257,7 +256,7 @@ class membership_line(osv.osv):
                 res[line.id] = state
             else:
                 cr.execute('''
-                SELECT i.state, i.id, i.partner_id FROM
+                SELECT i.state, i.id FROM
                 pos_order i
                 WHERE
                 i.id = (
@@ -274,13 +273,13 @@ class membership_line(osv.osv):
                 if not fetched:
                     res[line.id] = 'canceled'
                     continue
-                partner_id = fetched[2]
-                self.write(cr, uid, line.id, {'partner': partner_id})
+                print("DEV: [pos_membership] [membership_line] [_state]: line.partner.id=%s" % (str(line.partner.id)))
+                self.write(cr, uid, line.id, {'partner': line.partner.id})
                 # NOTE: force une mise à jour du partner,
                 #       car il n'y en a pas lors de la création du pos.order
                 #       dans le PoS (pour le moment)
                 partner_obj = self.pool.get('res.partner')
-                for partner in partner_obj.browse(cr, uid, [partner_id], context=context):
+                for partner in partner_obj.browse(cr, uid, [line.partner.id], context=context):
                     if not partner.member_ident:
                         mbr_id = self.pool.get('ir.sequence').get(cr, uid, 'member_ident')
                         partner_obj.write(cr, uid, partner.id, {'member_ident': mbr_id})
@@ -304,7 +303,6 @@ class membership_line(osv.osv):
 
     def write(self, cr, uid, ids, vals, context=None):
         print("DEV: [pos_membership] [membership_line] [write]: ids=%s vals=%s" % (str(ids), str(vals)))
-        member_line_obj = self.pool.get('membership.membership_line')
         res = super(membership_line, self).write(cr, uid, ids, vals, context=context)
         print("DEV: [pos_membership] [membership_line] [write]: res=%s" % str(res))
         return res
@@ -690,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):
@@ -704,7 +725,7 @@ class pos_order_line(osv.osv):
             ml_ids = member_line_obj.search(cr, uid, [('pos_order_line', '=', line.id)], context=context)
             if line.product_id and line.product_id.membership:
                 member_line_id = member_line_obj.search(cr, uid
-                  , [('partner', '=', line.invoice_id.partner_id.id)
+                  , [('partner', '=', line.order_id.partner_id.id)
                     ,('pos_order_line', '=', line.id)]
                   , limit=1
                   , context=context)
@@ -717,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))
@@ -731,7 +752,7 @@ class pos_order_line(osv.osv):
                     if line.order_id.partner_id.associate_members:
                         associate_member_line_ids = member_line_obj.search(cr, uid
                       , [ ('pos_order_line', '=', line.id)
-                        , ('partner', '!=', line.invoice_id.partner_id.id)
+                        , ('partner', '!=', line.order_id.partner_id.id)
                         ]
                       , context=context)
                     for associate_member_line in member_line_obj.browse(cr, uid, associate_member_line_ids, context=context):
@@ -795,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, {