diff --git a/models/res_partner.py b/models/res_partner.py index 5700a69c4ab527acf9144021aec8e446fdac92e8..4fc3f33784ab621c32adcec6bcbcda19791ced8b 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -267,9 +267,11 @@ class ScopPartner(models.Model): """ # Check Staff staff_line = self.get_last_membership_staff() + coop47 = self.env.ref("cgscop_partner.form_coop47") + scic = self.env.ref("cgscop_partner.form_scic") if ( (not staff_line or staff_line.staff_count < 1) - and self.cooperative_form_id != self.env.ref("cgscop_partner.form_coop47") + and self.cooperative_form_id not in [coop47, scic] ): raise UserError(_("Les effectifs à l'adhésion ne sont pas renseignés.")) # Check financial datas diff --git a/wizard/scop_compulsory_fields_suivi_wizard.py b/wizard/scop_compulsory_fields_suivi_wizard.py index 9837c6028e7979d7db6be0b0df86a829ab39c330..52cfc0eb0991f44710b116cf0df8c5cda7ab80b0 100644 --- a/wizard/scop_compulsory_fields_suivi_wizard.py +++ b/wizard/scop_compulsory_fields_suivi_wizard.py @@ -46,7 +46,7 @@ class ScopCompulsoryFieldsSuiviWizard(models.TransientModel): if form_id in form_id._get_lm_form(): self.is_scop = True else: - self.is_scop = True + self.is_scop = False # ------------------------------------------------------ # Actions / Buttons