From ffa855cc277d44fbf0bb74762b5e9c43ae62337d Mon Sep 17 00:00:00 2001 From: benjamin <benjamin@le-filament.com> Date: Thu, 24 Aug 2023 14:42:46 +0200 Subject: [PATCH] [clean] --- migrations/14.0.1.0.2/post-migration.py | 3 +++ models/res_partner.py | 14 +++++++------- models/res_partner_lists.py | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/migrations/14.0.1.0.2/post-migration.py b/migrations/14.0.1.0.2/post-migration.py index 497ab3b..b66b8a7 100644 --- a/migrations/14.0.1.0.2/post-migration.py +++ b/migrations/14.0.1.0.2/post-migration.py @@ -18,6 +18,7 @@ def update_status_project_accompagnement(env): """, ) + def update_status_project_soumis_cg(env): openupgrade.logged_query( env.cr, @@ -28,6 +29,7 @@ def update_status_project_soumis_cg(env): """, ) + def update_with_new_status(env): openupgrade.logged_query( env.cr, @@ -44,6 +46,7 @@ def update_with_new_status(env): """, ) + @openupgrade.migrate() def migrate(env, version): update_status_project_accompagnement(env) diff --git a/models/res_partner.py b/models/res_partner.py index 00cd8a6..228c600 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -573,7 +573,10 @@ class ScopPartner(models.Model): def _check_siret(self): if self.siret and not self.env.context.get("import_file"): siren = self.siret[:3] + " " + self.siret[3:6] + " " + self.siret[6:9] - if not self.siret.isdigit() and self.siret != "En attente d'immatriculation": + if ( + not self.siret.isdigit() + and self.siret != "En attente d'immatriculation" + ): raise ValidationError(_("Ce SIRET n'est pas valide")) if len(self.siret) != 14: raise ValidationError(_("La longueur du SIRET doit être égale à 14")) @@ -593,14 +596,11 @@ class ScopPartner(models.Model): @api.constrains("is_company", "type", "email", "phone", "mobile", "user_ids") def _check_contact_info(self): # Contrainte de tel ou mail lors de la modification d'un contact - if ( - not self.is_company - and self.type == "contact" - and not self.user_ids - ): + if not self.is_company and self.type == "contact" and not self.user_ids: if not self.email and not self.phone and not self.mobile: raise UserError( - _("Vous devez saisir au moins un e-mail ou un téléphone pour %s") % self.name + _("Vous devez saisir au moins un e-mail ou un téléphone pour %s") + % self.name ) # ------------------------------------------------------ diff --git a/models/res_partner_lists.py b/models/res_partner_lists.py index ffadd7a..e4ec303 100644 --- a/models/res_partner_lists.py +++ b/models/res_partner_lists.py @@ -36,6 +36,7 @@ class ResPartnerCooperativeForm(models.Model): type_unionscop = self.env.ref("cgscop_partner.form_unionscop") return type_lm + type_lamaneur + type_unionscop + class ResPartnerCreationOrigin(models.Model): _name = "res.partner.creation.origin" _description = "Creation Origin Scop" -- GitLab