Merge pull request #2819 from resilient-tech/mergify/bp/version-15-ho…

…tfix/pr-2816 fix: Avoid Duplicate Taxes When Having Same Name (backport #2816)
resilient-tech · Dec 5, 2024 · 38fa3f1 · 38fa3f1
2 parents c568882 + b0c25eb
commit 38fa3f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.py b/india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.py
@@ -295,6 +295,7 @@ def _get_tax_amount(account_type):
                     & boe.docstatus.eq(1)
                     & boe_taxes.gst_tax_type.eq(account_type)
                 )
+                .where(boe_taxes.parenttype == "Bill of Entry")
                 .run()
             )[0][0] or 0
 

diff --git a/india_compliance/gst_india/report/gstr_3b_details/gstr_3b_details.py b/india_compliance/gst_india/report/gstr_3b_details/gstr_3b_details.py
@@ -208,6 +208,7 @@ def get_itc_from_boe(self):
                 & (boe.company == self.company)
                 & (boe.company_gstin == self.company_gstin)
             )
+            .where(boe_taxes.parenttype == "Bill of Entry")
             .groupby(boe.name)
         )