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

[FIX] account: display tax base on invoice report

Browse Source 
The condition that determines whether to display the tax base was wrong
It should be displayed when either condition is met:
- There are multiple tax base amounts
- The only tax base amount is not the same as the untaxed amount

Note that this last case may happen with cash discounts

closes odoo/odoo#102247

X-original-commit: a8ff4b876c8ab48177795e6ace1bb1361744c8a7
Signed-off-by: Camille Spiritus (casp) <casp@odoo.com>
Signed-off-by: Stanislas Gueniffey (stgu) <stgu@odoo.com>
This commit is contained in:
Stanislas Gueniffey
2022-10-06 00:37:20 +02:00
parent 5f2017e544
commit 2a449454cb
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account_tax.py
+2 -1
View File
@@ -1188,7 +1188,8 @@ class AccountTax(models.Model):
amount_total = amount_untaxed + amount_tax
display_tax_base = len(global_tax_details['tax_details']) == 1 and tax_group_vals['base_amount'] != amount_untaxed
display_tax_base = (len(global_tax_details['tax_details']) == 1 and tax_group_vals_list[0]['base_amount'] != amount_untaxed) \
or len(global_tax_details['tax_details']) > 1
return {
'amount_untaxed': currency.round(amount_untaxed) if currency else amount_untaxed,
addons/account/tests/test_invoice_tax_totals.py
+6 -6
View File
@@ -111,7 +111,7 @@ class TestTaxTotals(AccountTestInvoicingCommon):
self.assertTaxTotals(document, {
'amount_total': 3600,
'amount_untaxed': 3000,
'display_tax_base': False,
'display_tax_base': True,
'groups_by_subtotal': {
'Untaxed Amount': [
{
@@ -226,7 +226,7 @@ class TestTaxTotals(AccountTestInvoicingCommon):
self.assertTaxTotals(document, {
'amount_total': 3620,
'amount_untaxed': 3000,
'display_tax_base': False,
'display_tax_base': True,
'groups_by_subtotal': {
'Untaxed Amount': [
{
@@ -313,7 +313,7 @@ class TestTaxTotals(AccountTestInvoicingCommon):
self.assertTaxTotals(document, {
'amount_total': 2750,
'amount_untaxed': 2000,
'display_tax_base': False,
'display_tax_base': True,
'groups_by_subtotal': {
'Untaxed Amount': [
{
@@ -400,7 +400,7 @@ class TestTaxTotals(AccountTestInvoicingCommon):
self.assertTaxTotals(document, {
'amount_total': 2846,
'amount_untaxed': 2300,
'display_tax_base': False,
'display_tax_base': True,
'groups_by_subtotal': {
'Untaxed Amount': [
{
@@ -486,7 +486,7 @@ class TestTaxTotals(AccountTestInvoicingCommon):
self.assertTaxTotals(document, {
'amount_total': 1867,
'amount_untaxed': 1500,
'display_tax_base': False,
'display_tax_base': True,
'groups_by_subtotal': {
'Untaxed Amount': [
{
@@ -584,7 +584,7 @@ class TestTaxTotals(AccountTestInvoicingCommon):
self.assertTaxTotals(document, {
'amount_total': 1230.41,
'amount_untaxed': 1020.41,
'display_tax_base': False,
'display_tax_base': True,
'groups_by_subtotal': {
"Reapply amount": [{
'tax_group_name': self.tax_group_sub3.name,