From b0c25eb8ae77da67ab1c7a545ecc473514b22561 Mon Sep 17 00:00:00 2001 From: Ninad1306 Date: Thu, 5 Dec 2024 17:25:25 +0530 Subject: [PATCH] fix: avoid duplicate taxes when same name (cherry picked from commit 9c72e059fb1fcd8d8e6589d2853d165e69095ce0) --- .../gst_india/doctype/gstr_3b_report/gstr_3b_report.py | 1 + .../gst_india/report/gstr_3b_details/gstr_3b_details.py | 1 + 2 files changed, 2 insertions(+) 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 index 114ba0aab..5898586b5 100644 --- 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 index b5c91129e..038aedebd 100644 --- 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) )