From 6404da1658c5b9ee1f9dd298c421870ea2a32d17 Mon Sep 17 00:00:00 2001 From: Alexis Allemann Date: Thu, 5 Sep 2024 15:34:29 +0200 Subject: [PATCH 1/4] Desynchronize crm.lead email and res_partner email. --- mass_mailing_switzerland/models/__init__.py | 2 +- .../models/{res_partner.py => crm_lead.py} | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) rename mass_mailing_switzerland/models/{res_partner.py => crm_lead.py} (57%) diff --git a/mass_mailing_switzerland/models/__init__.py b/mass_mailing_switzerland/models/__init__.py index 91fed54d..e66f0d6c 100644 --- a/mass_mailing_switzerland/models/__init__.py +++ b/mass_mailing_switzerland/models/__init__.py @@ -1 +1 @@ -from . import res_partner +from . import crm_lead diff --git a/mass_mailing_switzerland/models/res_partner.py b/mass_mailing_switzerland/models/crm_lead.py similarity index 57% rename from mass_mailing_switzerland/models/res_partner.py rename to mass_mailing_switzerland/models/crm_lead.py index 2074f065..8277545f 100644 --- a/mass_mailing_switzerland/models/res_partner.py +++ b/mass_mailing_switzerland/models/crm_lead.py @@ -10,13 +10,8 @@ from odoo import models - class Partner(models.Model): - _inherit = "res.partner" + _inherit = "crm.lead" - def write(self, vals): - if "email" in vals: - for partner in self: - if not vals["email"] and partner.sudo().mass_mailing_contact_ids: - partner.sudo().mass_mailing_contact_ids.unlink() - return super(Partner, self).write(vals) + def _inverse_email_from(self): + return \ No newline at end of file From 94e334eda3d2d37a4c2c0df259cd1fd62e121cee Mon Sep 17 00:00:00 2001 From: Alexis Allemann Date: Thu, 5 Sep 2024 15:52:13 +0200 Subject: [PATCH 2/4] Renamed class --- mass_mailing_switzerland/models/crm_lead.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mass_mailing_switzerland/models/crm_lead.py b/mass_mailing_switzerland/models/crm_lead.py index 8277545f..314e1357 100644 --- a/mass_mailing_switzerland/models/crm_lead.py +++ b/mass_mailing_switzerland/models/crm_lead.py @@ -10,7 +10,7 @@ from odoo import models -class Partner(models.Model): +class Lead(models.Model): _inherit = "crm.lead" def _inverse_email_from(self): From a23be5fcc87792ded50da880cf754a7f37f5c4ec Mon Sep 17 00:00:00 2001 From: Alexis Allemann Date: Thu, 5 Sep 2024 16:16:04 +0200 Subject: [PATCH 3/4] Bidirectional desynchronization --- mass_mailing_switzerland/models/crm_lead.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mass_mailing_switzerland/models/crm_lead.py b/mass_mailing_switzerland/models/crm_lead.py index 314e1357..8800a81f 100644 --- a/mass_mailing_switzerland/models/crm_lead.py +++ b/mass_mailing_switzerland/models/crm_lead.py @@ -8,10 +8,18 @@ # ############################################################################## -from odoo import models +from odoo import api, models class Lead(models.Model): _inherit = "crm.lead" def _inverse_email_from(self): - return \ No newline at end of file + return + + @api.depends('partner_id.email') + def _compute_email_from(self): + return + + @api.onchange('partner_id') + def onchange_partner_id(self): + self.email_from = self.partner_id.email \ No newline at end of file From a9281828a5a614b4e9c1caefbaef0a920768c738 Mon Sep 17 00:00:00 2001 From: Alexis Allemann Date: Thu, 5 Sep 2024 16:20:17 +0200 Subject: [PATCH 4/4] Precommit --- mass_mailing_switzerland/models/crm_lead.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mass_mailing_switzerland/models/crm_lead.py b/mass_mailing_switzerland/models/crm_lead.py index 8800a81f..cdea65a7 100644 --- a/mass_mailing_switzerland/models/crm_lead.py +++ b/mass_mailing_switzerland/models/crm_lead.py @@ -10,16 +10,17 @@ from odoo import api, models + class Lead(models.Model): _inherit = "crm.lead" def _inverse_email_from(self): return - @api.depends('partner_id.email') + @api.depends("partner_id.email") def _compute_email_from(self): return - @api.onchange('partner_id') + @api.onchange("partner_id") def onchange_partner_id(self): - self.email_from = self.partner_id.email \ No newline at end of file + self.email_from = self.partner_id.email