diff --git a/wizard/scop_compulsory_fields_suivi_wizard.py b/wizard/scop_compulsory_fields_suivi_wizard.py index 0db63cc511b3e3830b8ef7063cd473d94263c5c7..967b2d4dce1a79b8307e4a396da4f394613bce2b 100644 --- a/wizard/scop_compulsory_fields_suivi_wizard.py +++ b/wizard/scop_compulsory_fields_suivi_wizard.py @@ -14,6 +14,8 @@ class ScopCompulsoryFieldsSuiviWizard(models.TransientModel): ) ur_id = fields.Many2one(related="partner_id.ur_id", readonly=False) + email = fields.Char(related="partner_id.email", readonly=False) + is_scop = fields.Boolean(compute="_compute_is_scop") creation_origin_id = fields.Many2one( related="partner_id.creation_origin_id", readonly=False ) @@ -35,6 +37,15 @@ class ScopCompulsoryFieldsSuiviWizard(models.TransientModel): with_adhesion = fields.Boolean("Avec adhésion") list_logs = fields.Text("Liste des erreurs") + # ------------------------------------------------------ + # Compute + # ------------------------------------------------------ + def _compute_is_scop(self): + form_id = self.partner_id.cooperative_form_id + if form_id in form_id._get_lm_form(): + self.is_scop = True + else: + self.is_scop = True # ------------------------------------------------------ # Actions / Buttons # ------------------------------------------------------ @@ -46,6 +57,7 @@ class ScopCompulsoryFieldsSuiviWizard(models.TransientModel): form_id = self.partner_id.cooperative_form_id if self.with_adhesion: self.partner_id.write({"membership_status": "adhesion"}) + if form_id in form_id._get_lm_form(): # Create extranet access self.partner_id.write({"extranet_service_access": True}) @@ -58,6 +70,9 @@ class ScopCompulsoryFieldsSuiviWizard(models.TransientModel): { "extranet_access": True, "extranet_update_company": True, + "tag_ids": [ + (4, self.env.ref("__export__.res_partner_category_6_a5b5dca7"), 0), + ] } ) # Create LM @@ -67,6 +82,17 @@ class ScopCompulsoryFieldsSuiviWizard(models.TransientModel): # Set DDETS self.partner_id.affectation_contact_ministere() + if self.with_adhesion: + for director in self.partner_id.director_ids: + director.update( + { + "tag_ids": [ + (4, self.env.ref("__export__.res_partner_category_4_eb133182"), 0), + (4, self.env.ref("__export__.res_partner_category_6_a5b5dca7"), 0), + ] + } + ) + return {"type": "ir.actions.act_window_close"} def save_data(self): diff --git a/wizard/scop_compulsory_fields_suivi_wizard.xml b/wizard/scop_compulsory_fields_suivi_wizard.xml index b57fb30981a50b42add21244442a3d3f1915c3d2..53991760f1b339931704bbf43f2934ff42a8bace 100644 --- a/wizard/scop_compulsory_fields_suivi_wizard.xml +++ b/wizard/scop_compulsory_fields_suivi_wizard.xml @@ -14,7 +14,7 @@ <form string="Confirmer les champs obligatoires"> <div class="alert alert-warning" role="alert"> <p> - Il es nécessaire de charger les <strong + Il est nécessaire de charger les <strong >statuts</strong><span attrs="{'invisible': [('is_registration_in_progress', '=', True)]}" >, le <strong>KBIS</strong></span> et <strong @@ -35,11 +35,17 @@ /> </div> <group> + <field name="is_scop" invisible="1"/> + <field name="with_adhesion" invisible="1" /> <field name="ur_id" required="1" options="{'no_create': True, 'no_edit': True}" /> + <field + name="email" + attrs="{'required': ['|', ('is_scop', '=', True), ('with_adhesion', '=', True)]}" + /> <field name="creation_origin_id" required="1" @@ -64,7 +70,6 @@ options="{'no_create': 1, 'no_edit': 1}" attrs="{'required': [('is_registration_in_progress', '!=', True)]}" /> - <field name="with_adhesion" invisible="1" /> </group> <footer> <button diff --git a/wizard/scop_membership_submit_wizard.xml b/wizard/scop_membership_submit_wizard.xml index 609401252a395ad593e57ec95d596c3341e579e4..9e9b76cb8ed7e190bf3987aba83387cf4eb85f17 100644 --- a/wizard/scop_membership_submit_wizard.xml +++ b/wizard/scop_membership_submit_wizard.xml @@ -28,7 +28,7 @@ <button name="confirm" type="object" - string="Valider avec adhésion" + string="Soumettre l'adhésion à la CG" class="oe_highlight" attrs="{'invisible':[('list_logs', '!=', False)]}" />