From c371167660452bdec56fd418357039ef4513d169 Mon Sep 17 00:00:00 2001 From: Thomas Winteler Date: Wed, 14 Jul 2021 14:25:30 +0200 Subject: [PATCH] [FIX] account_financial_report: vat report net calculation --- account_financial_report/report/vat_report.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/account_financial_report/report/vat_report.py b/account_financial_report/report/vat_report.py index 51cbcb9..9f5b695 100644 --- a/account_financial_report/report/vat_report.py +++ b/account_financial_report/report/vat_report.py @@ -149,7 +149,7 @@ WITH (SELECT coalesce(regexp_replace(tag.name, '[^0-9\\.]+', '', 'g'), ' ') AS code, tag.name, tag.id, - coalesce(sum(movetax.tax_base_amount), 0.00) AS net, + coalesce(sum(CASE WHEN movetax.balance >= 0 THEN movetax.tax_base_amount ELSE movetax.tax_base_amount * -1 END), 0.00) AS net, coalesce(sum(movetax.balance), 0.00) AS tax FROM account_account_tag AS tag @@ -201,7 +201,7 @@ WITH taxgroups AS (SELECT coalesce(taxgroup.sequence, 0) AS code, taxgroup.name, taxgroup.id, - coalesce(sum(movetax.tax_base_amount), 0.00) AS net, + coalesce(sum(CASE WHEN movetax.balance >= 0 THEN movetax.tax_base_amount ELSE movetax.tax_base_amount * -1 END), 0.00) AS net, coalesce(sum(movetax.balance), 0.00) AS tax FROM account_tax_group AS taxgroup @@ -255,7 +255,7 @@ WITH SELECT tag.id AS report_tax_id, ' ' AS code, tax.name, tax.id, - coalesce(sum(movetax.tax_base_amount), 0.00) AS net, + coalesce(sum(CASE WHEN movetax.balance >= 0 THEN movetax.tax_base_amount ELSE movetax.tax_base_amount * -1 END), 0.00) AS net, coalesce(sum(movetax.balance), 0.00) AS tax FROM report_vat_report_taxtag AS tag @@ -310,7 +310,7 @@ WITH SELECT taxtag.id AS report_tax_id, ' ' AS code, tax.name, tax.id, - coalesce(sum(movetax.tax_base_amount), 0.00) AS net, + coalesce(sum(CASE WHEN movetax.balance >= 0 THEN movetax.tax_base_amount ELSE movetax.tax_base_amount * -1 END), 0.00) AS net, coalesce(sum(movetax.balance), 0.00) AS tax FROM report_vat_report_taxtag AS taxtag