X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=remembership.py;h=58ba74c7064e5d491865198e99ad2fd249a66b0e;hb=c045b91ccff4120c9084e57101955aa64892acf0;hp=fa16f56eab4bb38954e1934f0872408cd66ae1c9;hpb=949a540145c18b4e4b9ac9e709c5085c64b2e8f2;p=burette%2Fremembership.git

diff --git a/remembership.py b/remembership.py
index fa16f56..58ba74c 100644
--- a/remembership.py
+++ b/remembership.py
@@ -24,29 +24,65 @@
 from osv import osv
 from osv import fields
 
+
 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()
 
 
+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):
-    _inherit='account.invoice.line'
+    _inherit = 'account.invoice.line'
 
     def create(self, cr, uid, vals, context=None):
-        result = super(account_invoice_line, self).create(cr, uid, vals, context=context)
-        line = self.browse(cr, uid, result, 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})
-        return result
+        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' 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()
 
 
+class pos_make_payment(osv.osv_memory):
+    _inherit = 'pos.make.payment'
+
+    def check(self, cr, uid, ids, context=None):
+        """
+        Auto invoice orders. Temporarly solution before make partner members just with orders, without invoice.
+        """
+        res = super(pos_make_payment, self).check(cr, uid, ids, context=context)
+
+        order_obj = self.pool.get('pos.order')
+        order_obj.action_invoice(cr, uid, ids, context=context)
+
+        return res
+
+pos_make_payment()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: