From 090779242115736531b5ea5a54427e812f248c57 Mon Sep 17 00:00:00 2001 From: houssine Date: Tue, 12 Nov 2019 12:26:12 +0100 Subject: [PATCH] [FIX] when the partner is not set but in the system --- easy_my_coop/models/coop.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/easy_my_coop/models/coop.py b/easy_my_coop/models/coop.py index 0844b99..4f1eb5a 100644 --- a/easy_my_coop/models/coop.py +++ b/easy_my_coop/models/coop.py @@ -65,22 +65,19 @@ class SubscriptionRequest(models.Model): cooperator = partner_obj.get_cooperator_from_email( vals.get('email')) if cooperator: - # TODO remove the following line of code once it has + # TODO remove the following line once it has # been found a way to avoid double encoding cooperator = cooperator[0] vals['type'] = 'subscription' - vals = self.is_member(vals, cooperator) - vals['partner_id'] = cooperator.id - - if not cooperator.cooperator: - cooperator.write({'cooperator': True}) else: cooperator_id = vals.get('partner_id') cooperator = partner_obj.browse(cooperator_id) vals = self.is_member(vals, cooperator) + if not cooperator.cooperator: + cooperator.write({'cooperator': True}) subscr_request = super(SubscriptionRequest, self).create(vals) confirmation_mail_template = self.env.ref(mail_template, False) @@ -530,8 +527,6 @@ class SubscriptionRequest(models.Model): if self.ordered_parts <= 0: raise UserError(_('Number of share must be greater than 0.')) if self.partner_id: - if not self.partner_id.cooperator: - self.partner_id.cooperator = True partner = self.partner_id else: partner = None @@ -547,6 +542,9 @@ class SubscriptionRequest(models.Model): if domain: partner = partner_obj.search(domain) + if not partner.cooperator: + partner.cooperator = True + if not partner: partner = self.create_coop_partner() else: