From e8ff9e00d27eae6d7142b71e95015c33331cee1f Mon Sep 17 00:00:00 2001 From: benjamin <benjamin@le-filament.com> Date: Thu, 4 Jan 2024 18:06:35 +0100 Subject: [PATCH] [CLEAN] pre-commit --- models/res_users.py | 2 +- security/security_rules.xml | 14 +- views/res_partner.xml | 202 ++++++++++++--------------- wizard/scop_membership_out_wizard.py | 4 +- 4 files changed, 106 insertions(+), 116 deletions(-) diff --git a/models/res_users.py b/models/res_users.py index f307ee7..bf7b515 100644 --- a/models/res_users.py +++ b/models/res_users.py @@ -15,7 +15,7 @@ class ResUsers(models.Model): comodel_name="union.regionale", compute="_compute_ur_id", string="UR", - store=True + store=True, ) current_ur_id = fields.Many2one( comodel_name="union.regionale", diff --git a/security/security_rules.xml b/security/security_rules.xml index 92c83ca..06c3a3c 100644 --- a/security/security_rules.xml +++ b/security/security_rules.xml @@ -50,12 +50,18 @@ <record id="group_cg_administrative" model="res.groups"> <field name="name">Service Administratif</field> - <field name="category_id" ref="cgscop_partner.module_cgscop_administration_category" /> + <field + name="category_id" + ref="cgscop_partner.module_cgscop_administration_category" + /> </record> <record id="group_cg_administrator" model="res.groups"> <field name="name">Administrateur CG</field> - <field name="category_id" ref="cgscop_partner.module_cgscop_administration_category" /> + <field + name="category_id" + ref="cgscop_partner.module_cgscop_administration_category" + /> <field name="implied_ids" eval="[(6, 0, [ref('cgscop_partner.group_cg_administrative')])]" @@ -223,7 +229,9 @@ <record id="mail_activity_type_rule_admin" model="ir.rule"> <field name="name">mail activity type rule administrator</field> <field name="model_id" ref="mail.model_mail_activity_type" /> - <field name="domain_force">['|', ('ur_id','=',False), ('ur_id','=',user.current_ur_id.id)]</field> + <field + name="domain_force" + >['|', ('ur_id','=',False), ('ur_id','=',user.current_ur_id.id)]</field> <field name="perm_read" eval="True" /> <field name="perm_write" eval="True" /> <field name="perm_create" eval="True" /> diff --git a/views/res_partner.xml b/views/res_partner.xml index 8b14d66..3bf5550 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -431,11 +431,7 @@ /> </p> - <field - name="child_ids" - mode="kanban" - readonly="1" - > + <field name="child_ids" mode="kanban" readonly="1"> <kanban> <field name="id" /> <field name="color" /> @@ -688,9 +684,7 @@ attrs="{'invisible':[('dissolution_reason_id','=', False)]}" /> </h3> - <p - attrs="{'invisible':[('membership_status','!=', 'out')]}" - > + <p attrs="{'invisible':[('membership_status','!=', 'out')]}"> <span class="badge badge-danger"> Radié </span> @@ -1344,11 +1338,7 @@ string="Ajouter un contact" /> </p> - <field - name="other_child_ids" - mode="kanban" - readonly="1" - > + <field name="other_child_ids" mode="kanban" readonly="1"> <kanban> <field name="id" /> <field name="color" /> @@ -1928,10 +1918,7 @@ attrs="{'invisible': ['|',('type', '!=', 'contact'), ('ur_id','!=',%(cgscop_partner.riga_14234)d)]}" > - <div - class="alert alert-warning" - role="alert" - > + <div class="alert alert-warning" role="alert"> Attention ces informations sous soumises à la règlementation RGPD. </div> <group> @@ -1939,59 +1926,59 @@ <div> <div name="div_address" class="o_address_format"> <field - name="street" - placeholder="Rue..." - class="o_address_street" - /> + name="street" + placeholder="Rue..." + class="o_address_street" + /> <field - name="street2" - placeholder="Rue 2..." - class="o_address_street" - /> + name="street2" + placeholder="Rue 2..." + class="o_address_street" + /> <field - name="street3" - placeholder="Rue 3..." - class="o_address_street" - /> + name="street3" + placeholder="Rue 3..." + class="o_address_street" + /> <field - name="zip_id" - options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}" - placeholder="CP/Ville autocomplétion" - class="oe_edit_only" - /> + name="zip_id" + options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}" + placeholder="CP/Ville autocomplétion" + class="oe_edit_only" + /> <field - name="zip" - placeholder="ZIP" - class="o_address_city" - /> + name="zip" + placeholder="ZIP" + class="o_address_city" + /> <field - name="city" - placeholder="Ville" - class="o_address_city" - attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}" - modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}" - /> + name="city" + placeholder="Ville" + class="o_address_city" + attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}" + modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}" + /> <field name="city_id" invisible="1" /> <field - name="cedex" - placeholder="Cedex" - class="o_address_city" - attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}" - modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}" - /> + name="cedex" + placeholder="Cedex" + class="o_address_city" + attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}" + modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}" + /> <field - name="state_id" - class="o_address_zip" - placeholder="Région" - options='{"no_open": True, "no_create": True}' - context="{'country_id': country_id, 'zip': zip}" - /> + name="state_id" + class="o_address_zip" + placeholder="Région" + options='{"no_open": True, "no_create": True}' + context="{'country_id': country_id, 'zip': zip}" + /> <field - name="country_id" - placeholder="Country" - class="o_address_country" - options='{"no_open": True, "no_create": True}' - /> + name="country_id" + placeholder="Country" + class="o_address_country" + options='{"no_open": True, "no_create": True}' + /> </div> </div> </group> @@ -2208,10 +2195,7 @@ attrs="{'invisible': ['|',('type', '!=', 'contact'), ('ur_id','!=',%(cgscop_partner.riga_14234)d)]}" > - <div - class="alert alert-warning" - role="alert" - > + <div class="alert alert-warning" role="alert"> Attention ces informations sous soumises à la règlementation RGPD. </div> <group> @@ -2219,59 +2203,59 @@ <div> <div name="div_address" class="o_address_format"> <field - name="street" - placeholder="Rue..." - class="o_address_street" - /> + name="street" + placeholder="Rue..." + class="o_address_street" + /> <field - name="street2" - placeholder="Rue 2..." - class="o_address_street" - /> + name="street2" + placeholder="Rue 2..." + class="o_address_street" + /> <field - name="street3" - placeholder="Rue 3..." - class="o_address_street" - /> + name="street3" + placeholder="Rue 3..." + class="o_address_street" + /> <field - name="zip_id" - options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}" - placeholder="CP/Ville autocomplétion" - class="oe_edit_only" - /> + name="zip_id" + options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}" + placeholder="CP/Ville autocomplétion" + class="oe_edit_only" + /> <field - name="zip" - placeholder="ZIP" - class="o_address_city" - /> + name="zip" + placeholder="ZIP" + class="o_address_city" + /> <field - name="city" - placeholder="Ville" - class="o_address_city" - attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}" - modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}" - /> + name="city" + placeholder="Ville" + class="o_address_city" + attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}" + modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}" + /> <field name="city_id" invisible="1" /> <field - name="cedex" - placeholder="Cedex" - class="o_address_city" - attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}" - modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}" - /> + name="cedex" + placeholder="Cedex" + class="o_address_city" + attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}" + modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}" + /> <field - name="state_id" - class="o_address_zip" - placeholder="Région" - options='{"no_open": True, "no_create": True}' - context="{'country_id': country_id, 'zip': zip}" - /> + name="state_id" + class="o_address_zip" + placeholder="Région" + options='{"no_open": True, "no_create": True}' + context="{'country_id': country_id, 'zip': zip}" + /> <field - name="country_id" - placeholder="Country" - class="o_address_country" - options='{"no_open": True, "no_create": True}' - /> + name="country_id" + placeholder="Country" + class="o_address_country" + options='{"no_open": True, "no_create": True}' + /> </div> </div> </group> diff --git a/wizard/scop_membership_out_wizard.py b/wizard/scop_membership_out_wizard.py index 6e0a9b9..64080c9 100644 --- a/wizard/scop_membership_out_wizard.py +++ b/wizard/scop_membership_out_wizard.py @@ -15,9 +15,7 @@ class ScopMembershipOutWizard(models.TransientModel): return self.env.context.get("active_id") partner_id = fields.Many2one( - comodel_name="res.partner", - string="Partner", - default=_default_partner_id + comodel_name="res.partner", string="Partner", default=_default_partner_id ) type_all = fields.Boolean(string="Tous types d'adhésion", default=True) type_id = fields.Many2one( -- GitLab