[Group] member_ident ok for associate members

[burette/remembership.git] / remembership.py

diff --git a/remembership.py b/remembership.py
index 260e56e..58ba74c 100644 (file)
--- a/remembership.py
+++ b/remembership.py
@@ -24,30 +24,51 @@
 from osv import osv
 from osv import fields
 
 from osv import osv
 from osv import fields
 

+

 class Partner(osv.osv):
     _inherit = 'res.partner'
 
     _columns = {
 class Partner(osv.osv):
     _inherit = 'res.partner'
 
     _columns = {

-        'member_ident': fields.char('Member identifier', size=64, readonly=True),
+        'member_ident': fields.char('Member identifier', size=64),

     }
 
     }
 

+    _sql_constraints = [
+        ('member_ident_uniq', 'unique(member_ident, company_id)', 'The member identifier must be unique !'),
+    ]
+

 Partner()
 
 
 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', help='Check if it\'s a date to date membership product.'),
+    }
+
+Product()
+
+

 class account_invoice_line(osv.osv):
 class account_invoice_line(osv.osv):

-    _inherit='account.invoice.line'
+    _inherit = 'account.invoice.line'

 
     def create(self, cr, uid, vals, context=None):
         res = super(account_invoice_line, self).create(cr, uid, vals, context=context)
         line = self.browse(cr, uid, res, context=context)
 
     def create(self, cr, uid, vals, context=None):
         res = super(account_invoice_line, self).create(cr, uid, vals, context=context)
         line = self.browse(cr, uid, res, context=context)

-        if line.invoice_id.type == 'out_invoice':
-            if line.product_id and line.product_id.membership and not line.invoice_id.partner_id.member_ident:
-                mbr_id = self.pool.get('ir.sequence').get(cr, uid, 'member_ident')
-                self.pool.get('res.partner').write(cr, uid, line.invoice_id.partner_id.id, {'member_ident': mbr_id})
+
+        if line.invoice_id.type == 'out_invoice' and line.product_id and line.product_id.membership:
+            partners = [line.invoice_id.partner_id]
+            partners.extend(line.invoice_id.partner_id.associate_members)
+            for i in partners:
+                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})

         return res
 
 account_invoice_line()
 
         return res
 
 account_invoice_line()
 

+

 class pos_make_payment(osv.osv_memory):
     _inherit = 'pos.make.payment'
 
 class pos_make_payment(osv.osv_memory):
     _inherit = 'pos.make.payment'