Commit 6b8faccc by François C.

Resolve conflict

parents d5d72a5a 4997c84d
...@@ -105,7 +105,7 @@ class ResPartner(models.Model): ...@@ -105,7 +105,7 @@ class ResPartner(models.Model):
data = {'member_id': self.id, 'state': state} data = {'member_id': self.id, 'state': state}
self.env['member.state.change'].create(data) self.env['member.state.change'].create(data)
@api.model @api.multi
def update(self, vals): def update(self, vals):
_logger.info("valeurs reçues pour update partner = %s", str(vals)) _logger.info("valeurs reçues pour update partner = %s", str(vals))
state_to_record = "" state_to_record = ""
...@@ -121,7 +121,7 @@ class ResPartner(models.Model): ...@@ -121,7 +121,7 @@ class ResPartner(models.Model):
return super(ResPartner, self).update(vals) return super(ResPartner, self).update(vals)
@api.model @api.multi
def write(self, vals): def write(self, vals):
_logger.info("valeurs reçues pour write partner = %s", str(vals)) _logger.info("valeurs reçues pour write partner = %s", str(vals))
if 'cooperative_state' in vals: if 'cooperative_state' in vals:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment