diff --git a/models/acc_account.py b/models/acc_account.py index 0a1e5295257b3fdddb4e2ca60c745b16de79def1..21ee32250af73b032273863a87aa2acf822b5436 100644 --- a/models/acc_account.py +++ b/models/acc_account.py @@ -272,6 +272,7 @@ class AccAccount(models.Model): self.is_tva = self.producer_id.is_tva self.tax_id = self.producer_id.tax_id self.is_collectivite = self.producer_id.is_collectivite + self.free_text = self.producer_id.free_text self.acc_account_payment_ids = self.env["acc.account.payment"].search( [("producer_id", "=", self.producer_id.id)]) else: @@ -279,6 +280,7 @@ class AccAccount(models.Model): self.tax_id = False self.is_collectivite = False self.acc_account_payment_ids = False + self.free_text = False @api.onchange("is_tva") def _onchange_is_tva(self): diff --git a/models/acc_operation.py b/models/acc_operation.py index 67b9e2022a6cb262ee320b2fcfc5c1042f826867..b38984cb060b3f4fb96136f98584198d974b027c 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -350,6 +350,7 @@ class AccOperation(models.Model): "is_collectivite": producer_id.is_collectivite, "is_tva": producer_id.is_tva, "tax_id": producer_id.tax_id.id, + "free_text": producer_id.free_text, } ) diff --git a/models/res_partner.py b/models/res_partner.py index 7c0b27f0d5c646338521a6576ed6a1863b5912b3..c5dd2949949db8750da13cf0c738cc13a6f553b4 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -34,6 +34,7 @@ class ResPartner(models.Model): "acc.account.payment", "producer_id", string="Méthodes de paiement") + free_text = fields.Text("Texte libre à afficher sur les factures") # ------------------------------------------------------ # SQL Constraints # ------------------------------------------------------ diff --git a/report/account_template.xml b/report/account_template.xml index 8db2f214c93dddba78113e85afaff22ed620faa9..8ff87b035e0dd70cc98e9fe58fd390126e2e9636 100644 --- a/report/account_template.xml +++ b/report/account_template.xml @@ -227,7 +227,7 @@ <div class="row mt-4 mb-5"> <div class="col-4 grey-div "> - <h5 class="font-weight-bold mb-3 mt-5 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" @@ -243,6 +243,9 @@ <t t-if="o.consumer_id.email"> <span t-field="o.consumer_id.email" /><br /> </t> + <t t-if="o.consumer_id.phone"> + <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 /> @@ -405,19 +408,21 @@ </tr> <tr style=""> - <t> - <td><span - class="text-nowrap" - />TVA applicable <span - t-field="o.tax_id.name" - /></td> - <td class="text-right"> - <span - class="text-nowrap" - t-field="o.amount_tax" - /> - </td> - </t> + <td><span + class="text-nowrap" + />TVA applicable <span + t-field="o.tax_id.name" + /></td> + <td class="text-right"> + <span + class="text-nowrap" + t-field="o.amount_tax" + /> + </td> + </tr> + <tr> + <td /> + <td /> </tr> </t> <tr> diff --git a/views/res_partner_views.xml b/views/res_partner_views.xml index af7e1f533f914aae430f559b3bc293d996cb4d47..fb7bc67f0dc888128351aac981711e45414271d1 100644 --- a/views/res_partner_views.xml +++ b/views/res_partner_views.xml @@ -43,6 +43,9 @@ <field name="bic" /> </group> </group> + <group> + <field name="free_text"/> + </group> <field name="acc_account_payment_ids" /> </page> </xpath>