From f75b708f8ac3774d91e0e5221523b572b2ddeb5b Mon Sep 17 00:00:00 2001
From: william <wan@odoo.com>
Date: Fri, 20 Mar 2020 15:55:09 +0000
Subject: [PATCH] [FIX] account: separation between amount and currency on
printed invoice
Task 2222062
The currency could not be on the same line as the amount
closes odoo/odoo#48130
Signed-off-by: Laurent Smet <smetl@users.noreply.github.com>
---
addons/account/views/report_invoice.xml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index e857d04805bb..ff82ba0b760c 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -84,17 +84,17 @@
<span t-field="line.product_uom_id" groups="uom.group_uom"/>
</td>
<td t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
- <span t-field="line.price_unit"/>
+ <span class="text-nowrap" t-field="line.price_unit"/>
</td>
<td t-if="display_discount" t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
- <span t-field="line.discount"/>
+ <span class="text-nowrap" t-field="line.discount"/>
</td>
<td t-attf-class="text-left {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
<span t-esc="', '.join(map(lambda x: (x.description or x.name), line.tax_ids))" id="line_tax_ids"/>
</td>
<td class="text-right o_price_total">
- <span t-field="line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
- <span t-field="line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
+ <span class="text-nowrap" t-field="line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
+ <span class="text-nowrap" t-field="line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
</td>
</t>
<t t-if="line.display_type == 'line_section'">
@@ -128,7 +128,7 @@
<div class="clearfix">
<div id="total" class="row">
- <div t-attf-class="#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto">
+ <div t-attf-class="#{'col-6' if report_type != 'html' else 'col-sm-7 col-md-6'} ml-auto">
<table class="table table-sm" style="page-break-inside: avoid;">
<tr class="border-black o_subtotal" style="">
<td><strong>Subtotal</strong></td>
@@ -139,20 +139,20 @@
<t t-foreach="o.amount_by_group" t-as="amount_by_group">
<tr style="">
<t t-if="len(o.line_ids.filtered(lambda line: line.tax_line_id)) == 1 and o.amount_untaxed == amount_by_group[2]">
- <td><span t-esc="amount_by_group[0]"/></td>
+ <td><span class="text-nowrap" t-esc="amount_by_group[0]"/></td>
<td class="text-right o_price_total">
- <span t-esc="amount_by_group[3]" />
+ <span class="text-nowrap" t-esc="amount_by_group[3]" />
</td>
</t>
<t t-else="">
<td>
<span t-esc="amount_by_group[0]"/>
- <span>&nbsp;<span>on</span>
+ <span class="text-nowrap"> on
<t t-esc="amount_by_group[4]"/>
</span>
</td>
<td class="text-right o_price_total">
- <span t-esc="amount_by_group[3]"/>
+ <span class="text-nowrap" t-esc="amount_by_group[3]"/>
</td>
</t>
</tr>
@@ -160,7 +160,7 @@
<tr class="border-black o_total">
<td><strong>Total</strong></td>
<td class="text-right">
- <span t-field="o.amount_total"/>
+ <span class="text-nowrap" t-field="o.amount_total"/>
</td>
</tr>
</table>
--
GitLab