[FIX] Schedule jobs even if their next time has passed.
[odoo/odoo.git] / addons / membership / membership.py
index 69fedf4..83ec119 100644 (file)
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -30,7 +30,6 @@ STATE = [
     ('old', 'Old Member'),
     ('waiting', 'Waiting Member'),
     ('invoiced', 'Invoiced Member'),
-    ('associated', 'Associated Member'),
     ('free', 'Free Member'),
     ('paid', 'Paid Member'),
 ]
@@ -41,109 +40,99 @@ STATE_PRIOR = {
         'old' : 2,
         'waiting' : 3,
         'invoiced' : 4,
-        'associated' : 5,
         'free' : 6,
         'paid' : 7
         }
 
-class res_partner(osv.osv):
-    _inherit = 'res.partner'
-    _columns = {
-        'associate_member': fields.many2one('res.partner', 'Associate member'),
-                }
-res_partner()
-
-REQUETE = '''SELECT partner, state FROM (
-SELECT members.partner AS partner,
-CASE WHEN MAX(members.state) = 0 THEN 'none'
-ELSE CASE WHEN MAX(members.state) = 1 THEN 'canceled'
-ELSE CASE WHEN MAX(members.state) = 2 THEN 'old'
-ELSE CASE WHEN MAX(members.state) = 3 THEN 'waiting'
-ELSE CASE WHEN MAX(members.state) = 4 THEN 'invoiced'
-ELSE CASE WHEN MAX(members.state) = 5 THEN 'associated'
-ELSE CASE WHEN MAX(members.state) = 6 THEN 'free'
-ELSE CASE WHEN MAX(members.state) = 7 THEN 'paid'
-END END END END END END END END
-    AS state FROM (
-SELECT partner,
-    CASE WHEN MAX(inv_digit.state) = 4 THEN 7
-    ELSE CASE WHEN MAX(inv_digit.state) = 3 THEN 4
-    ELSE CASE WHEN MAX(inv_digit.state) = 2 THEN 3
-    ELSE CASE WHEN MAX(inv_digit.state) = 1 THEN 1
-END END END END
-AS state
-FROM (
-    SELECT p.id as partner,
-    CASE WHEN ai.state = 'paid' THEN 4
-    ELSE CASE WHEN ai.state = 'open' THEN 3
-    ELSE CASE WHEN ai.state = 'proforma' THEN 2
-    ELSE CASE WHEN ai.state = 'draft' THEN 2
-    ELSE CASE WHEN ai.state = 'cancel' THEN 1
-END END END END END
-AS state
-FROM res_partner p
-JOIN account_invoice ai ON (
-    p.id = ai.partner_id
-)
-JOIN account_invoice_line ail ON (
-    ail.invoice_id = ai.id
-)
-JOIN membership_membership_line ml ON (
-    ml.account_invoice_line  = ail.id
-)
-WHERE ml.date_from <= '%s'
-AND ml.date_to >= '%s'
-GROUP BY
-p.id,
-ai.state
-    )
-    AS inv_digit
-    GROUP by partner
-UNION
-SELECT p.id AS partner,
-    CASE WHEN  p.free_member THEN 6
-    ELSE CASE WHEN p.associate_member IN (
-        SELECT ai.partner_id FROM account_invoice ai JOIN
-        account_invoice_line ail ON (ail.invoice_id = ai.id AND ai.state = 'paid')
-        JOIN membership_membership_line ml ON (ml.account_invoice_line = ail.id)
-        WHERE ml.date_from <= '%s'
-        AND ml.date_to >= '%s'
-    )
-    THEN 5
-END END
-AS state
-FROM res_partner p
-WHERE p.free_member
-OR p.associate_member > 0
-UNION
-SELECT p.id as partner,
-    MAX(CASE WHEN ai.state = 'paid' THEN 2
-    ELSE 0
-    END)
-AS state
-FROM res_partner p
-JOIN account_invoice ai ON (
-    p.id = ai.partner_id
-)
-JOIN account_invoice_line ail ON (
-    ail.invoice_id = ai.id
-)
-JOIN membership_membership_line ml ON (
-    ml.account_invoice_line  = ail.id
-)
-WHERE ml.date_from < '%s'
-AND ml.date_to < '%s'
-AND ml.date_from <= ml.date_to
-GROUP BY
-p.id
-)
-AS members
-GROUP BY members.partner
-)
-AS final
-%s
-'''
-
+#~ REQUETE = '''SELECT partner, state FROM (
+#~ SELECT members.partner AS partner,
+#~ CASE WHEN MAX(members.state) = 0 THEN 'none'
+#~ ELSE CASE WHEN MAX(members.state) = 1 THEN 'canceled'
+#~ ELSE CASE WHEN MAX(members.state) = 2 THEN 'old'
+#~ ELSE CASE WHEN MAX(members.state) = 3 THEN 'waiting'
+#~ ELSE CASE WHEN MAX(members.state) = 4 THEN 'invoiced'
+#~ ELSE CASE WHEN MAX(members.state) = 6 THEN 'free'
+#~ ELSE CASE WHEN MAX(members.state) = 7 THEN 'paid'
+#~ END END END END END END END END
+    #~ AS state FROM (
+#~ SELECT partner,
+    #~ CASE WHEN MAX(inv_digit.state) = 4 THEN 7
+    #~ ELSE CASE WHEN MAX(inv_digit.state) = 3 THEN 4
+    #~ ELSE CASE WHEN MAX(inv_digit.state) = 2 THEN 3
+    #~ ELSE CASE WHEN MAX(inv_digit.state) = 1 THEN 1
+#~ END END END END
+#~ AS state
+#~ FROM (
+    #~ SELECT p.id as partner,
+    #~ CASE WHEN ai.state = 'paid' THEN 4
+    #~ ELSE CASE WHEN ai.state = 'open' THEN 3
+    #~ ELSE CASE WHEN ai.state = 'proforma' THEN 2
+    #~ ELSE CASE WHEN ai.state = 'draft' THEN 2
+    #~ ELSE CASE WHEN ai.state = 'cancel' THEN 1
+#~ END END END END END
+#~ AS state
+#~ FROM res_partner p
+#~ JOIN account_invoice ai ON (
+    #~ p.id = ai.partner_id
+#~ )
+#~ JOIN account_invoice_line ail ON (
+    #~ ail.invoice_id = ai.id
+#~ )
+#~ JOIN membership_membership_line ml ON (
+    #~ ml.account_invoice_line  = ail.id
+#~ )
+#~ WHERE ml.date_from <= '%s'
+#~ AND ml.date_to >= '%s'
+#~ GROUP BY
+#~ p.id,
+#~ ai.state
+    #~ )
+    #~ AS inv_digit
+    #~ GROUP by partner
+#~ UNION
+#~ SELECT p.id AS partner,
+    #~ CASE WHEN  p.free_member THEN 6
+    #~ ELSE CASE WHEN p.associate_member IN (
+        #~ SELECT ai.partner_id FROM account_invoice ai JOIN
+        #~ account_invoice_line ail ON (ail.invoice_id = ai.id AND ai.state = 'paid')
+        #~ JOIN membership_membership_line ml ON (ml.account_invoice_line = ail.id)
+        #~ WHERE ml.date_from <= '%s'
+        #~ AND ml.date_to >= '%s'
+    #~ )
+    #~ THEN 5
+#~ END END
+#~ AS state
+#~ FROM res_partner p
+#~ WHERE p.free_member
+#~ OR p.associate_member > 0
+#~ UNION
+#~ SELECT p.id as partner,
+    #~ MAX(CASE WHEN ai.state = 'paid' THEN 2
+    #~ ELSE 0
+    #~ END)
+#~ AS state
+#~ FROM res_partner p
+#~ JOIN account_invoice ai ON (
+    #~ p.id = ai.partner_id
+#~ )
+#~ JOIN account_invoice_line ail ON (
+    #~ ail.invoice_id = ai.id
+#~ )
+#~ JOIN membership_membership_line ml ON (
+    #~ ml.account_invoice_line  = ail.id
+#~ )
+#~ WHERE ml.date_from < '%s'
+#~ AND ml.date_to < '%s'
+#~ AND ml.date_from <= ml.date_to
+#~ GROUP BY
+#~ p.id
+#~ )
+#~ AS members
+#~ GROUP BY members.partner
+#~ )
+#~ AS final
+#~ %s
+#~ '''
 
 class membership_line(osv.osv):
     '''Member line'''
