From c874bff3deaf75d84ea27f7101eed48c7ebbe001 Mon Sep 17 00:00:00 2001
From: Daniel Blanco <daniel@blancomartin.cl>
Date: Mon, 7 Jun 2021 13:04:50 +0000
Subject: [PATCH] [FIX] l10n_cl: modifications to report invoice to show tax
 included in boletas [ADD] l10n_cl: add method to invoice report to format the
 vat dotted

closes odoo/odoo#73869

X-original-commit: 2b500c12c2540e593f3a243bf80de28bd335b7be
Related: odoo/enterprise#19705
Signed-off-by: Josse Colpaert <jco@openerp.com>
---
 .../models/l10n_latam_document_type.py        |  7 ++++
 addons/l10n_cl/models/res_partner.py          |  5 +++
 addons/l10n_cl/views/report_invoice.xml       | 34 +++++++------------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/addons/l10n_cl/models/l10n_latam_document_type.py b/addons/l10n_cl/models/l10n_latam_document_type.py
index 6e5916b9527..e458cb719ba 100644
--- a/addons/l10n_cl/models/l10n_latam_document_type.py
+++ b/addons/l10n_cl/models/l10n_latam_document_type.py
@@ -28,3 +28,10 @@ class L10nLatamDocumentType(models.Model):
             return False
 
         return document_number.zfill(6)
+
+    def _filter_taxes_included(self, taxes):
+        """ In Chile we include taxes depending on document type """
+        self.ensure_one()
+        if self.country_id.code == "CL" and self.code in ['39', '41', '110', '111', '112', '34']:
+            return taxes.filtered(lambda x: x.l10n_cl_sii_code == 14)
+        return super()._filter_taxes_included(taxes)
diff --git a/addons/l10n_cl/models/res_partner.py b/addons/l10n_cl/models/res_partner.py
index f54d3b19732..cc7c978661a 100644
--- a/addons/l10n_cl/models/res_partner.py
+++ b/addons/l10n_cl/models/res_partner.py
@@ -42,6 +42,11 @@ class ResPartner(models.Model):
         else:
             return values['vat']
 
+    def _format_dotted_vat_cl(self, vat):
+        vat_l = vat.split('-')
+        n_vat, n_dv = vat_l[0], vat_l[1]
+        return '%s-%s' % (format(int(n_vat), ',d').replace(',', '.'), n_dv)
+
     @api.model
     def create(self, values):
         if values.get('vat'):
diff --git a/addons/l10n_cl/views/report_invoice.xml b/addons/l10n_cl/views/report_invoice.xml
index 20b3f0560a1..f3df2cdb45a 100644
--- a/addons/l10n_cl/views/report_invoice.xml
+++ b/addons/l10n_cl/views/report_invoice.xml
@@ -9,7 +9,6 @@
         <t t-set="pre_printed_report" t-value="report_type == 'pdf'"/>
         <t t-set="report_name" t-value="o.l10n_latam_document_type_id.name"/>
         <t t-set="header_address" t-value="o.company_id.partner_id"/>
-        <t t-set="is_tax" t-value="o.l10n_latam_document_type_id.code not in ['39', '41', '110', '111', '112', '34']"/>
         <t t-set="custom_footer">
             <t t-call="l10n_cl.custom_footer"/>
         </t>
@@ -51,7 +50,7 @@
                                         <strong t-att-style="'color: %s;' % o.company_id.primary_color">
                                             <br/>
                                             <span style="line-height: 180%;">RUT:</span>
-                                            <span t-field="o.company_id.partner_id.vat"/>
+                                            <span t-esc="o.company_id.partner_id._format_dotted_vat_cl(o.company_id.partner_id.vat)"/>
                                             <br/>
                                             <span class="text-uppercase" t-esc="report_name"/>
                                             <br/>
@@ -61,13 +60,11 @@
                                     </h6>
                                 </div>
                             </div>
-                            <!-- (6) Titulo de Documento -->
                             <div class="row text-center">
                                 <div class="col-12 text-center" t-att-style="'color: %s;' % o.company_id.primary_color"
                                      name="regional-office"/>
                             </div>
                         </div>
-
                     </div>
                 </div>
 
@@ -145,39 +142,33 @@
             <attribute name="t-field">line.l10n_latam_price_unit</attribute>
         </xpath>
 
+        <xpath expr="//span[@id='line_tax_ids']" position="attributes">
+            <attribute name="t-esc">', '.join(map(lambda x: (x.description or x.name), line.l10n_latam_tax_ids))</attribute>
+        </xpath>
+
         <t t-set="current_subtotal" t-value="current_subtotal + line.price_subtotal" position="attributes">
             <attribute name="t-value">current_subtotal + line.l10n_latam_price_subtotal</attribute>
         </t>
 
+        <xpath expr="//th[@name='th_subtotal']/span[@groups='account.group_show_line_subtotals_tax_included']" position="replace">
+            <span groups="account.group_show_line_subtotals_tax_included">Amount</span>
+        </xpath>
+
         <span t-field="line.price_subtotal" position="attributes">
             <attribute name="t-field">line.l10n_latam_price_subtotal</attribute>
         </span>
 
-
         <span t-field="o.amount_untaxed" position="attributes">
             <attribute name="t-field">o.l10n_latam_amount_untaxed</attribute>
         </span>
 
+        <xpath expr="//th[@name='th_taxes']" position="replace"/>
+        <xpath expr="//span[@id='line_tax_ids']/.." position="replace"/>
 
-        <!-- we remove the taxes column in boletas -->
-        <xpath expr="//th[@name='th_taxes']/span" position="replace">
-            <t t-if="is_tax">
-                <span>Taxes</span>
-            </t>
-        </xpath>
-
-        <xpath expr="//span[@id='line_tax_ids']" position="replace">
-            <t t-if="is_tax">
-                <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.tax_ids))" id="line_tax_ids"/>
-            </t>
-        </xpath>
-
-        <!-- remove payment term, this is added on information section -->
         <p name="payment_term" position="replace"/>
-
-
         <xpath expr="//span[@t-field='o.payment_reference']/../.." position="replace"/>
 
+        <!-- replace information section and usage chilean style -->
         <div id="informations" position="replace">
             <t t-call="l10n_cl.informations"/>
         </div>
@@ -201,7 +192,6 @@
 
     </template>
 
-
     <!-- FIXME: Temp fix to allow fetching invoice_documemt in Studio Reports with localisation -->
     <template id="report_invoice" inherit_id="account.report_invoice">
         <xpath expr='//t[@t-call="account.report_invoice_document"]' position="after">