From 9dbf815dd8ba62dd9b02eb3832f8dff18262b897 Mon Sep 17 00:00:00 2001
From: Martin Geubelle <mge@odoo.com>
Date: Mon, 13 Aug 2018 14:37:14 +0200
Subject: [PATCH] [REF] *: modify templates to allow smoother modifications

With the report editor in Studio, some reports were not easily editable (not
idiomatic XML, too much Python logic in XML, etc.).

These reports have been cleaned up.
---
 ...count_report_payment_receipt_templates.xml | 10 ++--
 .../views/report_agedpartnerbalance.xml       |  4 +-
 addons/account/views/report_financial.xml     | 16 +++----
 addons/account/views/report_invoice.xml       | 14 +++---
 .../report/report_timesheet_templates.xml     | 46 +++++++++----------
 addons/lunch/report/lunch_order_templates.xml |  3 +-
 .../report/ir_module_report_templates.xml     | 14 +++---
 7 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/addons/account/report/account_report_payment_receipt_templates.xml b/addons/account/report/account_report_payment_receipt_templates.xml
index 438c83ee975..62df9145885 100644
--- a/addons/account/report/account_report_payment_receipt_templates.xml
+++ b/addons/account/report/account_report_payment_receipt_templates.xml
@@ -34,11 +34,11 @@
                 <table class="table table-sm">
                     <thead>
                         <tr>
-                            <th>Invoice Date</th>
-                            <th>Invoice Number</th>
-                            <th class="text-right">Original Amount</th>
-                            <th class="text-right">Amount Paid</th>
-                            <th class="text-right">Balance</th>
+                            <th><span>Invoice Date</span></th>
+                            <th><span>Invoice Number</span></th>
+                            <th class="text-right"><span>Original Amount</span></th>
+                            <th class="text-right"><span>Amount Paid</span></th>
+                            <th class="text-right"><span>Balance</span></th>
                         </tr>
                     </thead>
                     <tbody>
diff --git a/addons/account/views/report_agedpartnerbalance.xml b/addons/account/views/report_agedpartnerbalance.xml
index cfb3e2590e9..40fe28e7908 100644
--- a/addons/account/views/report_agedpartnerbalance.xml
+++ b/addons/account/views/report_agedpartnerbalance.xml
@@ -37,7 +37,7 @@
                 <table class="table table-sm">
                     <thead>
                         <tr>
-                            <th>Partners</th>
+                            <th><span>Partners</span></th>
                             <th class="text-right">
                                 <span>Not due</span>
                             </th>
@@ -46,7 +46,7 @@
                             <th class="text-right"><span t-esc="data['2']['name']"/></th>
                             <th class="text-right"><span t-esc="data['1']['name']"/></th>
                             <th class="text-right"><span t-esc="data['0']['name']"/></th>
-                            <th class="text-right">Total</th>
+                            <th class="text-right"><span>Total</span></th>
                         </tr>
                         <tr t-if="get_partner_lines">
                             <th>Account Total</th>
diff --git a/addons/account/views/report_financial.xml b/addons/account/views/report_financial.xml
index 3515fe6ce5c..24774bd9c08 100644
--- a/addons/account/views/report_financial.xml
+++ b/addons/account/views/report_financial.xml
@@ -26,10 +26,10 @@
                     <table class="table table-sm" t-if="data['debit_credit'] == 1">
                         <thead>
                             <tr>
-                                <th>Name</th>
-                                <th class="text-right">Debit</th>
-                                <th class="text-right">Credit</th>
-                                <th class="text-right">Balance</th>
+                                <th><span>Name</span></th>
+                                <th class="text-right"><span>Debit</span></th>
+                                <th class="text-right"><span>Credit</span></th>
+                                <th class="text-right"><span>Balance</span></th>
                             </tr>
                         </thead>
                         <tbody>
@@ -59,8 +59,8 @@
                     <table class="table table-sm" t-if="not data['enable_filter'] and not data['debit_credit']">
                         <thead>
                             <tr>
-                                <th>Name</th>
-                                <th class="text-right">Balance</th>
+                                <th><span>Name</span></th>
+                                <th class="text-right"><span>Balance</span></th>
                             </tr>
                         </thead>
                         <tbody>
@@ -82,8 +82,8 @@
                     <table class="table table-sm" t-if="data['enable_filter'] == 1 and not data['debit_credit']">
                         <thead>
                             <tr>
-                                <th>Name</th>
-                                <th class="text-right">Balance</th>
+                                <th><span>Name</span></th>
+                                <th class="text-right"><span>Balance</span></th>
                                 <th class="text-right"><span t-esc="data['label_filter']"/></th>
                             </tr>
                         </thead>
diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 8eacfb366c8..31e0417b5a2 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -62,22 +62,22 @@
                         <thead>
                             <tr>
                                 <t t-set="colspan" t-value="6"/>
-                                <th>Description</th>
-                                <th class="d-none">Source Document</th>
-                                <th class="text-right">Quantity</th>
-                                <th class="text-right d-none d-md-table-cell">Unit Price</th>
+                                <th><span>Description</span></th>
+                                <th class="d-none"><span>Source Document</span></th>
+                                <th class="text-right"><span>Quantity</span></th>
+                                <th class="text-right d-none d-md-table-cell"><span>Unit Price</span></th>
                                 <th t-if="display_discount" class="text-right d-none d-md-table-cell">
                                     <span>Disc.(%)</span>
                                     <t t-set="colspan" t-value="colspan+1"/>
                                 </th>
-                                <th class="text-right d-none d-md-table-cell">Taxes</th>
+                                <th class="text-right d-none d-md-table-cell"><span>Taxes</span></th>
                                 <th t-if="display_taxamount and type_is_out" class="text-right d-none d-md-table-cell">
                                     <span>Tax Amount</span>
                                     <t t-set="colspan" t-value="colspan+1"/>
                                 </th>
                                 <th class="text-right">
