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

refactor(UAE VAT 21): seperate get_chart, get_data

Browse Source
This commit is contained in:
hasnain2808 2020-09-28 13:24:40 +05:30
parent 79aca28453
commit 815b7584dd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/regional/report/uae_vat_21/uae_vat_21.py
View File

@ -8,7 +8,9 @@ from frappe import _
def execute(filters=None): def execute(filters=None):
columns = get_columns() columns = get_columns()
data, chart = get_data(filters) data, emirates, amounts_by_emirate = get_data(filters)
chart = get_chart(emirates, amounts_by_emirate)
return columns, data, None, chart return columns, data, None, chart
def get_columns(): def get_columns():
@ -72,8 +74,6 @@ def get_data(filters = None):
"vat_amount": vat "vat_amount": vat
} }
chart = get_chart_data(emirates, amounts_by_emirate)
for d, emirate in enumerate(emirates, 97): for d, emirate in enumerate(emirates, 97):
if emirate in amounts_by_emirate: if emirate in amounts_by_emirate:
amounts_by_emirate[emirate]["no"] = f'1{chr(d)}' amounts_by_emirate[emirate]["no"] = f'1{chr(d)}'
@ -148,10 +148,10 @@ def get_data(filters = None):
} }
) )
return data, chart return data, emirates, amounts_by_emirate
def get_chart_data(emirates, amounts_by_emirate): def get_chart(emirates, amounts_by_emirate):
"""Returns chart data """Returns chart data
Args: Args: