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

fix: handleling condition if default company doesn't exist

Browse Source
This commit is contained in:
Afshan 2020-08-26 20:55:16 +05:30
parent 7600960d2b
commit b719620d0c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/regional/report/irs_1099/irs_1099.py
View File

@ -16,14 +16,15 @@ from frappe.utils.jinja import render_template
def execute(filters=None): def execute(filters=None):
filters = filters if isinstance(filters, _dict) else _dict(filters) filters = filters if isinstance(filters, _dict) else _dict(filters)
company = frappe.db.get_default("company")
if not filters: if not filters:
filters.setdefault('fiscal_year', get_fiscal_year(nowdate())[0]) filters.setdefault('fiscal_year', get_fiscal_year(nowdate())[0])
filters.setdefault('company', company) filters.setdefault('company', frappe.db.get_default("company"))
region = frappe.db.get_value("Company", fieldname = ["country"], filters = { "name": company }) region = frappe.db.get_value("Company", fieldname = ["country"], filters = { "name": filters.company })
if region != 'United States': if region != 'United States':
return [],[] return [],[]
data = [] data = []
columns = get_columns() columns = get_columns()
data = frappe.db.sql(""" data = frappe.db.sql("""