From 0914bbf7587a0dd8443596ab5133d8b8fd4f4e31 Mon Sep 17 00:00:00 2001
From: Sagar Ahirrao <sah@odoo.com>
Date: Mon, 19 Dec 2016 12:57:36 +0530
Subject: [PATCH] [IMP] account,sale,...: Uniformize report labels

Example: 'Subtotal' instead of 'Total without taxes' or 'Price'
---
 addons/account/views/report_invoice.xml                     | 2 +-
 .../mrp_repair/report/mrp_repair_templates_repair_order.xml | 6 +++---
 addons/purchase/report/purchase_order_templates.xml         | 6 +++---
 .../report/report_intrastat_invoice_template.xml            | 2 +-
 addons/sale/report/sale_report_templates.xml                | 4 ++--
 addons/website_quote/views/website_quote_templates.xml      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 0f2c9d8bc90..9b92831dc61 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -62,7 +62,7 @@
                         <th class="text-right">Unit Price</th>
                         <th t-if="display_discount" class="text-right">Disc.(%)</th>
                         <th class="text-right">Taxes</th>
-                        <th class="text-right">Subtotal</th>
+                        <th class="text-right">Amount</th>
                     </tr>
                 </thead>
                 <tbody class="invoice_tbody">
diff --git a/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml b/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml
index 02c7d02e543..abbb6d1881d 100644
--- a/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml
+++ b/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml
@@ -61,10 +61,10 @@
                         <thead>
                             <tr>
                                 <th>Description</th>
-                                <th class="text-center">Tax</th>
+                                <th class="text-center">Taxes</th>
                                 <th class="text-right">Quantity</th>
                                 <th class="text-right">Unit Price</th>
-                                <th class="text-right">Price</th>
+                                <th class="text-right">Amount</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -124,7 +124,7 @@
                         <div class="col-xs-4 pull-right">
                             <table class="table table-condensed">
                                 <tr class="border-black">
-                                    <td><strong>Total Without Taxes</strong></td>
+                                    <td><strong>Subtotal</strong></td>
                                     <td class="text-right">
                                         <span t-field="o.amount_untaxed"
                                             t-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/>
diff --git a/addons/purchase/report/purchase_order_templates.xml b/addons/purchase/report/purchase_order_templates.xml
index 51387d29c9e..4c330f0fab7 100644
--- a/addons/purchase/report/purchase_order_templates.xml
+++ b/addons/purchase/report/purchase_order_templates.xml
@@ -35,7 +35,7 @@
                     <p t-field="o.name"/>
                 </div>
                 <div t-if="o.partner_ref" class="col-xs-3">
-                    <strong>Your Order Reference</strong>
+                    <strong>Your Order Reference:</strong>
                     <p t-field="o.partner_ref"/>
                 </div>
                 <div t-if="o.date_order" class="col-xs-3">
@@ -52,7 +52,7 @@
                         <th class="text-center"><strong>Date Req.</strong></th>
                         <th class="text-right"><strong>Qty</strong></th>
                         <th class="text-right"><strong>Unit Price</strong></th>
-                        <th class="text-right"><strong>Net Price</strong></th>
+                        <th class="text-right"><strong>Amount</strong></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -85,7 +85,7 @@
                 <div class="col-xs-4 pull-right">
                     <table class="table table-condensed">
                         <tr class="border-black">
-                            <td><strong>Total Without Taxes</strong></td>
+                            <td><strong>Subtotal</strong></td>
                             <td class="text-right">
                                 <span t-field="o.amount_untaxed"
                                     t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
diff --git a/addons/report_intrastat/report/report_intrastat_invoice_template.xml b/addons/report_intrastat/report/report_intrastat_invoice_template.xml
index 0abe61c42dd..7461e289770 100644
--- a/addons/report_intrastat/report/report_intrastat_invoice_template.xml
+++ b/addons/report_intrastat/report/report_intrastat_invoice_template.xml
@@ -76,7 +76,7 @@
                 <div class="col-xs-4 pull-right">
                     <table class="table table-condensed">
                         <tr class="border-black">
-                            <td><strong>Total Without Taxes</strong></td>
+                            <td><strong>Subtotal</strong></td>
                             <td class="text-right">
                                 <span t-field="o.amount_untaxed" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                             </td>
diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml
index 286443cba6f..44e383d0796 100644
--- a/addons/sale/report/sale_report_templates.xml
+++ b/addons/sale/report/sale_report_templates.xml
@@ -75,7 +75,7 @@
                             <th class="text-right">Unit Price</th>
                             <th t-if="display_discount" class="text-right" groups="sale.group_discount_per_so_line">Disc.(%)</th>
                             <th class="text-right">Taxes</th>
-                            <th class="text-right" groups="sale.group_show_price_subtotal">Price</th>
+                            <th class="text-right" groups="sale.group_show_price_subtotal">Amount</th>
                             <th class="text-right price_tax_included" groups="sale.group_show_price_total">Total Price</th>
                         </tr>
                    </thead>
@@ -141,7 +141,7 @@
                 <div class="col-xs-4 pull-right">
                     <table class="table table-condensed">
                         <tr class="border-black">
-                            <td><strong>Total Without Taxes</strong></td>
+                            <td><strong>Subtotal</strong></td>
                             <td class="text-right">
                                 <span t-field="doc.amount_untaxed"
                                     t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/>
diff --git a/addons/website_quote/views/website_quote_templates.xml b/addons/website_quote/views/website_quote_templates.xml
index fd5e88923c9..86732a8f1a9 100644
--- a/addons/website_quote/views/website_quote_templates.xml
+++ b/addons/website_quote/views/website_quote_templates.xml
@@ -27,7 +27,7 @@
                         <th><span t-if="any([line.tax_id for line in quotation.order_line])">Taxes</span></th>
                         <th><span t-if="True in [line.discount > 0 for line in quotation.order_line]">Discount</span></th>
                         <th class="text-right">Unit Price</th>
-                        <th class="text-right" groups="sale.group_show_price_subtotal">Price</th>
+                        <th class="text-right" groups="sale.group_show_price_subtotal">Amount</th>
                         <th class="text-right price_tax_included" groups="sale.group_show_price_total">Total Price</th>
                         <th></th>
                     </tr>