Merge pull request #27979 from frappe/mergify/bp/version-13-pre-release/pr-27970

fix (India): Interstate internal transfer invoices not visible in GSTR-1 (backport #27970)
This commit is contained in:
Deepesh Garg
2021-10-18 11:01:06 +05:30
committed by GitHub

View File

@@ -172,13 +172,6 @@ class Gstr1Report(object):
self.invoices = frappe._dict()
conditions = self.get_conditions()
company_gstins = get_company_gstin_number(self.filters.get('company'), all_gstins=True)
if company_gstins:
self.filters.update({
'company_gstins': company_gstins
})
invoice_data = frappe.db.sql("""
select
{select_columns}
@@ -242,7 +235,7 @@ class Gstr1Report(object):
elif self.filters.get("type_of_business") == "EXPORT":
conditions += """ AND is_return !=1 and gst_category = 'Overseas' """
conditions += " AND IFNULL(billing_address_gstin, '') NOT IN %(company_gstins)s"
conditions += " AND IFNULL(billing_address_gstin, '') != company_gstin"
return conditions