Merge branch 'develop' of https://github.com/frappe/erpnext into bootstrapped_gst_setup_develop
This commit is contained in:
commit
1ee63f31e5
@ -584,7 +584,7 @@ class Gstr1Report(object):
|
|||||||
def get_json(filters, report_name, data):
|
def get_json(filters, report_name, data):
|
||||||
filters = json.loads(filters)
|
filters = json.loads(filters)
|
||||||
report_data = json.loads(data)
|
report_data = json.loads(data)
|
||||||
gstin = get_company_gstin_number(filters["company"], filters["company_address"])
|
gstin = get_company_gstin_number(filters.get("company"), filters.get("company_address"))
|
||||||
|
|
||||||
fp = "%02d%s" % (getdate(filters["to_date"]).month, getdate(filters["to_date"]).year)
|
fp = "%02d%s" % (getdate(filters["to_date"]).month, getdate(filters["to_date"]).year)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user