Resolve conflict

lacagette_addons/lacagette_membership/models/res_partner.py

@@ -105,7 +105,7 @@ class ResPartner(models.Model):
         data = {'member_id': self.id, 'state': state}
         self.env['member.state.change'].create(data)
 
-    @api.model
+    @api.multi
     def update(self, vals):
         _logger.info("valeurs reçues pour update partner = %s", str(vals))
         state_to_record = ""
@@ -121,7 +121,7 @@ class ResPartner(models.Model):
         return super(ResPartner, self).update(vals)
 
 
-    @api.model
+    @api.multi
     def write(self, vals):
         _logger.info("valeurs reçues pour write partner = %s", str(vals))
         if 'cooperative_state' in vals: