changeset 420be127ae66 in modules/account_es:default
details:
https://hg.tryton.org/modules/account_es?cmd=changeset&node=420be127ae66
description:
Use zero as VAT Book taxes amount when empty
issue10617
review373141002
diffstat:
reporting_tax.py | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diffs (28 lines):
diff -r dbb1d2a4b87b -r 420be127ae66 reporting_tax.py
--- a/reporting_tax.py Thu Jul 22 00:05:32 2021 +0200
+++ b/reporting_tax.py Mon Aug 09 12:53:54 2021 +0200
@@ -780,7 +780,10 @@
surcharge_tax = fields.Many2One('account.tax', "Surcharge Tax")
surcharge_tax_amount = fields.Numeric("Surcharge Tax Amount",
digits=(16, Eval('currency_digits', 2)),
- depends=['currency_digits'])
+ states={
+ 'invisible': ~(Eval('surcharge_tax', None)),
+ },
+ depends=['currency_digits', 'surcharge_tax'])
currency_digits = fields.Function(fields.Integer("Currency Digits"),
'get_currency_digits')
@@ -874,9 +877,9 @@
Min(tax.id,
filter_=(tax.es_reported_with != Null)).as_(
'surcharge_tax'),
- Sum(tax_line.amount,
- filter_=((tax_line.type == 'tax')
- & (tax.es_reported_with != Null))).as_(
+ Coalesce(Sum(tax_line.amount,
+ filter_=((tax_line.type == 'tax')
+ & (tax.es_reported_with != Null))), 0).as_(
'surcharge_tax_amount'),
where=where,
group_by=[
