[grouped] [date2date] : fix double invoice lines.

[burette/remembership.git] / remembership.py

diff --git a/remembership.py b/remembership.py
index ee17cb1..fbf06f4 100644 (file)
--- a/remembership.py
+++ b/remembership.py
@@ -40,6 +40,44 @@ class Partner(osv.osv):
         ('member_ident_uniq', 'unique(member_ident, company_id)', 'The member identifier must be unique !'),
     ]
 
         ('member_ident_uniq', 'unique(member_ident, company_id)', 'The member identifier must be unique !'),
     ]
 

+    def _membership_date(self, cr, uid, ids, name, args, context=None):
+        """Return  date of membership"""
+        name = name[0]
+        res = {}
+        member_line_obj = self.pool.get('membership.membership_line')
+        for partner in self.browse(cr, uid, ids, context=context):
+            #if partner.associate_member:
+            #     partner_id = partner.associate_member.id
+            #else:
+            # NOTE: hmm, ça devrait être toujours partner.id
+            partner_id = partner.id
+            res[partner.id] = {
+                 'membership_start': False,
+                 'membership_stop': False,
+                 'membership_cancel': False
+            }
+            if name == 'membership_start':
+                line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)],
+                            limit=1, order='date_from', context=context)
+                if line_id:
+                        res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
+                                ['date_from'], context=context)['date_from']
+
+            if name == 'membership_stop':
+                line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)],
+                            limit=1, order='date_to desc', context=context)
+                if line_id1:
+                      res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
+                                ['date_to'], context=context)['date_to']
+
+            if name == 'membership_cancel':
+                if partner.membership_state == 'canceled':
+                    # NOTE: hmm, partner_id et pas partner.id ?
+                    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']
+        return res
+

     def create_membership_invoice(self, cr, uid, ids, product_id=None, datas=None, context=None):
         # NOTE: use context to supply date_from to account_invoice_line.create
         ctx = context and context.copy() or {}
     def create_membership_invoice(self, cr, uid, ids, product_id=None, datas=None, context=None):
         # NOTE: use context to supply date_from to account_invoice_line.create
         ctx = context and context.copy() or {}


@@ -84,6 +122,8 @@ class account_invoice_line(osv.osv):
                             date_to   = date_from + relativedelta(months = +12) # TODO: parameterize this delta?
                             date_from = date_from.strftime("%Y-%m-%d")
                             date_to   = date_to  .strftime("%Y-%m-%d")
                             date_to   = date_from + relativedelta(months = +12) # TODO: parameterize this delta?
                             date_from = date_from.strftime("%Y-%m-%d")
                             date_to   = date_to  .strftime("%Y-%m-%d")

+                        print ("DEV: [write] date_from: %s" % str(date_from))
+                        print ("DEV: [write] date_to  : %s" % str(date_to))

                         member_line_obj.write(cr, uid, member_line.id
                           , {'date_from': date_from
                             ,'date_to'  : date_to
                         member_line_obj.write(cr, uid, member_line.id
                           , {'date_from': date_from
                             ,'date_to'  : date_to


@@ -91,23 +131,30 @@ class account_invoice_line(osv.osv):
                           , context=context)
                     if line.product_id.membership_grouped:
                         if line.invoice_id.partner_id.associate_members:
                           , context=context)
                     if line.product_id.membership_grouped:
                         if line.invoice_id.partner_id.associate_members:

-                            for associate_member in line.invoice_id.partner_id.associate_members:
-                                member_line_obj.create(cr, uid, {
-                                    'partner': associate_member.id,
-                                    'membership_id': line.product_id.id,
-                                    'member_price': line.price_unit,
-                                    'date': time.strftime('%Y-%m-%d'),
-                                    'date_from': date_from,
-                                    'date_to': date_to,
-                                    'account_invoice_line': line.id,
-                                }, context=context)
+                            associate_ml_ids = member_line_obj.search(cr, uid
+                              , [ ('account_invoice_line', '=', line.id)
+                                , ('partner', '!=', line.invoice_id.partner_id.id)
+                                ]
+                              , context=context)
+                            for associate_member_line in member_line_obj.browse(cr, uid, associate_ml_ids, context=context):
+                                print ("DEV: [write] [associate] date_from: %s" % str(date_from))
+                                print ("DEV: [write] [associate] date_to  : %s" % str(date_to))
+                                member_line_obj.write(cr, uid, associate_member_line.id
+                                  , {'date_from': date_from
+                                    ,'date_to'  : date_to
+                                    }
+                                  , context=context)

                         else:
                             print("DEV: mettre une contrainte pour l'objet\
                                   membership.membership_line interdisant les\
                                   adhésions groupées reliées à des partenaires\
                                   sans membres associés")
                     else:
                         else:
                             print("DEV: mettre une contrainte pour l'objet\
                                   membership.membership_line interdisant les\
                                   adhésions groupées reliées à des partenaires\
                                   sans membres associés")
                     else:

-                        associate_ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line', '=', line.id), ('partner', '!=', line.invoice_id.partner_id.id)], context=context)
+                        associate_ml_ids = member_line_obj.search(cr, uid
+                          , [ ('account_invoice_line', '=', line.id)
+                            , ('partner', '!=', line.invoice_id.partner_id.id)
+                            ]
+                          , context=context)

                         member_line_obj.unlink(cr, uid, associate_ml_ids, context=context)
 
                     #Define member ident if it's necessary
                         member_line_obj.unlink(cr, uid, associate_ml_ids, context=context)
 
                     #Define member ident if it's necessary


@@ -144,8 +191,8 @@ class account_invoice_line(osv.osv):
                     date_to   = date_from + relativedelta(months = +12) # TODO: parameterize this delta?
                     date_from = date_from.strftime("%Y-%m-%d")
                     date_to   = date_to  .strftime("%Y-%m-%d")
                     date_to   = date_from + relativedelta(months = +12) # TODO: parameterize this delta?
                     date_from = date_from.strftime("%Y-%m-%d")
                     date_to   = date_to  .strftime("%Y-%m-%d")

-                print ("DEV: date_from: %s" % str(date_from))
-                print ("DEV: date_to  : %s" % str(date_to))
+                print ("DEV: [create] date_from: %s" % str(date_from))
+                print ("DEV: [create] date_to  : %s" % str(date_to))

                 member_line_obj.write(cr, uid, member_line.id
                   , {'date_from': date_from
                     ,'date_to'  : date_to
                 member_line_obj.write(cr, uid, member_line.id
                   , {'date_from': date_from
                     ,'date_to'  : date_to


@@ -156,8 +203,8 @@ class account_invoice_line(osv.osv):
                 partners.extend(line.invoice_id.partner_id.associate_members)
                 #Adding membership lines just for associate partners
                 for associate_member in line.invoice_id.partner_id.associate_members:
                 partners.extend(line.invoice_id.partner_id.associate_members)
                 #Adding membership lines just for associate partners
                 for associate_member in line.invoice_id.partner_id.associate_members:

-                    print ("DEV: [associate] date_from: %s" % str(date_from))
-                    print ("DEV: [associate] date_to  : %s" % str(date_to))
+                    print ("DEV: [create] [associate] date_from: %s" % str(date_from))
+                    print ("DEV: [create] [associate] date_to  : %s" % str(date_to))

                     member_line_obj.create(cr, uid, {
                         'partner': associate_member.id,
                         'membership_id': line.product_id.id,
                     member_line_obj.create(cr, uid, {
                         'partner': associate_member.id,
                         'membership_id': line.product_id.id,