X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=remembership.py;h=fbf06f4f531f95d7334afd57a49139db55fab1c7;hb=4554dcedb3f55255098ba0bed0304690ace4563d;hp=b799cc7e58887c26e940536db5383425b50533af;hpb=943fc760ec44efa198b84814c8eb34f9ff5ae7eb;p=burette%2Fremembership.git

diff --git a/remembership.py b/remembership.py
index b799cc7..fbf06f4 100644
--- a/remembership.py
+++ b/remembership.py
@@ -24,6 +24,8 @@
 from osv import osv
 from osv import fields
 import time
+from datetime import datetime, date
+from dateutil.relativedelta import relativedelta
 
 
 class Partner(osv.osv):
@@ -31,12 +33,57 @@ class Partner(osv.osv):
 
     _columns = {
         'member_ident': fields.char('Member identifier', size=64),
+        'associate_members': fields.one2many('res.partner', 'associate_member', 'Associate members', help='Members who are associated to this partner.'),
     }
 
     _sql_constraints = [
         ('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 {}
+        ctx['date_from'] = datas.get('date_from', None)
+        return super(Partner, self).create_membership_invoice(cr, uid, ids, product_id=product_id, datas=datas, context=ctx)
+
 Partner()
 
 
@@ -54,7 +101,6 @@ Product()
 class account_invoice_line(osv.osv):
     _inherit = 'account.invoice.line'
 
-
     def write(self, cr, uid, ids, vals, context=None):
         member_line_obj = self.pool.get('membership.membership_line')
         res = super(account_invoice_line, self).write(cr, uid, ids, vals, context=context)
@@ -62,29 +108,53 @@ class account_invoice_line(osv.osv):
             if line.invoice_id.type == 'out_invoice':
                 ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line', '=', line.id)], context=context)
                 if line.product_id and line.product_id.membership:
-                    date_from = line.product_id.membership_date_from
-                    date_to = line.product_id.membership_date_to
-                    if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
-                        date_from = line.invoice_id.date_invoice
+                    member_line_id = member_line_obj.search(cr, uid
+                      , [('partner'             , '=', line.invoice_id.partner_id.id)
+                        ,('account_invoice_line', '=', line.id)]
+                      , limit=1
+                      , context=context)
+                    for member_line in member_line_obj.browse(cr, uid, member_line_id, context=context):
+                      # NOTE: get member_line created in membership.account_invoice_line.create
+                        date_from = member_line.date_from
+                        date_to   = member_line.date_to
+                        if line.product_id.membership_date2date:
+                            date_from = context['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_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
+                            }
+                          , 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:
-                        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
@@ -106,15 +176,35 @@ class account_invoice_line(osv.osv):
         line = self.browse(cr, uid, res, context=context)
 
         if line.invoice_id.type == 'out_invoice' and line.product_id and line.product_id.membership:
-            date_from = line.product_id.membership_date_from
-            date_to = line.product_id.membership_date_to
-            if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
-                date_from = line.invoice_id.date_invoice
+            member_line_id = member_line_obj.search(cr, uid
+              , [('partner'             , '=', line.invoice_id.partner_id.id)
+                ,('account_invoice_line', '=', line.id)]
+              , limit=1
+              , context=context)
+            for member_line in member_line_obj.browse(cr, uid, member_line_id, context=context):
+              # NOTE: get member_line created in membership.account_invoice_line.create
+                date_from = member_line.date_from
+                date_to   = member_line.date_to
+                if line.product_id.membership_date2date:
+                    print "DEV: line.product_id.membership_date2date"
+                    date_from = context['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_from = date_from.strftime("%Y-%m-%d")
+                    date_to   = date_to  .strftime("%Y-%m-%d")
+                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
+                    }
+                  , context=context)
             partners = [line.invoice_id.partner_id]
             if line.product_id.membership_grouped and 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: [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,