polissage

diff --git a/remembership.py b/remembership.py
index aee965a..f852df7 100644 (file)
--- a/remembership.py
+++ b/remembership.py
@@ -21,8 +21,8 @@
 #
 ##############################################################################
 
-from osv import osv
-from osv import fields
+from openerp.osv import osv
+from openerp.osv import fields
 import time
 from datetime import datetime, date
 from dateutil.relativedelta import relativedelta
@@ -31,7 +31,7 @@ from openerp.tools.translate import _
 
 class Partner(osv.osv):
     _inherit = 'res.partner'
-
+    
     # XXX: copied from openerp/addons/membership/membership.py
     def _membership_date(self, cr, uid, ids, name, args, context=None):
         """Return  date of membership"""
@@ -61,7 +61,7 @@ class Partner(osv.osv):
                         print ("DEV: [_membership_date] [associate] date_from: %s" % str(res[partner.id]['membership_start']))
                     else:
                         print ("DEV: [_membership_date] date_from: %s" % str(res[partner.id]['membership_start']))
-
+            
             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)
@@ -72,7 +72,7 @@ class Partner(osv.osv):
                         print ("DEV: [_membership_date] [associate] date_to: %s" % str(res[partner.id]['membership_stop']))
                     else:
                         print ("DEV: [_membership_date] date_to: %s" % 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)
@@ -105,7 +105,7 @@ class Partner(osv.osv):
             ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
             list_partner += ids2
         return list_partner
-
+    
     _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.'),
@@ -137,15 +137,15 @@ class Partner(osv.osv):
                         'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
                     }, help="Date on which membership has been cancelled"),
     }
-
+    
     _sql_constraints = [
         ('member_ident_uniq', 'unique(member_ident, company_id)', 'The member identifier must be unique !'),
     ]
-
+    
     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
         context = context and context.copy() or {}
-        context['date_from'] = datas.get('date_from', None)
+        #context.update({'date_from': datas.get('date_from', None)});
         # XXX: copied from openerp/addons/membership/membership.py to fix account_invoice_line creation
         print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s" % str(ids))
         invoice_obj = self.pool.get('account.invoice')
@@ -171,7 +171,7 @@ class Partner(osv.osv):
             line_value =  {
                 'product_id': product_id,
             }
-
+            
             print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s [invoice_line_obj] [product_id_change]" % (str(ids),str(partner.id)))
             line_dict = invoice_line_obj.product_id_change(cr, uid, {},
                             product_id, False, quantity, '', 'out_invoice', partner.id, fpos_id, price_unit=amount, context=context)
@@ -180,7 +180,7 @@ class Partner(osv.osv):
             if line_value.get('invoice_line_tax_id', False):
                 tax_tab = [(6, 0, line_value['invoice_line_tax_id'])]
                 line_value['invoice_line_tax_id'] = tax_tab
-
+            
             print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s [invoice_obj] [create] account=%s" % (str(ids),str(partner.id),str(account_id)))
             # NOTE: let account_invoice_obj.create() call account_invoice_line.create()
             #       to have a correct membership_state: becauce now fields.function 'store' watchdogs
@@ -195,7 +195,9 @@ class Partner(osv.osv):
             #print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s [invoice_line_obj] [create]" % (str(ids),str(partner.id)))
             #invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context=context)
             #invoice_obj.write(cr, uid, invoice_id, {'invoice_line': line_value}, context=context)
+            print ("DEV: [remembership] [partner] [create_membership_invoice] : invoice_list.append(invoice_id) : pre")
             invoice_list.append(invoice_id)
+            print ("DEV: [remembership] [partner] [create_membership_invoice] : invoice_list.append(invoice_id) : post")
             if line_value['invoice_line_tax_id']:
                 tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()
                 for tax in tax_value:
@@ -204,6 +206,7 @@ class Partner(osv.osv):
         #recompute the membership_state of those partners
         #print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s [recompute states]" % str(ids))
         #self.pool.get('res.partner').write(cr, uid, ids, {}, context=context)
+        print ("DEV: [remembership] [partner] [create_membership_invoice] return=%s" % str(invoice_list))
         return invoice_list
 
 Partner()
@@ -211,7 +214,7 @@ Partner()
 
 class Product(osv.osv):
     _inherit = 'product.product'
