From f6935ef81ae7076ea8aad9fc3c87f3428b648366 Mon Sep 17 00:00:00 2001
From: Katherine Zaoral <kz@adhoc.com.ar>
Date: Tue, 7 Jul 2020 13:50:45 +0000
Subject: [PATCH] [IMP] account: unify invoice report w/o payments

* merge report_invoice_document and report_invoice_document_with_payments templates
* define new generic method _get_name_invoice_report that let us to
  print a different report, this method can be inherited by each localization
  to set their custom report
* change report templates to use the new method.
---
 addons/account/models/account_move.py   |  6 +++
 addons/account/views/report_invoice.xml | 54 ++++++++++++-------------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 5f69692cff1..99753a10e1d 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -2558,6 +2558,12 @@ class AccountMove(models.Model):
             raise UserError(_("Only invoices could be printed."))
         return self._get_move_display_name()
 
+    def _get_name_invoice_report(self):
+        """ This method need to be inherit by the localizations if they want to print a custom invoice report instead of
+        the default one. For example please review the l10n_ar module """
+        self.ensure_one()
+        return 'account.report_invoice_document'
+
     def preview_invoice(self):
         self.ensure_one()
         return {
diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index ce54031ded0..917547a07e9 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -157,6 +157,29 @@
                                             <span class="text-nowrap" t-field="o.amount_total"/>
                                         </td>
                                     </tr>
+                                    <t t-if="print_with_payments">
+                                        <t t-if="o.payment_state != 'invoicing_legacy'">
+                                            <t t-set="payments_vals" t-value="o.sudo()._get_reconciled_info_JSON_values()"/>
+                                            <t t-foreach="payments_vals" t-as="payment_vals">
+                                                <tr>
+                                                    <td>
+                                                        <i class="oe_form_field text-right oe_payment_label">Paid on <t t-esc="payment_vals['date']" t-options='{"widget": "date"}'/></i>
+                                                    </td>
+                                                    <td class="text-right">
+                                                        <span t-esc="payment_vals['amount']" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                                    </td>
+                                                </tr>
+                                            </t>
+                                            <t t-if="len(payments_vals) > 0">
+                                                <tr class="border-black">
+                                                    <td><strong>Amount Due</strong></td>
+                                                    <td class="text-right">
+                                                        <span t-field="o.amount_residual"/>
+                                                    </td>
+                                                </tr>
+                                            </t>
+                                        </t>
+                                    </t>
                                 </table>
                             </div>
                         </div>
@@ -186,37 +209,11 @@
             </t>
         </template>
 
-        <template id="report_invoice_document_with_payments" inherit_id="account.report_invoice_document" primary="True">
-            <xpath expr="//div[@id='total']/div/table" position="inside">
-                <t t-if="o.payment_state != 'invoicing_legacy'">
-                    <t t-set="payments_vals" t-value="o.sudo()._get_reconciled_info_JSON_values()"/>
-                    <t t-foreach="payments_vals" t-as="payment_vals">
-                        <tr>
-                            <td>
-                                <i class="oe_form_field text-right oe_payment_label">Paid on <t t-esc="payment_vals['date']" t-options='{"widget": "date"}'/></i>
-                            </td>
-                            <td class="text-right">
-                                <span t-esc="payment_vals['amount']" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
-                            </td>
-                        </tr>
-                    </t>
-                    <t t-if="len(payments_vals) > 0">
-                        <tr class="border-black">
-                            <td><strong>Amount Due</strong></td>
-                            <td class="text-right">
-                                 <span t-field="o.amount_residual"/>
-                            </td>
-                        </tr>
-                    </t>
-                </t>
-            </xpath>
-        </template>
-
         <template id="report_invoice">
             <t t-call="web.html_container">
                 <t t-foreach="docs" t-as="o">
                     <t t-set="lang" t-value="o.invoice_user_id.sudo().lang if o.move_type in ('in_invoice', 'in_refund') else o.partner_id.lang"/>
-                    <t t-call="account.report_invoice_document" t-lang="lang"/>
+                    <t t-call="#{ o._get_name_invoice_report() }" t-lang="lang"/>
                 </t>
             </t>
         </template>
@@ -225,7 +222,8 @@
             <t t-call="web.html_container">
                 <t t-foreach="docs" t-as="o">
                     <t t-set="lang" t-value="o.invoice_user_id.sudo().lang if o.move_type in ('in_invoice', 'in_refund') else o.partner_id.lang"/>
-                    <t t-call="account.report_invoice_document_with_payments" t-lang="lang"/>
+                    <t t-set="print_with_payments" t-value="True"/>
+                    <t t-call="#{ o._get_name_invoice_report() }" t-lang="lang"/>
                 </t>
             </t>
         </template>