From 99263d73338bfefc8cf08ce22d87ef692f105345 Mon Sep 17 00:00:00 2001 From: benjamin <benjamin@le-filament.com> Date: Mon, 13 Nov 2023 12:25:18 +0100 Subject: [PATCH] [UPD] add activity desc to creation and memebership wizard --- wizard/scop_compulsory_fields_suivi_wizard.py | 1 + wizard/scop_compulsory_fields_suivi_wizard.xml | 7 +++++++ wizard/scop_membership_submit_wizard.py | 6 +++++- wizard/scop_membership_submit_wizard.xml | 7 +++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/wizard/scop_compulsory_fields_suivi_wizard.py b/wizard/scop_compulsory_fields_suivi_wizard.py index d068384..9837c60 100644 --- a/wizard/scop_compulsory_fields_suivi_wizard.py +++ b/wizard/scop_compulsory_fields_suivi_wizard.py @@ -21,6 +21,7 @@ class ScopCompulsoryFieldsSuiviWizard(models.TransientModel): ) date_1st_sign = fields.Date(related="partner_id.date_1st_sign", readonly=False) social_object = fields.Text(related="partner_id.social_object", readonly=False) + activity_desc = fields.Text(related="partner_id.activity_desc", readonly=False) capital = fields.Integer(related="partner_id.capital", readonly=False) first_closeout = fields.Date(related="partner_id.first_closeout", readonly=False) closeout_month = fields.Selection( diff --git a/wizard/scop_compulsory_fields_suivi_wizard.xml b/wizard/scop_compulsory_fields_suivi_wizard.xml index 296f26a..1f8b4e7 100644 --- a/wizard/scop_compulsory_fields_suivi_wizard.xml +++ b/wizard/scop_compulsory_fields_suivi_wizard.xml @@ -53,6 +53,13 @@ /> <field name="date_1st_sign" required="1" /> <field name="social_object" required="1" /> + <div> + <label for="activity_desc" /> + <p + class="text-muted" + >La description de l'activité sera affichée sur l'annuaire des coopératives</p> + </div> + <field name="activity_desc" nolabel="1" required="1" /> <field name="capital" required="1" /> <field name="first_closeout" required="1" /> <field name="closeout_month" required="1" /> diff --git a/wizard/scop_membership_submit_wizard.py b/wizard/scop_membership_submit_wizard.py index 59f311e..d5b3ae0 100644 --- a/wizard/scop_membership_submit_wizard.py +++ b/wizard/scop_membership_submit_wizard.py @@ -11,6 +11,10 @@ class ScopMembershipSubmitWizard(models.TransientModel): partner_id = fields.Many2one( comodel_name="res.partner", string="Coop", required=True ) + activity_desc = fields.Text( + related="partner_id.activity_desc", + readonly=False, + ) ur_id = fields.Many2one(related="partner_id.ur_id", readonly=False) list_logs = fields.Text("Liste des erreurs", compute="_compute_list_logs") @@ -19,7 +23,7 @@ class ScopMembershipSubmitWizard(models.TransientModel): # ------------------------------------------------------ def _compute_list_logs(self): self.list_logs = ( - self.partner_id.liasse_membership_id.check_compulsory_fields_lf() + # self.partner_id.liasse_membership_id.check_compulsory_fields_lf() ) # ------------------------------------------------------ diff --git a/wizard/scop_membership_submit_wizard.xml b/wizard/scop_membership_submit_wizard.xml index 9e9b76c..488f33e 100644 --- a/wizard/scop_membership_submit_wizard.xml +++ b/wizard/scop_membership_submit_wizard.xml @@ -23,6 +23,13 @@ </div> <group> <field name="partner_id" readonly="1" /> + <div> + <label for="activity_desc" /> + <p + class="text-muted" + >La description de l'activité sera affichée sur l'annuaire des coopératives</p> + </div> + <field name="activity_desc" nolabel="1" required="1" /> </group> <footer> <button -- GitLab