Merge branch 'master' into membership_grouped

[burette/remembership.git] / remembership.py

diff --git a/remembership.py b/remembership.py
index bff5f46..a8ae67c 100644 (file)
--- a/remembership.py
+++ b/remembership.py
@@ -26,6 +26,7 @@ from osv import fields
 import time
 from datetime import datetime, date
 from dateutil.relativedelta import relativedelta
+from openerp.tools.translate import _
 
 
 class Partner(osv.osv):
@@ -33,7 +34,7 @@ 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.'),
+        'associate_members': fields.one2many('res.partner', 'associate_member', 'Associate members', help='Members who are associated to this partner. If this member buy a membership, the associates members will be members too.'),
     }
 
     _sql_constraints = [
@@ -209,6 +210,8 @@ class account_invoice_line(osv.osv):
                         'date_to': date_to,
                         'account_invoice_line': line.id,
                     }, context=context)
+            elif line.product_id.membership_grouped and not line.invoice_id.partner_id.associate_members:
+                raise osv.except_osv(_('Error!!!'), _('You try to invoice grouped membership product to a partner who hasn\'t associated partners.'))
             #Define member ident if it's necessary
             for i in partners:
                 if not i.member_ident: