From 26ba848b54632b39dac742baf760ee3be876af81 Mon Sep 17 00:00:00 2001 From: Juliana <juliana@le-filament.com> Date: Tue, 24 Jan 2023 17:40:00 +0100 Subject: [PATCH] [UPD]Pre commit --- models/acc_price_conf.py | 1 - report/account_report.xml | 2 +- security/security.xml | 18 +++++++-------- views/acc_price_conf_views.xml | 22 ++++++++++++++----- wizard/acc_price_conf_wizard.py | 1 - wizard/acc_price_conf_wizard_views.xml | 2 +- wizard/acc_update_price_conf_wizard_views.xml | 13 +++++++---- 7 files changed, 37 insertions(+), 22 deletions(-) diff --git a/models/acc_price_conf.py b/models/acc_price_conf.py index ffa74a6..7224be1 100644 --- a/models/acc_price_conf.py +++ b/models/acc_price_conf.py @@ -174,4 +174,3 @@ class AccPriceConf(models.Model): vals_list += new_vals res = super(AccPriceConf, self).create(vals_list) return res - diff --git a/report/account_report.xml b/report/account_report.xml index b278f98..df2ac18 100644 --- a/report/account_report.xml +++ b/report/account_report.xml @@ -29,7 +29,7 @@ <field name="print_report_name">'Facture - %s' % (object.name)</field> <field name="binding_model_id" ref="model_acc_account" /> <field name="binding_type">report</field> - <field name="paperformat_id" ref="acc_account.paperformat_spe"/> + <field name="paperformat_id" ref="acc_account.paperformat_spe" /> </record> </data> diff --git a/security/security.xml b/security/security.xml index 8940cb5..fc2b47c 100644 --- a/security/security.xml +++ b/security/security.xml @@ -39,9 +39,9 @@ name="domain_force" >[('seller_id','in',[user.partner_id.parent_id.id or -1, user.partner_id.id])]</field> <field name="groups" eval="[(4, ref('base.group_portal'))]" /> - <field name="perm_write" eval="False"/> - <field name="perm_create" eval="False"/> - <field name="perm_unlink" eval="False"/> + <field name="perm_write" eval="False" /> + <field name="perm_create" eval="False" /> + <field name="perm_unlink" eval="False" /> </record> <record id="acc_contract_rule_portal_cont2" model="ir.rule"> @@ -51,9 +51,9 @@ name="domain_force" >[('buyer_id','in',[user.partner_id.parent_id.id or -1, user.partner_id.id])]</field> <field name="groups" eval="[(4, ref('base.group_portal'))]" /> - <field name="perm_write" eval="False"/> - <field name="perm_create" eval="False"/> - <field name="perm_unlink" eval="False"/> + <field name="perm_write" eval="False" /> + <field name="perm_create" eval="False" /> + <field name="perm_unlink" eval="False" /> </record> <record id="acc_contract_rule_portal_all" model="ir.rule"> @@ -63,9 +63,9 @@ name="domain_force" >[('type', '=', 'all'), ('acc_operation_id', 'in', user.partner_id.parent_id.injection_counter_ids.acc_operation_id.ids + user.partner_id.injection_counter_ids.acc_operation_id.ids)]</field> <field name="groups" eval="[(4, ref('base.group_portal'))]" /> - <field name="perm_write" eval="False"/> - <field name="perm_create" eval="False"/> - <field name="perm_unlink" eval="False"/> + <field name="perm_write" eval="False" /> + <field name="perm_create" eval="False" /> + <field name="perm_unlink" eval="False" /> </record> </data> diff --git a/views/acc_price_conf_views.xml b/views/acc_price_conf_views.xml index 138e3bb..8954a17 100644 --- a/views/acc_price_conf_views.xml +++ b/views/acc_price_conf_views.xml @@ -9,16 +9,28 @@ <form string="Gestion des prix"> <sheet> <group> - <field name="type"/> + <field name="type" /> </group> <group> <group> <field name="acc_operation_id" /> <field name="acc_injection_id" /> - <field name="acc_delivery_id" attrs="{'invisible': [('type', '=', 'buyer')]}"/> - <field name="acc_buyer_id" attrs="{'invisible': [('type', '!=', 'buyer')]}"/> - <field name="power_delivery" attrs="{'invisible': [('type', '=', 'buyer')]}"/> - <field name="zip" attrs="{'invisible': [('type', '!=', 'accise')]}"/> + <field + name="acc_delivery_id" + attrs="{'invisible': [('type', '=', 'buyer')]}" + /> + <field + name="acc_buyer_id" + attrs="{'invisible': [('type', '!=', 'buyer')]}" + /> + <field + name="power_delivery" + attrs="{'invisible': [('type', '=', 'buyer')]}" + /> + <field + name="zip" + attrs="{'invisible': [('type', '!=', 'accise')]}" + /> </group> <group> <field name="start_date" /> diff --git a/wizard/acc_price_conf_wizard.py b/wizard/acc_price_conf_wizard.py index b781827..020e081 100644 --- a/wizard/acc_price_conf_wizard.py +++ b/wizard/acc_price_conf_wizard.py @@ -102,4 +102,3 @@ class AccPriceConfWizard(models.TransientModel): if self.start_date: for price in self.acc_price_conf_ids: price.start_date = self.start_date - diff --git a/wizard/acc_price_conf_wizard_views.xml b/wizard/acc_price_conf_wizard_views.xml index 20005ea..127b014 100644 --- a/wizard/acc_price_conf_wizard_views.xml +++ b/wizard/acc_price_conf_wizard_views.xml @@ -45,7 +45,7 @@ <group> <group> <field name="start_date" /> - <field name="type" invisible="1"/> + <field name="type" invisible="1" /> </group> </group> <field diff --git a/wizard/acc_update_price_conf_wizard_views.xml b/wizard/acc_update_price_conf_wizard_views.xml index 1e479ec..a68ceee 100644 --- a/wizard/acc_update_price_conf_wizard_views.xml +++ b/wizard/acc_update_price_conf_wizard_views.xml @@ -7,11 +7,16 @@ <field name="arch" type="xml"> <form string="Mise à jour du prix"> <group> - <field name="price"/> + <field name="price" /> </group> <footer> - <button string="Mettre à jour" name="update_price" type="object" class="btn-primary"/> - <button string="Annuler" class="btn-default" special="cancel"/> + <button + string="Mettre à jour" + name="update_price" + type="object" + class="btn-primary" + /> + <button string="Annuler" class="btn-default" special="cancel" /> </footer> </form> </field> @@ -21,7 +26,7 @@ <field name="name">Mise à jour du prix en masse</field> <field name="res_model">acc.update.price.conf.wizard</field> <field name="view_mode">form</field> - <field name="view_id" ref="view_acc_price_conf_update_price"/> + <field name="view_id" ref="view_acc_price_conf_update_price" /> <field name="target">new</field> <field name="binding_model_id" ref="acc_account.model_acc_price_conf" /> <field name="binding_view_types">list</field> -- GitLab