diff --git a/models/acc_price_conf.py b/models/acc_price_conf.py index ffa74a6e3500f9b0c193eea3bc014b8cd6f1dbde..7224be13f309f1aaa6edb1c366571a5ead4dd9e0 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 b278f98f1aeda217ee5d912de034b63952898a04..df2ac18b93e87dc364c5418f8631c1c4190b0ea9 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 8940cb5aa8cbd3d6b78cb7e55a0db340b58ece95..fc2b47cf37376516a7ed19e7389adf9d8f9d6523 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 138e3bb7ea7d7018c279418443dcd3373e1db20b..8954a17fb840eac8918d4b2fa980caf41ae184ce 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 b78182784d63d1844f52b6ff2a7a25bb26b30e83..020e0819330924abef6870266a1afc6ab974ef7e 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 20005eac297006becba37f1746bd0d4d892c39a2..127b0141c72eaa9dbfc4775d749c10b6ecbbc0c1 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 1e479ec5153dc95397885137e92f1f49bee562da..a68ceee14ef3ea1679c19d02dbd4f730bad8f59b 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>