From 24c3c6bcdfd6ce670a78356d360bcfdf3580b705 Mon Sep 17 00:00:00 2001 From: Dirk van der Laarse Date: Fri, 20 Jun 2025 06:31:50 +0000 Subject: [PATCH 1/2] fix: join condition for invoices with multiple taxes and charges --- .../doctype/value_added_tax_return/value_added_tax_return.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/csf_za/tax_compliance/doctype/value_added_tax_return/value_added_tax_return.py b/csf_za/tax_compliance/doctype/value_added_tax_return/value_added_tax_return.py index a7807fd..fd128c3 100644 --- a/csf_za/tax_compliance/doctype/value_added_tax_return/value_added_tax_return.py +++ b/csf_za/tax_compliance/doctype/value_added_tax_return/value_added_tax_return.py @@ -203,11 +203,11 @@ def get_gl_entries(self): .left_join(si) .on((gle.voucher_type == "Sales Invoice") & (si.name == gle.voucher_no)) .left_join(sitc) - .on(sitc.parent == si.name) + .on((sitc.parent == si.name) & (sitc.account_head == gle.account)) .left_join(pi) .on((gle.voucher_type == "Purchase Invoice") & (pi.name == gle.voucher_no)) .left_join(pitc) - .on(pitc.parent == pi.name) + .on((pitc.parent == pi.name) & (pitc.account_head == gle.account)) .select( gle.name, gle.voucher_type, From ee0a9b5ad57da2bb7a871c59a36038f6d51f08b7 Mon Sep 17 00:00:00 2001 From: Dirk van der Laarse Date: Fri, 20 Jun 2025 06:32:12 +0000 Subject: [PATCH 2/2] chore: bump to v0.2.2 --- csf_za/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csf_za/__init__.py b/csf_za/__init__.py index 3ced358..b5fdc75 100644 --- a/csf_za/__init__.py +++ b/csf_za/__init__.py @@ -1 +1 @@ -__version__ = "0.2.1" +__version__ = "0.2.2"