-                                    <t groups="account.group_show_line_subtotals_tax_excluded">Amount</t>
-                                    <t groups="account.group_show_line_subtotals_tax_included">Total Price</t>
+                                    <span groups="account.group_show_line_subtotals_tax_excluded">Amount</span>
+                                    <span groups="account.group_show_line_subtotals_tax_included">Total Price</span>
                                 </th>
                             </tr>
                         </thead>
diff --git a/addons/hr_timesheet/report/report_timesheet_templates.xml b/addons/hr_timesheet/report/report_timesheet_templates.xml
index 13b702f4028..af8b4da6781 100644
--- a/addons/hr_timesheet/report/report_timesheet_templates.xml
+++ b/addons/hr_timesheet/report/report_timesheet_templates.xml
@@ -19,35 +19,33 @@
                             <table class="table table-sm">
                                 <thead>
                                     <tr>
-                                        <th>Date</th>
-                                        <th>Responsible</th>
-                                        <th>Description</th>
+                                        <th><span>Date</span></th>
+                                        <th><span>Responsible</span></th>
+                                        <th><span>Description</span></th>
                                         <th t-if="show_task"><t t-if="show_project">Project - </t>Task</th>
-                                        <th class="text-right">Time</th>
+                                        <th class="text-right"><span>Time</span></th>
                                     </tr>
                                </thead>
                                <tbody>
-                                    <t t-foreach="docs" t-as="l">
-                                        <tr>
-                                            <td>
-                                               <span t-field="l.date"/>
-                                            </td>
-                                            <td>
-                                               <span t-field="l.user_id.partner_id.name"/>
-                                            </td>
-                                            <td >
-                                                <span t-field="l.name" t-options="{'widget': 'text'}"/>
-                                            </td>
-                                            <td t-if="show_task or show_project">
-                                                <t t-if="show_project"><span t-field="l.project_id.name"/></t>
-                                                <t t-if="show_project and l.task_id"> - </t>
-                                                <t t-if="l.task_id"><span t-field="l.task_id.name"/></t>
-                                            </td>
-                                            <td class="text-right">
+                                    <tr t-foreach="docs" t-as="l">
+                                        <td>
+                                           <span t-field="l.date"/>
+                                        </td>
+                                        <td>
+                                           <span t-field="l.user_id.partner_id.name"/>
+                                        </td>
+                                        <td >
+                                            <span t-field="l.name" t-options="{'widget': 'text'}"/>
+                                        </td>
+                                        <td t-if="show_task">
+                                            <t t-if="show_project"><span t-field="l.project_id.name"/></t>
+                                            <t t-if="show_project and l.task_id"> - </t>
+                                            <t t-if="l.task_id"><span t-field="l.task_id.name"/></t>
+                                        </td>
+                                        <td class="text-right">
                                                 <span t-field="l.unit_amount" t-options="{'widget': 'float_time'}"/>
-                                            </td>
-                                        </tr>
-                                    </t>
+                                        </td>
+                                    </tr>
                                     <tr>
                                         <td />
                                         <td />
diff --git a/addons/lunch/report/lunch_order_templates.xml b/addons/lunch/report/lunch_order_templates.xml
index d7ee34c837f..370ffcf2ab2 100644
--- a/addons/lunch/report/lunch_order_templates.xml
+++ b/addons/lunch/report/lunch_order_templates.xml
@@ -34,8 +34,7 @@
                                         </td>
                                         <td class="text-right" colspan="2">
                                             <strong>
-                                                <span t-esc="sum(line.price for line in lines)"/>
-                                                <span t-field="user.company_id.currency_id.symbol"/>
+                                                <span t-esc="sum(line.price for line in lines)" t-options="{'widget': 'monetary', 'display_currency': user.company_id.currency_id}"/>
                                             </strong>
                                         </td>
                                     </tr>
diff --git a/odoo/addons/base/report/ir_module_report_templates.xml b/odoo/addons/base/report/ir_module_report_templates.xml
index b7ae13cab5b..f721811b03a 100644
--- a/odoo/addons/base/report/ir_module_report_templates.xml
+++ b/odoo/addons/base/report/ir_module_report_templates.xml
@@ -3,18 +3,18 @@
 <data>
 <template id="report_irmodulereference">
     <t t-call="web.html_container">
-        <t t-foreach="docs" t-as="o">    
+        <t t-foreach="docs" t-as="o">
             <t t-call="web.internal_layout">
                 <div class="page">
                     <h3 class="text-center">Introspection report on objects</h3>
                         <table class="table table-bordered mt32">
                             <thead>
                                 <tr>
-                                    <th class="text-center">Module</th>
-                                    <th class="text-center">Name</th>
-                                    <th class="text-center">Version</th>
-                                    <th class="text-center">Directory</th>
-                                    <th class="text-center">Web</th>
+                                    <th class="text-center"><span>Module</span></th>
+                                    <th class="text-center"><span>Name</span></th>
+                                    <th class="text-center"><span>Version</span></th>
+                                    <th class="text-center"><span>Directory</span></th>
+                                    <th class="text-center"><span>Web</span></th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -49,7 +49,7 @@
 
                         <table t-foreach="findobj(o)" t-as="obj" class="table table-sm mt16 mb32">
                             <tr>
-                                <th colspan="2">Object: <span t-esc="obj.model"/></th>
+                                <th colspan="2"><span>Object:</span> <span t-esc="obj.model"/></th>
                             </tr>
                             <tr t-foreach="findfields(obj.model, o)" t-as="field">
                                 <td class="col-3"><t t-esc="field[0]"/></td>