-
+    
     _columns = {
         'membership_grouped': fields.boolean('Grouped membership product', help='Check if it\'s a grouped membership product.'),
         'membership_date2date': fields.boolean('Date to date membership product', required=False, help='Check if it\'s a date to date membership product.'),
@@ -222,7 +225,7 @@ 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)
@@ -241,14 +244,14 @@ class account_invoice_line(osv.osv):
                         date_to   = member_line.date_to
                         if line.product_id.membership_date2date:
                             date_from = ('date_from' in context
-                              and context['date_from']
-                              and datetime.strptime(context['date_from'], "%Y-%m-%d")
+                              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_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))
+                        print ("DEV: [remembership] [account_invoice_line] [write] date_from: %s" % str(date_from))
+                        print ("DEV: [remembership] [account_invoice_line] [write] date_to  : %s" % str(date_to))
                         member_line_obj.write(cr, uid, member_line.id
                           , {'date_from': date_from
                             ,'date_to'  : date_to
@@ -262,8 +265,8 @@ class account_invoice_line(osv.osv):
                                 ]
                               , context=context)
                             for associate_member_line in member_line_obj.browse(cr, uid, associate_member_line_ids, context=context):
-                                print ("DEV: [write] [associate] date_from: %s" % str(date_from))
-                                print ("DEV: [write] [associate] date_to  : %s" % str(date_to))
+                                print ("DEV: [remembership] [account_invoice_line] [write] [associate] date_from: %s" % str(date_from))
+                                print ("DEV: [remembership] [account_invoice_line] [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
@@ -281,7 +284,6 @@ class account_invoice_line(osv.osv):
                             ]
                           , context=context)
                         member_line_obj.unlink(cr, uid, associate_member_line_ids, context=context)
-
                     #Define member ident if it's necessary
                     partners = [line.invoice_id.partner_id]
                     if line.invoice_id.partner_id.associate_members:
@@ -293,13 +295,15 @@ class account_invoice_line(osv.osv):
                 if line.product_id and not line.product_id.membership and ml_ids:
                     # Product line has changed to a non membership product
                     member_line_obj.unlink(cr, uid, ml_ids, context=context)
+        print ("DEV: [remembership] [account_invoice_line] [write] : return=%s" % str(res))
         return res
-
+    
     def create(self, cr, uid, vals, context=None):
         member_line_obj = self.pool.get('membership.membership_line')
         res = super(account_invoice_line, self).create(cr, uid, vals, context=context)
+        print ("DEV: [remembership] [account_invoice_line] [create] : begin res=%s" % str(res))
         line = self.browse(cr, uid, res, context=context)
-
+    
         if line.invoice_id.type == 'out_invoice' and line.product_id and line.product_id.membership:
             member_line_id = member_line_obj.search(cr, uid
               , [('partner'             , '=', line.invoice_id.partner_id.id)
@@ -312,14 +316,14 @@ class account_invoice_line(osv.osv):
                 date_to   = member_line.date_to
                 if line.product_id.membership_date2date:
                     date_from = ('date_from' in context
-                      and context['date_from']
-                      and datetime.strptime(context['date_from'], "%Y-%m-%d")
+                      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_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))
+                print ("DEV: [remembership] [account_invoice_line] [create] date_from: %s" % str(date_from))
+                print ("DEV: [remembership] [account_invoice_line] [create] date_to  : %s" % str(date_to))
                 member_line_obj.write(cr, uid, member_line.id
                   , {'date_from': date_from
                     ,'date_to'  : date_to
@@ -330,8 +334,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:
-                    print ("DEV: [create] [associate] date_from: %s" % str(date_from))
-                    print ("DEV: [create] [associate] date_to  : %s" % str(date_to))
+                    print ("DEV: [remembership] [account_invoice_line] [create] [associate] date_from: %s" % str(date_from))
+                    print ("DEV: [remembership] [account_invoice_line] [create] [associate] date_to  : %s" % str(date_to))
                     member_line_obj.create(cr, uid, {
                         'partner': associate_member.id,
                         'membership_id': line.product_id.id,
@@ -348,6 +352,7 @@ class account_invoice_line(osv.osv):
                 if not i.member_ident:
                     mbr_id = self.pool.get('ir.sequence').get(cr, uid, 'member_ident')
                     self.pool.get('res.partner').write(cr, uid, i.id, {'member_ident': mbr_id})
+        print ("DEV: [remembership] [account_invoice_line] [create] : return=%s" % str(res))
         return res
 
 account_invoice_line()