@@ -159,8 +148,8 @@ class membership_line(osv.osv):
             )
         JOIN account_invoice ai ON (
             ai.id = ail.invoice_id)
-        WHERE ml.id in (%s)
-        ''' % ','.join([str(id) for id in ids]))
+        WHERE ml.id in %s
+        ''', (tuple(ids),))
 
         res = cr.fetchall()
         for r in res:
@@ -173,8 +162,9 @@ class membership_line(osv.osv):
         res = {}
         for line in self.browse(cr, uid, ids):
             cr.execute('''
-            SELECT i.state FROM
-            account_invoice i WHERE
+            SELECT i.state, i.id FROM
+            account_invoice i 
+            WHERE
             i.id = (
                 SELECT l.invoice_id FROM
                 account_invoice_line l WHERE
@@ -197,6 +187,10 @@ class membership_line(osv.osv):
                 state = 'invoiced'
             elif istate == 'paid':
                 state = 'paid'
+                inv = self.pool.get('account.invoice').browse(cr, uid, fetched[1])
+                for payment in inv.payment_ids:
+                    if payment.invoice and payment.invoice.type == 'out_refund':
+                        state = 'canceled'
             elif istate == 'cancel':
                 state = 'canceled'
             res[line.id] = state
@@ -217,19 +211,35 @@ class membership_line(osv.osv):
     _order = 'id desc'
     _constraints = [
             (_check_membership_date, 'Error, this membership product is out of date', [])
-            ]
+    ]
 
 membership_line()
 
 
 class Partner(osv.osv):
     '''Partner'''
+    _inherit = 'res.partner'
 
     def _get_partner_id(self, cr, uid, ids, context=None):
         data_inv = self.pool.get('membership.membership_line').browse(cr, uid, ids, context)
         list_partner = []
         for data in data_inv:
             list_partner.append(data.partner.id)
+        ids2 = list_partner
+        while ids2:
+            ids2 = self.pool.get('res.partner').search(cr, uid, [('associate_member','in',ids2)], context=context)
+            list_partner += ids2
+        return list_partner
+
+    def _get_invoice_partner(self, cr, uid, ids, context=None):
+        data_inv = self.pool.get('account.invoice').browse(cr, uid, ids, context)
+        list_partner = []
+        for data in data_inv:
+            list_partner.append(data.partner_id.id)
+        ids2 = list_partner
+        while ids2:
+            ids2 = self.pool.get('res.partner').search(cr, uid, [('associate_member','in',ids2)], context=context)
+            list_partner += ids2
         return list_partner
 
     def _membership_state(self, cr, uid, ids, name, args, context=None):
@@ -248,11 +258,15 @@ class Partner(osv.osv):
             s = 4
             if partner_data.member_lines:
                 for mline in partner_data.member_lines:
-                    if mline.date_from <= today and mline.date_to >= today:
+                    if mline.date_to >= today:
                         if mline.account_invoice_line and mline.account_invoice_line.invoice_id:
                             mstate = mline.account_invoice_line.invoice_id.state
                             if mstate == 'paid':
                                 s = 0
+                                inv = mline.account_invoice_line.invoice_id
+                                for payment in inv.payment_ids:
+                                    if payment.invoice.type == 'out_refund':
+                                        s = 2
                                 break
                             elif mstate == 'open' and s!=0:
                                 s = 1
@@ -262,7 +276,7 @@ class Partner(osv.osv):
                                 s = 3
                 if s==4:
                     for mline in partner_data.member_lines:
-                        if mline.date_from < today and mline.date_to < today and mline.date_from<=mline.date_to and mline.account_invoice_line.invoice_id.state == 'paid':
+                        if mline.date_from < today and mline.date_to < today and mline.date_from<=mline.date_to and (mline.account_invoice_line and mline.account_invoice_line.invoice_id.state) == 'paid':
                             s = 5
                         else:
                             s = 6
@@ -281,46 +295,16 @@ class Partner(osv.osv):
             if partner_data.free_member and s!=0:
                 res[id] = 'free'
             if partner_data.associate_member:
-                assciate_partner = self.browse(cr,uid,partner_data.associate_member.id)
-                cr.execute('select membership_state from res_partner where id=%s', (partner_data.id,))
-                data_partner_state = cr.fetchall()
-                for i in assciate_partner.member_lines:
-                    if i.date_from <= today and i.date_to >= today and i.account_invoice_line.invoice_id.state == 'paid' and s!=0 and data_partner_state[0][0] !='free':
-                        res[id] = 'associated'
-#
-#       '''Compute membership state of partners'''
-#       today = time.strftime('%Y-%m-%d')
-##      res = {}
-##      for id in ids:
-##          res[id] = 'none'
-#       clause = 'WHERE partner IN (' + ','.join([str(id) for id in ids]) + ')'
-#       cr.execute(REQUETE % (today, today, today, today, today, today, clause))
-#       fetches = cr.fetchall()
-#       for fetch in fetches:
-#           res[fetch[0]] = fetch[1]
+                res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context)
+                res[id] = res_state[partner_data.associate_member.id]
         return res
 
-#no more need becaz of new functionality store attribut on function field
-#   def _membership_state_search(self, cr, uid, obj, name, args):
-#       '''Search on membership state'''
-#
-#       today = time.strftime('%Y-%m-%d')
-#       clause = 'WHERE '
-#       for i in range(len(args)):
-#           if i!=0:
-#               clause += 'OR '
-#           clause += 'state '+args[i][1]+" '"+args[i][2]+"' "
-#       cr.execute(REQUETE % (today, today, today, today, today, today, clause))
-#       ids=[x[0] for x in cr.fetchall()]
-#
-#       return [('id', 'in', ids)]
-
     def _membership_start(self, cr, uid, ids, name, args, context=None):
         '''Return the start date of membership'''
         res = {}
         member_line_obj = self.pool.get('membership.membership_line')
         for partner in self.browse(cr, uid, ids):
-            if partner.membership_state == 'associated':
+            if partner.associate_member:
                 partner_id = partner.associate_member.id
             else:
                 partner_id = partner.id
@@ -333,25 +317,6 @@ class Partner(osv.osv):
                 res[partner.id] = False
         return res
 
-#    def _membership_start_search(self, cr, uid, obj, name, args):
-#        '''Search on membership start date'''
-#        if not len(args):
-#            return []
-#        where = ' AND '.join(['date_from '+x[1]+' \''+str(x[2])+'\''
-#            for x in args])
-#        cr.execute('SELECT partner, MIN(date_from) \
-#                FROM ( \
-#                    SELECT partner, MIN(date_from) AS date_from \
-#                    FROM membership_membership_line \
-#                    GROUP BY partner \
-#                ) AS foo \
-#                WHERE '+where+' \
-#                GROUP BY partner')
-#        res = cr.fetchall()
-#        if not res:
-#            return [('id', '=', '0')]
-#        return [('id', 'in', [x[0] for x in res])]
-
     def _membership_stop(self, cr, uid, ids, name, args, context=None):
         '''Return the stop date of membership'''
         res = {}
@@ -359,8 +324,7 @@ class Partner(osv.osv):
         for partner in self.browse(cr, uid, ids):
             cr.execute('select membership_state from res_partner where id=%s', (partner.id,))
             data_state = cr.fetchall()
-            #if partner.membership_state == 'associated':
-            if data_state[0][0] == 'associated':
+            if partner.associate_member:
                 partner_id = partner.associate_member.id
             else:
                 partner_id = partner.id
@@ -372,98 +336,107 @@ class Partner(osv.osv):
             else:
                 res[partner.id] = False
         return res
-#
-#    def _membership_stop_search(self, cr, uid, obj, name, args):
-#        '''Search on membership stop date'''
-#        if not len(args):
-#            return []
-#        where = ' AND '.join(['date_to '+x[1]+' \''+str(x[2])+'\''
-#            for x in args])
-#        cr.execute('SELECT partner, MAX(date_to) \
-#                FROM ( \
-#                    SELECT partner, MAX(date_to) AS date_to \
-#                    FROM membership_membership_line \
-#                    GROUP BY partner \
-#                ) AS foo \
-#                WHERE '+where+' \
-#                GROUP BY partner')
-#        res = cr.fetchall()
-#        if not res:
-#            return [('id', '=', '0')]
-#        return [('id', 'in', [x[0] for x in res])]
 
     def _membership_cancel(self, cr, uid, ids, name, args, context=None):
         '''Return the cancel date of membership'''
         res = {}
         member_line_obj = self.pool.get('membership.membership_line')
-        for partner_id in ids:
-            line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
-                    limit=1, order='date_cancel')
-            if line_id:
-                res[partner_id] = member_line_obj.read(cr, uid, line_id[0],
-                        ['date_cancel'])['date_cancel']
+        for partner in self.browse(cr, uid, ids, context=context):
+            if partner.membership_state != 'canceled':
+                res[partner.id] = False
             else:
-                res[partner_id] = False
+                line_id = member_line_obj.search(cr, uid, [('partner', '=', partner.id)],
+                        limit=1, order='date_cancel')
+                if line_id:
+                    res[partner.id] = member_line_obj.read(cr, uid, line_id[0],
+                            ['date_cancel'])['date_cancel']
+                else:
+                    res[partner.id] = False
         return res
 
-#    def _membership_cancel_search(self, cr, uid, obj, name, args):
-#        '''Search on membership cancel date'''
-#        if not len(args):
-#            return []
-#        where = ' AND '.join(['date_cancel '+x[1]+' \''+str(x[2])+'\''
-#            for x in args])
-#        cr.execute('SELECT partner, MIN(date_cancel) \
-#                FROM ( \
-#                    SELECT partner, MIN(date_cancel) AS date_cancel \
-#                    FROM membership_membership_line \
-#                    GROUP BY partner \
-#                ) AS foo \
-#                WHERE '+where+' \
-#                GROUP BY partner')
-#        res = cr.fetchall()
-#        if not res:
-#            return [('id', '=', '0')]
-#        return [('id', 'in', [x[0] for x in res])]
+    def _get_partners(self, cr, uid, ids, context={}):
+        ids2 = ids
+        while ids2:
+            ids2 = self.search(cr, uid, [('associate_member','in',ids2)], context=context)
+            ids+=ids2
+        return ids
 
+    def __get_membership_state(self, *args, **kwargs):
+        return self._membership_state(*args, **kwargs)
 
-
-    _inherit = 'res.partner'
     _columns = {
-        'member_lines': fields.one2many('membership.membership_line', 'partner',
-            'Membership'),
-        'membership_amount': fields.float('Membership amount', digites=(16, 2),
-            help='The price negociated by the partner'),
-#       'membership_state': fields.function(_membership_state, method=True, string='Current membership state',
-#           type='selection', selection=STATE, fnct_search=_membership_state_search),
-        'membership_state': fields.function(_membership_state, method=True, string='Current membership state',
-            type='selection',selection=STATE,store={'membership.membership_line':(_get_partner_id,['state'], 10),
-                                                    'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)}),
-#       'associate_member': fields.many2one('res.partner', 'Associate member'),
+        'associate_member': fields.many2one('res.partner', 'Associate member'),
+        'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
         'free_member': fields.boolean('Free member'),
-#        'membership_start': fields.function(_membership_start, method=True,
-#            string='Start membership date', type='date',
-#            fnct_search=_membership_start_search),
-        'membership_start': fields.function(_membership_start, method=True,
-            string='Start membership date', type='date',store={'membership.membership_line':(_get_partner_id,['state'], 10),
-                                                    'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)}),
-#        'membership_stop': fields.function(_membership_stop, method=True,
-#            string='Stop membership date', type='date',
-#            fnct_search=_membership_stop_search),
-        'membership_stop': fields.function(_membership_stop, method=True,
-            string='Stop membership date', type='date',store={'membership.membership_line':(_get_partner_id,['state'], 10),
-                                                    'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)}),
-#        'membership_cancel': fields.function(_membership_cancel, method=True,
-#            string='Cancel membership date', type='date',
-#            fnct_search=_membership_cancel_search),
-        'membership_cancel': fields.function(_membership_cancel, method=True,
-            string='Cancel membership date', type='date',store={'membership.membership_line':(_get_partner_id,['state'], 10),
-                                                    'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)}),
+        'membership_amount': fields.float(
+                    'Membership amount', digits=(16, 2),
+                    help='The price negociated by the partner'),
+        'membership_state': fields.function(
+                    __get_membership_state, method = True,
+                    string = 'Current membership state', type = 'selection',
+                    selection = STATE ,store = {
+                        'account.invoice':(_get_invoice_partner,['state'], 10),
+                        'membership.membership_line':(_get_partner_id,['state'], 10),
+                        'res.partner':(_get_partners, ['free_member', 'membership_state', 'associate_member'], 10)
+                        }
+                    ),
+        'membership_start': fields.function(
+                    _membership_start, method=True,
+                    string = 'Start membership date', type = 'date',
+                    store = {
+                        'account.invoice':(_get_invoice_partner,['state'], 10),
+                        'membership.membership_line':(_get_partner_id,['state'], 10),
+                        'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
+                        }
+                    ),
+        'membership_stop': fields.function(
+                    _membership_stop, method = True,
+                    string = 'Stop membership date', type = 'date',
+                    store = {
+                        'account.invoice':(_get_invoice_partner,['state'], 10),
+                        'membership.membership_line':(_get_partner_id,['state'], 10),
+                        'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
+                        }
+                    ),
+
+        'membership_cancel': fields.function(
+                    _membership_cancel, method = True,
+                    string = 'Cancel membership date', type='date',
+                    store = {
+                        'account.invoice':(_get_invoice_partner,['state'], 11),
+                        'membership.membership_line':(_get_partner_id,['state'], 10),
+                        'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
+                        }
+                    ),
     }
     _defaults = {
         'free_member': lambda *a: False,
         'membership_cancel' : lambda *d : False,
     }
 
+    def _check_recursion(self, cr, uid, ids):
+        level = 100
+        while len(ids):
+            cr.execute('select distinct associate_member from res_partner where id in %s', (tuple(ids),))
+            ids = filter(None, map(lambda x:x[0], cr.fetchall()))
+            if not level:
+                return False
+            level -= 1
+        return True
+
+    _constraints = [
+        (_check_recursion, 'Error ! You can not create recursive associated members.', ['associate_member'])
+    ]
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        if context is None:
+            context = {}    
+        default = default.copy()
+        default['member_lines'] = []
+        return super(Partner, self).copy(cr, uid, id, default, context)
+    
 Partner()
 
 class product_template(osv.osv):
@@ -510,54 +483,6 @@ class Invoice(osv.osv):
 
     _inherit = 'account.invoice'
 
-    def create(self, cr, uid, vals, context={}):
-        result = super(Invoice, self).create(cr, uid, vals, context)
-        a = self.browse(cr, uid, result)
-        member_line_obj = self.pool.get('membership.membership_line')
-        for i in a.invoice_line:
-            if i.product_id and i.product_id.membership:
-                    date_from = i.product_id.membership_date_from
-                    date_to  = i.product_id.membership_date_to
-                    if a.date_invoice > date_from and a.date_invoice < date_to:
-                        date_from = a.date_invoice
-                    line_id = member_line_obj.create(cr, uid, {
-                        'partner': a.partner_id.id,
-                        'date_from': date_from,
-                        'date_to': date_to,
-                        'account_invoice_line': i.id,
-                        })
-        return result
-
-#    def action_move_create(self, cr, uid, ids, context=None):
-#        '''Create membership.membership_line if the product is for membership'''
-#        if context is None:
-#            context = {}
-#        member_line_obj = self.pool.get('membership.membership_line')
-#        partner_obj = self.pool.get('res.partner')
-#        for invoice in self.browse(cr, uid, ids):
-#
-#            # fetch already existing member lines
-#            former_mlines = member_line_obj.search(cr,uid,
-#                    [('account_invoice_line','in',
-#                        [ l.id for l in invoice.invoice_line])], context)
-#            # empty them :
-#            if former_mlines:
-#                member_line_obj.write(cr,uid,former_mlines, {'account_invoice_line':False}, context)
-#
-#            for line in invoice.invoice_line:
-#                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 invoice.date_invoice > date_from and invoice.date_invoice < date_to:
-#                        date_from = invoice.date_invoice
-#                    line_id = member_line_obj.create(cr, uid, {
-#                        'partner': invoice.partner_id.id,
-#                        'date_from': date_from,
-#                        'date_to': date_to,
-#                        'account_invoice_line': line.id,
-#                        })
-#        return super(Invoice, self).action_move_create(cr, uid, ids, context)
-
     def action_cancel(self, cr, uid, ids, context=None):
         '''Create a 'date_cancel' on the membership_line object'''
         if context is None:
@@ -581,81 +506,7 @@ class ReportPartnerMemberYear(osv.osv):
     _auto = False
     _rec_name = 'year'
     _columns = {
-        'year': fields.char('Year', size='4', readonly=True, select=1),
-        'canceled_number': fields.integer('Canceled', readonly=True),
-        'waiting_number': fields.integer('Waiting', readonly=True),
-        'invoiced_number': fields.integer('Invoiced', readonly=True),
-        'paid_number': fields.integer('Paid', readonly=True),
-        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
-        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
-        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
-        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
-        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
-            select=2),
-    }
-
-    def init(self, cr):
-        '''Create the view'''
-        cr.execute("""
-    CREATE OR REPLACE VIEW report_partner_member_year AS (
-        SELECT
-        MIN(id) AS id,
-        COUNT(ncanceled) as canceled_number,
-        COUNT(npaid) as paid_number,
-        COUNT(ninvoiced) as invoiced_number,
-        COUNT(nwaiting) as waiting_number,
-        SUM(acanceled) as canceled_amount,
-        SUM(apaid) as paid_amount,
-        SUM(ainvoiced) as invoiced_amount,
-        SUM(awaiting) as waiting_amount,
-        year,
-        currency
-        FROM (SELECT
-            CASE WHEN ai.state = 'cancel' THEN ml.id END AS ncanceled,
-            CASE WHEN ai.state = 'paid' THEN ml.id END AS npaid,
-            CASE WHEN ai.state = 'open' THEN ml.id END AS ninvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN ml.id END AS nwaiting,
-            CASE WHEN ai.state = 'cancel'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS acanceled,
-            CASE WHEN ai.state = 'paid'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS apaid,
-            CASE WHEN ai.state = 'open'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS ainvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS awaiting,
-            TO_CHAR(ml.date_from, 'YYYY') AS year,
-            ai.currency_id AS currency,
-            MIN(ml.id) AS id
-            FROM membership_membership_line ml
-            JOIN (account_invoice_line ail
-                LEFT JOIN account_invoice ai
-                ON (ail.invoice_id = ai.id))
-            ON (ml.account_invoice_line = ail.id)
-            JOIN res_partner p
-            ON (ml.partner = p.id)
-            GROUP BY TO_CHAR(ml.date_from, 'YYYY'), ai.state,
-            ai.currency_id, ml.id) AS foo
-        GROUP BY year, currency)
-                """)
-
-ReportPartnerMemberYear()
-
-
-class ReportPartnerMemberYearNew(osv.osv):
-    '''New Membership by Years'''
-
-    _name = 'report.partner_member.year_new'
-    _description = __doc__
-    _auto = False
-    _rec_name = 'year'
-
-    _columns = {
-        'year': fields.char('Year', size='4', readonly=True, select=1),
+        'year': fields.char('Year', size=4, readonly=True, select=1),
         'canceled_number': fields.integer('Canceled', readonly=True),
         'waiting_number': fields.integer('Waiting', readonly=True),
         'invoiced_number': fields.integer('Invoiced', readonly=True),
@@ -728,7 +579,7 @@ class ReportPartnerMemberYearNew(osv.osv):
     _auto = False
     _rec_name = 'year'
     _columns = {
-        'year': fields.char('Year', size='4', readonly=True, select=1),
+        'year': fields.char('Year', size=4, readonly=True, select=1),
         'canceled_number': fields.integer('Canceled', readonly=True),
         'waiting_number': fields.integer('Waiting', readonly=True),
         'invoiced_number': fields.integer('Invoiced', readonly=True),
@@ -799,5 +650,62 @@ class ReportPartnerMemberYearNew(osv.osv):
     """)
 
 ReportPartnerMemberYearNew()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+class account_invoice_line(osv.osv):
+    _inherit='account.invoice.line'
+    def write(self, cr, uid, ids, vals, context=None):
+        if not context:
+            context={}
+        res = super(account_invoice_line, self).write(cr, uid, ids, vals, context=context)
+        member_line_obj = self.pool.get('membership.membership_line')
+        for line in self.browse(cr, uid, ids):
+            if line.invoice_id.type == 'out_invoice':
+                ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
+                if line.product_id and line.product_id.membership and not ml_ids:
+                    # Product line has changed to a membership product
+                    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
+                    line_id = member_line_obj.create(cr, uid, {
+                        'partner': line.invoice_id.partner_id.id,
+                        'date_from': date_from,
+                        'date_to': date_to,
+                        'account_invoice_line': line.id,
+                        })
+                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)
+        return res
+
+    def unlink(self, cr, uid, ids, context=None):
+        if not context:
+            context={}
+        member_line_obj = self.pool.get('membership.membership_line')
+        for id in ids:
+            ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',id)])
+            member_line_obj.unlink(cr, uid, ml_ids, context=context)
+        return super(account_invoice_line, self).unlink(cr, uid, ids, context=context)
+
+    def create(self, cr, uid, vals, context={}):
+        result = super(account_invoice_line, self).create(cr, uid, vals, context)
+        line = self.browse(cr, uid, result)
+        if line.invoice_id.type == 'out_invoice':
+            member_line_obj = self.pool.get('membership.membership_line')
+            ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
+            if line.product_id and line.product_id.membership and not ml_ids:
+                # Product line is a membership product
+                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
+                line_id = member_line_obj.create(cr, uid, {
+                    'partner': line.invoice_id.partner_id and line.invoice_id.partner_id.id or False,
+                    'date_from': date_from,
+                    'date_to': date_to,
+                    'account_invoice_line': line.id,
+                    })
+        return result
+
+account_invoice_line()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: