[IMP] l10n_nl_tax_statement_icp: format BTW code on reports

OCA · Nov 14, 2023 · 8c097e1 · 8c097e1
1 parent 0010bab
commit 8c097e1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/l10n_nl_tax_statement_icp/models/l10n_nl_vat_statement_icp_line.py b/l10n_nl_tax_statement_icp/models/l10n_nl_vat_statement_icp_line.py
@@ -22,6 +22,9 @@ class VatStatementIcpLine(models.Model):
         string="VAT",
         readonly=True,
     )
+    format_vat = fields.Char(
+        compute="_compute_format_vat",
+    )
     country_code = fields.Char(
         readonly=True,
     )
@@ -32,6 +35,14 @@ class VatStatementIcpLine(models.Model):
     amount_services = fields.Monetary(readonly=True)
     format_amount_services = fields.Char(compute="_compute_icp_amount_format")
 
+    @api.depends("vat", "country_code")
+    def _compute_format_vat(self):
+        for line in self:
+            if line.country_code and line.vat:
+                line.format_vat = line.vat.lstrip(line.country_code)
+            else:
+                line.format_vat = line.format_vat
+
     @api.depends("amount_products", "amount_services")
     def _compute_icp_amount_format(self):
         for line in self:

diff --git a/l10n_nl_tax_statement_icp/report/l10n_nl_tax_statement_icp_xlsx.py b/l10n_nl_tax_statement_icp/report/l10n_nl_tax_statement_icp_xlsx.py
@@ -102,8 +102,8 @@ def _get_report_columns(self):
         """Define the report columns used to generate report"""
         return {
             0: {"header": _("Partner"), "field": "partner_name", "width": 60},
-            1: {"header": _("VAT"), "field": "vat", "width": 50},
-            2: {"header": _("Country Code"), "field": "country_code", "width": 14},
+            1: {"header": _("Country Code"), "field": "country_code", "width": 14},
+            2: {"header": _("VAT"), "field": "format_vat", "width": 50},
             3: {"header": _("Currency"), "field": "currency_name", "width": 14},
             4: {"header": _("Amount Product"), "field": "amount_products", "width": 20},
             5: {"header": _("Amount Service"), "field": "amount_services", "width": 20},

diff --git a/l10n_nl_tax_statement_icp/report/report_tax_statement.xml b/l10n_nl_tax_statement_icp/report/report_tax_statement.xml
@@ -31,8 +31,8 @@
                         >
                             <div class="nl_tax_act_as_row labels">
                                 <div class="nl_tax_act_as_cell left">Partner</div>
-                                <div class="nl_tax_act_as_cell left">VAT</div>
                                 <div class="nl_tax_act_as_cell left">Country Code</div>
+                                <div class="nl_tax_act_as_cell left">VAT</div>
                                 <div class="nl_tax_act_as_cell right">Currency</div>
                                 <div
                                     class="nl_tax_act_as_cell right"
@@ -48,10 +48,10 @@
                                         <span t-field="line.partner_id" />
                                     </div>
                                     <div class="nl_tax_act_as_cell left">
-                                        <span t-field="line.vat" />
+                                        <span t-field="line.country_code" />
                                     </div>
                                     <div class="nl_tax_act_as_cell left">
-                                        <span t-field="line.country_code" />
+                                        <span t-field="line.format_vat" />
                                     </div>
                                     <div class="nl_tax_act_as_cell right">
                                         <span t-field="line.currency_id" />

diff --git a/l10n_nl_tax_statement_icp/views/l10n_nl_vat_statement_view.xml b/l10n_nl_tax_statement_icp/views/l10n_nl_vat_statement_view.xml
@@ -30,8 +30,8 @@
                     <field name="icp_line_ids">
                         <tree editable="bottom" create="false" delete="false">
                             <field name="partner_id" />
-                            <field name="vat" />
                             <field name="country_code" />
+                            <field name="format_vat" />
                             <field name="currency_id" />
                             <field name="amount_products" />
                             <field name="amount_services" />