From: Ludovic CHEVALIER <ludovic@beurresarrasin.net>
Date: Fri, 29 May 2020 14:33:53 +0000 (+0200)
Subject: Merge branch '7.0'
X-Git-Url: http://git.cyclocoop.org/?p=burette%2Fremembership.git;a=commitdiff_plain;h=2c373b91155aff7f1d987fc944ab17f6d039473e;hp=-c

Merge branch '7.0'
---

2c373b91155aff7f1d987fc944ab17f6d039473e
diff --combined remembership.py
index 7a03490,14b7f4e..5560fbf
--- a/remembership.py
+++ b/remembership.py
@@@ -2,7 -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,7 -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
@@@ -214,11 -215,18 +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.'),