pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] account,sale,...: Uniformize report labels

Browse Source 
Example: 'Subtotal' instead of 'Total without taxes' or 'Price'
This commit is contained in:
Sagar Ahirrao
2017-02-09 10:52:28 +01:00
committed by Yannick Tivisse
parent 90c5430ab6
commit 0914bbf758
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/views/report_invoice.xml
+1 -1
View File
@@ -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">
addons/mrp_repair/report/mrp_repair_templates_repair_order.xml
+3 -3
View File
@@ -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}'/>
addons/purchase/report/purchase_order_templates.xml
+3 -3
View File
@@ -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}'/>
addons/report_intrastat/report/report_intrastat_invoice_template.xml
+1 -1
View File
@@ -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>
addons/sale/report/sale_report_templates.xml
+2 -2
View File
@@ -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}'/>
addons/website_quote/views/website_quote_templates.xml
+1 -1
View File
@@ -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>