diff --git a/models/acc_account.py b/models/acc_account.py index 0f29778dd02feac5335d670136ef05cc91b023c4..2db658470bd329a30dac8145bea0f64570217b1a 100644 --- a/models/acc_account.py +++ b/models/acc_account.py @@ -237,8 +237,7 @@ class AccAccountTax(models.Model): _description = "Taxe" name = fields.Char(string="Nom", required=True) - amount = fields.Float( - required=True, digits=(16, 4), default=0.0, string="Montant") + amount = fields.Float(required=True, digits=(16, 4), default=0.0, string="Montant") class AccAccountTaxTcfe(models.Model): diff --git a/models/acc_operation.py b/models/acc_operation.py index 759064b739891467f33f4d911daf82271aa17107..15b81f31b4995b8839bd10662d99ddab20720343 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -226,7 +226,8 @@ class AccOperation(models.Model): ("acc_operation_id", "=", self.id), ("acc_injection_id", "=", acc_injection_id.id), ("acc_delivery_id", "=", acc_delivery_id.id), - "|", ("end_date", ">=", date_start), + "|", + ("end_date", ">=", date_start), ("end_date", "=", False), ] ) diff --git a/report/account_template.xml b/report/account_template.xml index e23c46182149fb307eb22cf70c0d6cc8bc7bdcb0..81ec2d5012a3dc618233ea384bb299035766546c 100644 --- a/report/account_template.xml +++ b/report/account_template.xml @@ -240,7 +240,8 @@ class="font-weight-bold" >Courrier:</span><br /> <span t-field="o.consumer_id.email" /><br /> - <span t-if="o.consumer_id.ref" + <span + t-if="o.consumer_id.ref" class="font-weight-bold" >Référence Client:</span><br /> <span t-field="o.consumer_id.ref" /> @@ -309,13 +310,11 @@ <span class="font-weight-bold" >Nom producteur</span><br /> - <span t-field="o.producer_id.name" - /><br /> + <span t-field="o.producer_id.name" /><br /> <span class="font-weight-bold" >Référence point d'injection (PRM):</span><br /> - <span t-field="o.acc_injection_id.name" - /><br /> + <span t-field="o.acc_injection_id.name" /><br /> <span class="text-center font-weight-bold" >Lieu de production:</span><br /> diff --git a/views/acc_account_views.xml b/views/acc_account_views.xml index d76bb1bcf52e172ce898042ead627d4e231e5888..9ee6353110dcc1cfc1dbd2ba592111c45036133a 100644 --- a/views/acc_account_views.xml +++ b/views/acc_account_views.xml @@ -27,14 +27,21 @@ <field name="quantity" readonly="1" /> </group> <group string="Dates"> - <label for="start_date" string="Période Facturation"/> - <div class="d-flex" > + <label + for="start_date" + string="Période Facturation" + /> + <div class="d-flex"> <span class="o_form_label mx-3"> du </span> - <field name="start_date" - placeholder="Date de début"/> + <field + name="start_date" + placeholder="Date de début" + /> <span class="o_form_label mx-3"> au </span> - <field name="end_date" - placeholder="Date de fin"/> + <field + name="end_date" + placeholder="Date de fin" + /> </div> </group> @@ -236,14 +243,15 @@ </group> <group string="Période de facturation"> - <label for="start_date" string="Période Facturation"/> - <div class="d-flex" > + <label for="start_date" string="Période Facturation" /> + <div class="d-flex"> <span class="o_form_label mx-3"> du </span> - <field name="start_date" - placeholder="Date de début"/> + <field + name="start_date" + placeholder="Date de début" + /> <span class="o_form_label mx-3 "> au </span> - <field name="end_date" - placeholder="Date de fin"/> + <field name="end_date" placeholder="Date de fin" /> </div> <field name="power_cons" /> <field name="amount_tcfe" /> diff --git a/views/acc_counter_views.xml b/views/acc_counter_views.xml index 90992fe6f1f01022599c7fe7b4b9906e9ca56a10..93c2959f3350d947f70a1157258a3d5381945401 100644 --- a/views/acc_counter_views.xml +++ b/views/acc_counter_views.xml @@ -58,8 +58,11 @@ </div> <group name="infos" position="after"> <notebook> - <page string="Facturation" name="account" - attrs="{'invisible': [('is_injection', '!=', True)]}"> + <page + string="Facturation" + name="account" + attrs="{'invisible': [('is_injection', '!=', True)]}" + > <group> <group> <field