diff --git a/controllers/main.py b/controllers/main.py index 97b09c9d124ff1a8737bc31d86abe0c0dd7c7213..ad854d2d8d1e0591d58382f7bb80c9e588363577 100644 --- a/controllers/main.py +++ b/controllers/main.py @@ -4,7 +4,6 @@ import base64 from odoo import SUPERUSER_ID, _, http -from odoo.exceptions import AccessError, MissingError from odoo.http import Response, request from odoo.tools import consteq diff --git a/models/acc_account_payment.py b/models/acc_account_payment.py index d3590c0f58cf0eda98c0226cf3feb999d47973b3..ea12c75b1edf686b08670c639556920b4dffc821 100644 --- a/models/acc_account_payment.py +++ b/models/acc_account_payment.py @@ -1,7 +1,7 @@ # Copyright 2023 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import fields, models, api +from odoo import api, fields, models class AccAccountPayment(models.Model): diff --git a/models/acc_operation.py b/models/acc_operation.py index 8b2f3f29e5861accf22b91ca933142bd119d5ad7..c64ae62bd9252b03f25f97fb8643b27143006582 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -3,10 +3,9 @@ from dateutil.relativedelta import relativedelta -from odoo import api, fields, models, _ -from odoo.tools import date_utils - +from odoo import _, api, fields, models from odoo.exceptions import ValidationError +from odoo.tools import date_utils class AccOperation(models.Model): diff --git a/models/res_config_settings.py b/models/res_config_settings.py index 3fa08215c098f712ad10cbfdf34674325a258c0d..4fbb6576adfb0daef5b3ef372adf895a44b51fbd 100644 --- a/models/res_config_settings.py +++ b/models/res_config_settings.py @@ -1,7 +1,7 @@ # Copyright 2023 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import api, fields, models, _ +from odoo import fields, models class ResConfigSettings(models.TransientModel): diff --git a/report/account_template.xml b/report/account_template.xml index f96df2e479a0861174e34df6949b740d077a0894..736f589ceebec22a472356023c4cf2f934797e72 100644 --- a/report/account_template.xml +++ b/report/account_template.xml @@ -22,9 +22,9 @@ <p class="font-weight-bold"> <span>Facture <t t-esc="o.name" /></span><br /> <span>En date du: <span - t-field="o.date" - t-options="{'format': 'dd/MM/yyyy'}" - /> + t-field="o.date" + t-options="{'format': 'dd/MM/yyyy'}" + /> </span><br /> <t t-if="o.producer_id.vat" @@ -202,27 +202,35 @@ alt="Logo" /> </t> - <t t-else=""><h4 class="text-center" t-field="o.producer_id.name" /></t> + <t t-else=""><h4 + class="text-center" + t-field="o.producer_id.name" + /></t> </div> <div class="col-8 text-center"> <p class="font-weight-bold"> <span class="text-uppercase mt0 " - >Votre facture d'électricité d'origine renouvelable et locale</span><br/> + >Votre facture d'électricité d'origine renouvelable et locale</span><br + /> <span>Facture <t t-esc="o.name" /> du <span - t-field="o.date" - t-options="{'format': 'dd/MM/yyyy'}" - /></span> + t-field="o.date" + t-options="{'format': 'dd/MM/yyyy'}" + /></span> </p> - <span class="font-mini">Adressée par voie électronique<br/> + <span + class="font-mini" + >Adressée par voie électronique<br /> Facture de consommation</span> </div> </div> <div class="row mt-4 mb-5"> <div class="col-4 grey-div "> - <h5 class="font-weight-bold mb-3 mt-2 text-center">Vos références utiles</h5> + <h5 + class="font-weight-bold mb-3 mt-2 text-center" + >Vos références utiles</h5> <p> <span class="font-weight-bold" @@ -232,9 +240,10 @@ <t t-if="o.consumer_id.street2"><span t-field="o.consumer_id.street2" /><br /></t> - <t t-if="o.consumer_id.city"><span t-field="o.consumer_id.zip" /> - <span - t-field="o.consumer_id.city" - /><br /></t> + <t t-if="o.consumer_id.city"><span + t-field="o.consumer_id.zip" + /> - <span t-field="o.consumer_id.city" /><br + /></t> <t t-if="o.consumer_id.email"> <span t-field="o.consumer_id.email" /><br /> </t> @@ -242,20 +251,18 @@ <span t-field="o.consumer_id.phone" /><br /> </t> <t t-if="o.consumer_id.vat"><span - class="font-weight-bold" - >N°TVA:</span><br /> + class="font-weight-bold" + >N°TVA:</span><br /> <span t-field="o.consumer_id.vat" /><br /> </t> <span class="font-weight-bold" - >Point Référence Mesures (PRM-C):</span><br - /> + >Point Référence Mesures (PRM-C):</span><br /> <span t-field="o.acc_delivery_id.name" /><br /> <span class="font-weight-bold" >Lieu de consommation:</span><br /> - <span t-field="o.acc_delivery_id.street" /><br - /> + <span t-field="o.acc_delivery_id.street" /><br /> <t t-if="o.acc_delivery_id.street2"><span t-field="o.acc_delivery_id.street2" /><br /></t> @@ -264,41 +271,50 @@ t-field="o.acc_delivery_id.city" /><br /></t> </p> - <h5 class="font-weight-bold mb-3 mt-5 text-center">Référence de l'opération</h5> + <h5 + class="font-weight-bold mb-3 mt-5 text-center" + >Référence de l'opération</h5> <p> <span class="font-weight-bold" >Nom du producteur</span><br /> <span t-field="o.producer_id.name" /><br /> - <span - class="font-weight-bold" - >Nom OACC⁽²⁾</span><br /> - <span t-field="o.acc_operation_id.description" /><br /> - <span - class="font-weight-bold" - >Numéro OACC</span><br /> + <span class="font-weight-bold">Nom OACC⁽²⁾</span><br + /> + <span t-field="o.acc_operation_id.description" /><br + /> + <span class="font-weight-bold">Numéro OACC</span><br + /> <span t-field="o.acc_operation_id.name" /><br /> <span class="font-weight-bold" >Références Points d'Injection (PRM-I)</span><br /> - <t t-foreach="o.acc_operation_id.acc_injection_ids" t-as="inj"> + <t + t-foreach="o.acc_operation_id.acc_injection_ids" + t-as="inj" + > <span t-field="inj.name" /><br /> </t> <t t-if="o.acc_operation_id.acc_origine_ids"> <span class="font-weight-bold" >Origines : </span> - <t t-foreach="o.acc_operation_id.acc_origine_ids" t-as="origine"> + <t + t-foreach="o.acc_operation_id.acc_origine_ids" + t-as="origine" + > <t t-if="origine_first"> - <span t-field="origine.name"/> + <span t-field="origine.name" /> </t> <t t-else=""> - - <span t-field="origine.name"/> + - <span t-field="origine.name" /> </t> </t> </t> </p> - <h5 class="font-weight-bold mb-3 mt-5 text-center">Une question ?</h5> + <h5 + class="font-weight-bold mb-3 mt-5 text-center" + >Une question ?</h5> <p class="mb-2"> <span class="font-weight-bold" @@ -341,9 +357,13 @@ </div> <div class="o_recap_table mt-3"> <div class="text-center"> - <h3 class="text-uppercase">Synthèse de votre facture</h3> - <p class="font-italic">Détails en pages suivantes</p> - <h4>Période de livraison concernée : <br/> + <h3 + class="text-uppercase" + >Synthèse de votre facture</h3> + <p + class="font-italic" + >Détails en pages suivantes</p> + <h4>Période de livraison concernée : <br /> du <span t-field="o.start_date" t-options="{'format': 'dd/MM/yyyy'}" @@ -363,8 +383,8 @@ >Electricité autoconsommée</h5></strong></td> <td class="text-right"> <strong><h4><span - t-field="o.power_cons" - /> kWh</h4></strong> + t-field="o.power_cons" + /> kWh</h4></strong> </td> </tr> <tr> @@ -378,15 +398,17 @@ <tr> <td>Total ACCISE</td> <td class="text-right"> - <span t-field="o.amount_accise_tot" /> <span - >HT</span> + <span + t-field="o.amount_accise_tot" + /> <span>HT</span> </td> </tr> <tr t-if="o.amount_divers_tot > 0"> <td>Total Frais Divers</td> <td class="text-right"> - <span t-field="o.amount_divers_tot" /> <span - >HT</span> + <span + t-field="o.amount_divers_tot" + /> <span>HT</span> </td> </tr> <tr> @@ -400,12 +422,12 @@ <t t-if="o.is_tva"> <tr> <td><strong><h5 - >Total H.T.</h5></strong></td> + >Total H.T.</h5></strong></td> <td class="text-right"> <strong><h4 - class="text-nowrap" - t-field="o.amount_untaxed" - /></strong> + class="text-nowrap" + t-field="o.amount_untaxed" + /></strong> </td> </tr> @@ -442,7 +464,7 @@ <t t-if="o.free_text"> <div class="row mt-4"> <div class="col-12"> - <h6 t-field="o.free_text"/> + <h6 t-field="o.free_text" /> </div> </div> </t> @@ -452,21 +474,34 @@ <h5 class="font-weight-bold" >Modalités de paiement : </h5> - <h6>Référence facture : <t t-esc="o.name" /></h6> - <t t-foreach="o.acc_account_payment_ids" t-as="acc_account_payment_id"> - <strong><span t-field="acc_account_payment_id.name_type"/></strong> - - <span t-field="acc_account_payment_id.description"/><br/> + <h6>Référence facture : <t + t-esc="o.name" + /></h6> + <t + t-foreach="o.acc_account_payment_ids" + t-as="acc_account_payment_id" + > + <strong><span + t-field="acc_account_payment_id.name_type" + /></strong> - + <span + t-field="acc_account_payment_id.description" + /><br /> </t> </div> </div> <div class="row mt-2"> <div class="col-12"> - <h6 >Délai de règlement : à facturation</h6> - <h6 class="mb-5">Date limite de règlement : <strong><span - class="font-weight-bold" - t-field="o.date_limit" - t-options="{'format': 'dd/MM/yyyy'}" - /></strong></h6> + <h6 + >Délai de règlement : à facturation</h6> + <h6 + class="mb-5" + >Date limite de règlement : <strong + ><span + class="font-weight-bold" + t-field="o.date_limit" + t-options="{'format': 'dd/MM/yyyy'}" + /></strong></h6> </div> </div> </t> @@ -479,11 +514,17 @@ <div class="col-12 font-italic font-mini"> <p> (1) Le total à payer correspond à l’électricité autoconsommée et à l'ACCISE - (2) OACC : Opération d'Auto-Consommation Collective - <br/><br/><span t-if="o.invoice_terms" t-field="o.invoice_terms"/> + <br /><br /><span + t-if="o.invoice_terms" + t-field="o.invoice_terms" + /> </p> </div> </div> - <t t-set="prmi_ids" t-value="o.line_ids.mapped('acc_injection_id')"/> + <t + t-set="prmi_ids" + t-value="o.line_ids.mapped('acc_injection_id')" + /> <t t-foreach="prmi_ids" t-as="injection"> <div class="row" style="page-break-before:always;"> <div class="col-4"> @@ -494,20 +535,28 @@ alt="Logo" /> </t> - <t t-else=""><h4 class="text-center" t-field="o.producer_id.name" /></t> + <t t-else=""><h4 + class="text-center" + t-field="o.producer_id.name" + /></t> </div> - <div class="col-8"></div> + <div class="col-8" /> </div> <div class="row mt-4 mb-5"> <div class="col-12 text-center text-uppercase"> - <h4>Votre facture <t t-esc="o.name" /> en détail</h4> + <h4>Votre facture <t + t-esc="o.name" + /> en détail</h4> <span class="text-uppercase " >Autoconsommation Collective <t t-esc="o.acc_operation_id.name" - /></span><br /> - <h5 class="font-weight-bold ">PRM-I : <span class="font-weight-bold " t-field="injection.name"/></h5> + /></span><br /> + <h5 class="font-weight-bold ">PRM-I : <span + class="font-weight-bold " + t-field="injection.name" + /></h5> </div> </div> <div class="row mt-5 "> @@ -522,20 +571,32 @@ <thead> <tr> <th>Période</th> - <th class="text-center">Quantité consommée</th> - <th class="text-center">Prix unitaire</th> + <th + class="text-center" + >Quantité consommée</th> + <th + class="text-center" + >Prix unitaire</th> <t t-if="o.is_tva"> - <th class="text-center">Total HT</th> + <th + class="text-center" + >Total HT</th> <th class="text-center">TVA</th> </t> <th class="text-center">Total TTC</th> </tr> </thead> <tbody> - <t t-set="current_subtotal" t-value="0"/> - <t t-set="lines_sale" t-value="o.line_ids.filtered(lambda line: line.acc_injection_id == injection and not line.is_tax)" /> + <t t-set="current_subtotal" t-value="0" /> + <t + t-set="lines_sale" + t-value="o.line_ids.filtered(lambda line: line.acc_injection_id == injection and not line.is_tax)" + /> <t t-foreach="lines_sale" t-as="line"> - <t t-set="current_subtotal" t-value="current_subtotal + line.price_total_ttc"/> + <t + t-set="current_subtotal" + t-value="current_subtotal + line.price_total_ttc" + /> <tr class=""> <td> <span @@ -577,14 +638,18 @@ </td> </tr> </t> - <tr class="border-black o_total font-weight-bold"> + <tr + class="border-black o_total font-weight-bold" + > <t t-if="o.is_tva"> <td colspan="5">MONTANT TOTAL</td> </t> <t t-else=""> <td colspan="3">MONTANT TOTAL</td> </t> - <td class="text-center font-weight-bold"> + <td + class="text-center font-weight-bold" + > <span t-esc="current_subtotal" t-options='{"widget": "monetary", "display_currency": o.currency_id}' @@ -604,20 +669,32 @@ <thead> <tr> <th>Période</th> - <th class="text-center">Quantité consommée</th> - <th class="text-center">Prix unitaire</th> + <th + class="text-center" + >Quantité consommée</th> + <th + class="text-center" + >Prix unitaire</th> <t t-if="o.is_tva"> - <th class="text-center">Total HT</th> + <th + class="text-center" + >Total HT</th> <th class="text-center">TVA</th> </t> <th class="text-center">Total TTC</th> </tr> </thead> <tbody> - <t t-set="current_subtotal" t-value="0"/> - <t t-set="lines_accise" t-value="o.line_ids.filtered(lambda line: line.acc_injection_id == injection and line.is_tax)" /> + <t t-set="current_subtotal" t-value="0" /> + <t + t-set="lines_accise" + t-value="o.line_ids.filtered(lambda line: line.acc_injection_id == injection and line.is_tax)" + /> <t t-foreach="lines_accise" t-as="line"> - <t t-set="current_subtotal" t-value="current_subtotal + line.price_total_ttc"/> + <t + t-set="current_subtotal" + t-value="current_subtotal + line.price_total_ttc" + /> <t t-if="line.is_tax"> <tr class=""> <td> @@ -663,7 +740,9 @@ </t> <t t-else="" /> </t> - <tr class="border-black o_total font-weight-bold"> + <tr + class="border-black o_total font-weight-bold" + > <t t-if="o.is_tva"> <td colspan="5">MONTANT TOTAL</td> </t> @@ -680,34 +759,42 @@ </tbody> </table> <p class="mt-5 font-italic"> - <span t-field="o.invoice_terms_tax"/> + <span t-field="o.invoice_terms_tax" /> </p> </div> </div> </t> <!-- Partie pour les lignes de facture supplémentaires --> - <t t-set="lines_sale" t-value="o.line_ids.filtered(lambda line: not line.acc_injection_id)" /> + <t + t-set="lines_sale" + t-value="o.line_ids.filtered(lambda line: not line.acc_injection_id)" + /> <t t-if="lines_sale"> <div class="row" style="page-break-before:always;"> <div class="col-4"> <t t-if="o.producer_id.image_1920"> <img - t-att-src="image_data_uri(o.producer_id.image_1920)" - style="max-height: 80px;" - alt="Logo" - /> + t-att-src="image_data_uri(o.producer_id.image_1920)" + style="max-height: 80px;" + alt="Logo" + /> </t> - <t t-else=""><h4 class="text-center" t-field="o.producer_id.name" /></t> + <t t-else=""><h4 + class="text-center" + t-field="o.producer_id.name" + /></t> </div> - <div class="col-8"></div> + <div class="col-8" /> </div> <div class="row mt-4 mb-5"> <div class="col-12 text-center text-uppercase"> - <h4>Votre facture <t t-esc="o.name" /> en détail</h4> + <h4>Votre facture <t + t-esc="o.name" + /> en détail</h4> <span - class="text-uppercase " - >Autoconsommation Collective <t - t-esc="o.acc_operation_id.name" + class="text-uppercase " + >Autoconsommation Collective <t + t-esc="o.acc_operation_id.name" /></span> </div> </div> @@ -717,78 +804,98 @@ <!-- Table les lignes spécifiques --> <h6>Frais divers</h6> <table - class="table table-sm o_main_table" - name="account_line_table" - > + class="table table-sm o_main_table" + name="account_line_table" + > <thead> <tr> <th>Description</th> - <th class="text-center">Quantité</th> - <th class="text-center">Prix unitaire</th> + <th + class="text-center" + >Quantité</th> + <th + class="text-center" + >Prix unitaire</th> <t t-if="o.is_tva"> - <th class="text-center">Total HT</th> + <th + class="text-center" + >Total HT</th> <th class="text-center">TVA</th> </t> - <th class="text-center">Total TTC</th> + <th + class="text-center" + >Total TTC</th> </tr> </thead> <tbody> - <t t-set="current_subtotal" t-value="0"/> + <t + t-set="current_subtotal" + t-value="0" + /> <t t-foreach="lines_sale" t-as="line"> - <t t-set="current_subtotal" t-value="current_subtotal + line.price_total_ttc"/> + <t + t-set="current_subtotal" + t-value="current_subtotal + line.price_total_ttc" + /> <tr class=""> <td> <span - t-field="line.description" - t-options="{'widget': 'text'}" - /> + t-field="line.description" + t-options="{'widget': 'text'}" + /> </td> <td class="text-center"> <span - class="text-nowrap" - t-field="line.quantity" - /> + class="text-nowrap" + t-field="line.quantity" + /> </td> <td class="text-center"> <span - class="text-nowrap" - t-field="line.price_unit" - /><span> €</span> + class="text-nowrap" + t-field="line.price_unit" + /><span> €</span> </td> <t t-if="o.is_tva"> <td class="text-center"> <span - class="text-nowrap" - t-field="line.price_total" - /> + class="text-nowrap" + t-field="line.price_total" + /> </td> <td class="text-center"> <span - class="text-nowrap" - t-field="line.tax_id.name" - /> + class="text-nowrap" + t-field="line.tax_id.name" + /> </td> </t> <td class="text-center"> <span - class="text-nowrap" - t-field="line.price_total_ttc" - /> + class="text-nowrap" + t-field="line.price_total_ttc" + /> </td> </tr> </t> - <tr class="border-black o_total font-weight-bold"> + <tr + class="border-black o_total font-weight-bold" + > <t t-if="o.is_tva"> - <td colspan="5">MONTANT TOTAL</td> + <td + colspan="5" + >MONTANT TOTAL</td> </t> <t t-else=""> - <td colspan="3">MONTANT TOTAL</td> + <td + colspan="3" + >MONTANT TOTAL</td> </t> <td class="text-center"> <span - t-esc="current_subtotal" - t-options='{"widget": "monetary", "display_currency": o.currency_id}' - /> + t-esc="current_subtotal" + t-options='{"widget": "monetary", "display_currency": o.currency_id}' + /> </td> </tr> </tbody> diff --git a/static/src/scss/style.scss b/static/src/scss/style.scss index 8271cc98a3b629120df727930be1cad88ab8a130..8ebedcb4e107842b1bc26c810a161dd8809608ad 100644 --- a/static/src/scss/style.scss +++ b/static/src/scss/style.scss @@ -21,25 +21,26 @@ } .table th, - td { +td { border-top: none !important; } -.table .border-black td, .border-black th { +.table .border-black td, +.border-black th { border-top: 1px solid black !important; } -.o_report_layout_boxed .font-italic{ +.o_report_layout_boxed .font-italic { font-style: italic !important; } -.o_report_layout_boxed .font-mini{ +.o_report_layout_boxed .font-mini { font-size: 13px !important; } -.page .bloc-header .col-4.grey-div , +.page .bloc-header .col-4.grey-div, .o_report_layout_boxed .col-4.grey-div { - background-color: #EFF0F1 !important; + background-color: #eff0f1 !important; padding-top: 20px; padding-bottom: 20px; } diff --git a/views/acc_account_payment_views.xml b/views/acc_account_payment_views.xml index f50de7bfe3395897582ef3cbc9c48f5fb44fe95d..3c2dbba053aab80eeb15fc217a8991f65bcd25c6 100644 --- a/views/acc_account_payment_views.xml +++ b/views/acc_account_payment_views.xml @@ -9,7 +9,7 @@ <form string="Méthodes de paiement"> <sheet> <group> - <field name="name" invisible="1"/> + <field name="name" invisible="1" /> <field name="producer_id" /> <field name="name_type" /> <field name="description" /> @@ -24,8 +24,8 @@ <field name="model">acc.account.payment</field> <field name="arch" type="xml"> <tree string="Méthodes de paiement"> - <field name="producer_id"/> - <field name="name_type"/> + <field name="producer_id" /> + <field name="name_type" /> <field name="name" invisible="1" /> <field name="description" /> </tree> diff --git a/views/acc_account_views.xml b/views/acc_account_views.xml index 2208b797f845adb778929c79c943c49dae5d864a..116c5e6338162635735bce176d60d8c2d95ff165 100644 --- a/views/acc_account_views.xml +++ b/views/acc_account_views.xml @@ -12,7 +12,7 @@ <form string="Détail Facture" create="false"> <sheet> <group> - <field name="acc_account_id" readonly="1"/> + <field name="acc_account_id" readonly="1" /> <field name="acc_operation_id" readonly="1" /> <field name="producer_id" readonly="1" /> <field name="acc_delivery_id" readonly="1" /> @@ -22,7 +22,7 @@ <page string="Information" name="information"> <group> <group string="Montant"> - <field name="description" readonly="1"/> + <field name="description" readonly="1" /> <field name="quantity" readonly="1" /> </group> <group string="Dates"> @@ -34,12 +34,14 @@ <span class="o_form_label mx-3"> du </span> <field name="start_date" - placeholder="Date de début" readonly="1" + placeholder="Date de début" + readonly="1" /> <span class="o_form_label mx-3"> au </span> <field name="end_date" - placeholder="Date de fin" readonly="1" + placeholder="Date de fin" + readonly="1" /> </div> </group> @@ -69,7 +71,7 @@ sample="1" > <field name="acc_operation_id" optional="show" /> - <field name="acc_account_id" optional="show"/> + <field name="acc_account_id" optional="show" /> <field name="producer_id" optional="show" /> <field name="acc_delivery_id" optional="show" /> <field name="is_tax" optional="show" /> @@ -99,7 +101,7 @@ <field name="name" /> <field name="acc_operation_id" optional="show" /> <field name="producer_id" optional="show" /> - <field name="consumer_id" optional="show" /> + <field name="consumer_id" optional="show" /> <field name="acc_delivery_id" optional="show" /> <field name="amount_untaxed" @@ -248,9 +250,7 @@ name="producer_id" options='{"always_reload": True, "no_quick_create": True}' /> - <field - name="is_collectivite" widget="boolean_toggle" - /> + <field name="is_collectivite" widget="boolean_toggle" /> <field name="acc_delivery_id" options='{"always_reload": True, "no_quick_create": True}' @@ -345,8 +345,14 @@ /> </group> <group> - <field name="invoice_terms" placeholder="Termes and conditions de paiement..."/> - <field name="invoice_terms_tax" placeholder="Termes and conditions des taxes..."/> + <field + name="invoice_terms" + placeholder="Termes and conditions de paiement..." + /> + <field + name="invoice_terms_tax" + placeholder="Termes and conditions des taxes..." + /> </group> </page> <page name="other_infos" string="Autres informations"> @@ -355,7 +361,7 @@ </group> <group> <group> - <field name="free_text"/> + <field name="free_text" /> </group> </group> </page> diff --git a/views/acc_operation_views.xml b/views/acc_operation_views.xml index 2e7e47a568b273773254b36729b1ff892ac2b368..fc6b3a717f0a20827134efd24c2d3da546ad2a5b 100644 --- a/views/acc_operation_views.xml +++ b/views/acc_operation_views.xml @@ -74,8 +74,8 @@ expr="//notebook//page[@name='delivery']//field//tree" position="inside" > - <field name="sale_price" options="{'field_digits': True}"/> - <field name="price_accise" options="{'field_digits': True}"/> + <field name="sale_price" options="{'field_digits': True}" /> + <field name="price_accise" options="{'field_digits': True}" /> </xpath> <xpath expr="//notebook//page[@name='delivery']//field" @@ -127,7 +127,11 @@ <field name="start_date" /> <field name="end_date" /> <field name="currency_id" invisible="1" /> - <field name="price" widget="monetary" options="{'field_digits': True}"/> + <field + name="price" + widget="monetary" + options="{'field_digits': True}" + /> </tree> </field> </page> @@ -158,7 +162,11 @@ <field name="start_date" /> <field name="end_date" /> <field name="currency_id" invisible="1" /> - <field name="price" widget="monetary" options="{'field_digits': True}"/> + <field + name="price" + widget="monetary" + options="{'field_digits': True}" + /> </tree> </field> </page> @@ -191,7 +199,11 @@ <field name="start_date" /> <field name="end_date" /> <field name="currency_id" invisible="1" /> - <field name="price" widget="monetary" options="{'field_digits': True}"/> + <field + name="price" + widget="monetary" + options="{'field_digits': True}" + /> </tree> </field> </page> diff --git a/views/res_config_settings_views.xml b/views/res_config_settings_views.xml index b2d0c0cde0ed551ce6d7e12274d94a9d1288ae2a..090a1d2a3cba79dafba7af25ea98d6f7f05f3a75 100644 --- a/views/res_config_settings_views.xml +++ b/views/res_config_settings_views.xml @@ -14,28 +14,34 @@ > <div class="col-12 col-lg-6 o_setting_box" id="terms_invoice"> <div class="o_setting_right_pane"> - <label for="invoice_terms"/> - <span class="fa fa-lg fa-building-o" role="img"/> + <label for="invoice_terms" /> + <span class="fa fa-lg fa-building-o" role="img" /> <div class="text-muted"> Affichage des termes et conditions générales des factures </div> <div class="content-group"> <div class="mt16"> - <field name="invoice_terms" placeholder="Rédiger les termes et conditions de paiement ici..."/> + <field + name="invoice_terms" + placeholder="Rédiger les termes et conditions de paiement ici..." + /> </div> </div> </div> </div> <div class="col-12 col-lg-6 o_setting_box" id="terms_invoice_tax"> <div class="o_setting_right_pane"> - <label for="invoice_terms_tax"/> - <span class="fa fa-lg fa-building-o" role="img"/> + <label for="invoice_terms_tax" /> + <span class="fa fa-lg fa-building-o" role="img" /> <div class="text-muted"> Affichage des termes et conditions générales des taxes des factures </div> <div class="content-group"> <div class="mt16"> - <field name="invoice_terms_tax" placeholder="Rédiger les termes et conditions des taxes ici..."/> + <field + name="invoice_terms_tax" + placeholder="Rédiger les termes et conditions des taxes ici..." + /> </div> </div> </div> diff --git a/views/res_partner_views.xml b/views/res_partner_views.xml index fb7bc67f0dc888128351aac981711e45414271d1..7e6efb333f11c2be6c39ccf75e18780e66ad20b1 100644 --- a/views/res_partner_views.xml +++ b/views/res_partner_views.xml @@ -44,7 +44,7 @@ </group> </group> <group> - <field name="free_text"/> + <field name="free_text" /> </group> <field name="acc_account_payment_ids" /> </page>