X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=remembership.py;h=c8d8b464dc1577b5b67a9d176fd17ec104ef885b;hb=HEAD;hp=ad6438fc0725f47c93e231c4c7d44e36e99d9d5d;hpb=802382f31bb96c7396e3e3c7e57feb582ed3dfa0;p=burette%2Fremembership.git

diff --git a/remembership.py b/remembership.py
index ad6438f..c8d8b46 100644
--- a/remembership.py
+++ b/remembership.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Remembership module for OpenERP, Membership module enhancement and bug fixes
-#    Copyright (C) 2012-2013 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
+#    Copyright (C) 2012-2018 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
 #
 #    This file is a part of Remembership
 #
@@ -51,7 +51,7 @@ class Partner(osv.osv):
                  'membership_cancel': False
             }
             if name == 'membership_start':
-                line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)],
+                line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('state','!=','canceled')],
                             limit=1, order='date_from', context=context)
                 if line_id:
                     res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
@@ -62,7 +62,7 @@ class Partner(osv.osv):
                         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)],
+                line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('state','!=','canceled')],
                             limit=1, order='date_to desc', context=context)
                 if line_id1:
                     res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
@@ -213,7 +213,15 @@ class Partner(osv.osv):
         partner_obj = self.pool.get('res.partner')
         today = date.today()
         ids = partner_obj.search(cr, uid, [('membership_state', '=', 'paid'), ('membership_stop', '<', today)], context=None)
-        self.write(cr, uid, ids, {'membership_state': 'old'}, context=None)
+        for id in ids:
+            self.write(cr, uid, id, {'membership_state': 'old'}, context=None)
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default['member_ident'] = None
+        return super(Partner, self).copy(cr, uid, id, default, context)
+
 
 Partner()