Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27373 from deepeshgarg007/gstin_filter_issue

Browse Source 
fix: GSTR-1 Reports not showing any data
This commit is contained in:
Deepesh Garg 2021-09-07 11:09:14 +05:30 committed by GitHub
commit 8f6d22b7ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/regional/report/gstr_1/gstr_1.py
View File

@ -96,13 +96,14 @@ class Gstr1Report(object):
def get_b2c_data(self): def get_b2c_data(self):
b2cs_output = {} b2cs_output = {}
if self.invoices:
for inv, items_based_on_rate in self.items_based_on_tax_rate.items(): for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
invoice_details = self.invoices.get(inv) invoice_details = self.invoices.get(inv)
for rate, items in items_based_on_rate.items(): for rate, items in items_based_on_rate.items():
place_of_supply = invoice_details.get("place_of_supply") place_of_supply = invoice_details.get("place_of_supply")
ecommerce_gstin = invoice_details.get("ecommerce_gstin") ecommerce_gstin = invoice_details.get("ecommerce_gstin")
b2cs_output.setdefault((rate, place_of_supply, ecommerce_gstin),{ b2cs_output.setdefault((rate, place_of_supply, ecommerce_gstin), {
"place_of_supply": "", "place_of_supply": "",
"ecommerce_gstin": "", "ecommerce_gstin": "",
"rate": "", "rate": "",
@ -173,6 +174,7 @@ class Gstr1Report(object):
company_gstins = get_company_gstin_number(self.filters.get('company'), all_gstins=True) company_gstins = get_company_gstin_number(self.filters.get('company'), all_gstins=True)
if company_gstins:
self.filters.update({ self.filters.update({
'company_gstins': company_gstins 'company_gstins': company_gstins
}) })
@ -1050,6 +1052,7 @@ def get_company_gstin_number(company, address=None, all_gstins=False):
["Dynamic Link", "link_doctype", "=", "Company"], ["Dynamic Link", "link_doctype", "=", "Company"],
["Dynamic Link", "link_name", "=", company], ["Dynamic Link", "link_name", "=", company],
["Dynamic Link", "parenttype", "=", "Address"], ["Dynamic Link", "parenttype", "=", "Address"],
["gstin", "!=", '']
] ]
gstin = frappe.get_all("Address", filters=filters, pluck="gstin", order_by="is_primary_address desc") gstin = frappe.get_all("Address", filters=filters, pluck="gstin", order_by="is_primary_address desc")
if gstin and not all_gstins: if gstin and not all_gstins: