Minor fixes in gstr reports (#12848)
diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py
index 1ad673f..4dd1300 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.py
+++ b/erpnext/regional/report/gstr_1/gstr_1.py
@@ -12,6 +12,8 @@
class Gstr1Report(object):
def __init__(self, filters=None):
self.filters = frappe._dict(filters or {})
+ self.columns = []
+ self.data = []
self.doctype = "Sales Invoice"
self.tax_doctype = "Sales Taxes and Charges"
self.select_columns = """
@@ -41,16 +43,15 @@
self.get_gst_accounts()
self.get_invoice_data()
- if not self.invoices: return
+ if self.invoices:
+ self.get_invoice_items()
+ self.get_items_based_on_tax_rate()
+ self.invoice_fields = [d["fieldname"] for d in self.invoice_columns]
+ self.get_data()
- self.get_invoice_items()
- self.get_items_based_on_tax_rate()
- self.invoice_fields = [d["fieldname"] for d in self.invoice_columns]
- self.get_data()
return self.columns, self.data
def get_data(self):
- self.data = []
for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
invoice_details = self.invoices.get(inv)
for rate, items in items_based_on_rate.items():
diff --git a/erpnext/regional/report/gstr_2/gstr_2.py b/erpnext/regional/report/gstr_2/gstr_2.py
index a69a67f..679e567 100644
--- a/erpnext/regional/report/gstr_2/gstr_2.py
+++ b/erpnext/regional/report/gstr_2/gstr_2.py
@@ -12,6 +12,8 @@
class Gstr2Report(Gstr1Report):
def __init__(self, filters=None):
self.filters = frappe._dict(filters or {})
+ self.columns = []
+ self.data = []
self.doctype = "Purchase Invoice"
self.tax_doctype = "Purchase Taxes and Charges"
self.select_columns = """
@@ -39,7 +41,6 @@
def get_data(self):
self.get_igst_invoices()
- self.data = []
for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
invoice_details = self.invoices.get(inv)
for rate, items in items_based_on_rate.items():