Ajout : print() de développement.

[burette/pos_membership.git] / pos_membership.py

diff --git a/pos_membership.py b/pos_membership.py
index 3f05a1f..49483cb 100644 (file)
--- a/pos_membership.py
+++ b/pos_membership.py
@@ -67,6 +67,7 @@ class membership_line(osv.osv):
     def _get_membership_lines_from_pos_order(self, cr, uid, ids, context=None):
         list_membership_line = []
         member_line_obj = self.pool.get('membership.membership_line')
+        print("DEV: [pos_membership] [membership_line] [_get_membership_lines_from_pos_order]: ids=%s context=%s" % (str(ids), str(context)))
         for order in self.pool.get('pos.order').browse(cr, uid, ids, context=context):
             if order.lines:
                 list_membership_line += member_line_obj.search(cr, uid, [('pos_order_line', 'in', [ l.id for l in order.lines])], context=context)
@@ -180,8 +181,9 @@ class membership_line(osv.osv):
                 if not fetched:
                     res[line.id] = 'canceled'
                     continue
-                self.write(cr, uid, line.id, {'partner': fetched[2]})
-                # NOTE: force un mise à jour du partner,
+                partner_id = fetched[2]
+                self.write(cr, uid, line.id, {'partner': 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)
                 ostate = fetched[0]
@@ -245,6 +247,7 @@ class Partner(osv.osv):
     _inherit = 'res.partner'
 
     def _get_partner_id(self, cr, uid, ids, context=None):
+        print("DEV: [pos_membership] [Partner] [_get_partner_id]: ids=%s context=%s" % (str(ids), str(context)))
         member_line_obj = self.pool.get('membership.membership_line')
         res_obj =  self.pool.get('res.partner')
         data_inv = member_line_obj.browse(cr, uid, ids, context=context)
@@ -255,6 +258,7 @@ class Partner(osv.osv):
         while ids2:
             ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
             list_partner += ids2
+        print("DEV: [pos_membership] [Partner] [_get_partner_id]: res=%s" % (str(list_partner)))
         return list_partner
 
     def _get_invoice_partner(self, cr, uid, ids, context=None):
@@ -299,6 +303,7 @@ class Partner(osv.osv):
             res[id] = 'none'
         today = time.strftime('%Y-%m-%d')
         for id in ids:
+            print("DEV: [pos_membership] [Partner] [_membership_state] id=%s" % (str(id)))
             partner_data = self.browse(cr, uid, id, context=context)
             if partner_data.membership_cancel and today > partner_data.membership_cancel:
                 res[id] = 'canceled'
@@ -307,6 +312,7 @@ class Partner(osv.osv):
                 res[id] = 'old'
                 continue
             s = 4
+            print("DEV: [pos_membership] [Partner] [_membership_state] [partner_data] [member_lines] [test]")
             if partner_data.member_lines:
                 print("DEV: [pos_membership] [Partner] [_membership_state] [partner_data] [member_lines]" % ())
                 for mline in partner_data.member_lines:
@@ -390,6 +396,7 @@ class Partner(osv.osv):
         name = name[0]
         res = {}
         member_line_obj = self.pool.get('membership.membership_line')
+        print("DEV: [pos_membership] [Partner] [_membership_date]: ids=%s" % (str(ids)))
         for partner in self.browse(cr, uid, ids, context=context):
             if partner.associate_member:
                  partner_id = partner.associate_member.id
@@ -406,6 +413,7 @@ class Partner(osv.osv):
                 if line_id:
                         res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
                                 ['date_from'], context=context)['date_from']
+                        print("DEV: [pos_membership] [Partner] [_membership_date] [membership_start]: ids=%s date=%s" % (str(ids), str(res[partner.id]['membership_start'])))
 
             if name == 'membership_stop':
                 line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)],
@@ -413,12 +421,15 @@ class Partner(osv.osv):
                 if line_id1:
                       res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
                                 ['date_to'], context=context)['date_to']
+                      print("DEV: [pos_membership] [Partner] [_membership_date] [membership_stop]: ids=%s date=%s" % (str(ids), str(res[partner.id]['membership_stop'])))
 
             if name == 'membership_cancel':
                 if partner.membership_state == 'canceled':
                     line_id2 = member_line_obj.search(cr, uid, [('partner', '=', partner.id)], limit=1, order='date_cancel', context=context)
                     if line_id2:
                         res[partner.id]['membership_cancel'] = member_line_obj.read(cr, uid, line_id2[0], ['date_cancel'], context=context)['date_cancel']
+                        print("DEV: [pos_membership] [Partner] [_membership_date] [membership_cancel]: ids=%s date=%s" % (str(ids), str(res[partner.id]['membership_cancel'])))
+        print("DEV: [pos_membership] [Partner] [_membership_date]: res=%s" % (str(res)))
         return res
 
     def _get_partners(self, cr, uid, ids, context=None):
@@ -437,10 +448,13 @@ class Partner(osv.osv):
                     string = 'Current Membership Status', type = 'selection',
                     selection = STATE,
                     store = {
-                        'account.invoice': (_get_invoice_partner, ['state'], 10),
-                        'pos.order': (_get_order_partner, ['state', 'partner_id'], 10),
-                        'membership.membership_line': (_get_partner_id, ['state'], 10),
-                        'res.partner': (_get_partners, ['free_member', 'membership_state', 'associate_member'], 10)
+                        # NOTE: il est important que la priorité soit plus grande
+                        #       que les membership_{start,stop,cancel}
+                        #       car _membership_state s'en sert et doit donc les trouver à jour.
+                        'account.invoice': (_get_invoice_partner, ['state'], 20),
+                        'pos.order': (_get_order_partner, ['state', 'partner_id'], 20),
+                        'membership.membership_line': (_get_partner_id, ['state'], 20),
+                        'res.partner': (_get_partners, ['free_member', 'membership_state', 'associate_member'], 20)
                     }, help="""It indicates the membership state.
                     -Non Member: A partner who has not applied for any membership.
                     -Cancelled Member: A member who has cancelled his membership.
@@ -453,8 +467,8 @@ class Partner(osv.osv):
                     string = 'Membership Start Date', type = 'date',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
-                        'pos.order': (_get_order_partner, ['state'], 10),
-                        'membership.membership_line': (_get_partner_id, ['state'], 10, ),
+                        'pos.order': (_get_order_partner, ['state', 'partner_id'], 10),
+                        'membership.membership_line': (_get_partner_id, ['state'], 10),
                         'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
                     }, help="Date from which membership becomes active."),
         'membership_stop': fields.function(
@@ -462,7 +476,7 @@ class Partner(osv.osv):
                     string = 'Membership End Date', type='date', multi='membership_stop',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
-                        'pos.order': (_get_order_partner, ['state'], 10),
+                        'pos.order': (_get_order_partner, ['state', 'partner_id'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
                         'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
                     }, help="Date until which membership remains active."),
@@ -471,7 +485,7 @@ class Partner(osv.osv):
                     string = 'Cancel Membership Date', type='date', multi='membership_cancel',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 11),
-                        'pos.order': (_get_order_partner, ['state'], 11),
+                        'pos.order': (_get_order_partner, ['state', 'partner_id'], 11),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
                         'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
                     }, help="Date on which membership has been cancelled"),