nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 04:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix-depr-after-sale

Browse Source
This commit is contained in:
Ganga Manoj
2021-10-25 19:11:19 +05:30
committed by GitHub
parent 9e7022830e fc8307621c
commit 0515b4b6f6
59 changed files with 713 additions and 815 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/regional/report/gstr_1/gstr_1.py
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