Merge branch '7.0'

[burette/remembership.git] / remembership.py

diff --git a/remembership.py b/remembership.py
index afb03d6..5560fbf 100644 (file)
--- 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
 #
@@ -21,8 +21,7 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
-from openerp.osv import fields
+from openerp.osv import fields, osv
 import time
 from datetime import datetime, date
 from dateutil.relativedelta import relativedelta
@@ -215,11 +214,18 @@ class Partner(osv.osv):
         ids = partner_obj.search(cr, uid, [('membership_state', '=', 'paid'), ('membership_stop', '<', today)], context=None)
         self.write(cr, uid, ids, {'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()
 
 
 class Product(osv.osv):
-    _inherit = 'product.product'
+    _inherit = 'product.template'
 
     _columns = {
         'membership_grouped': fields.boolean('Grouped membership product', help='Check if it\'s a grouped membership product.'),