refactor(UAE VAT 21): seperate get_chart, get_data
This commit is contained in:
parent
79aca28453
commit
815b7584dd
@ -8,7 +8,9 @@ from frappe import _
|
||||
|
||||
def execute(filters=None):
|
||||
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
|
||||
|
||||
def get_columns():
|
||||
@ -72,8 +74,6 @@ def get_data(filters = None):
|
||||
"vat_amount": vat
|
||||
}
|
||||
|
||||
chart = get_chart_data(emirates, amounts_by_emirate)
|
||||
|
||||
for d, emirate in enumerate(emirates, 97):
|
||||
if emirate in amounts_by_emirate:
|
||||
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
|
||||
|
||||
Args:
|
||||
|
Loading…
x
Reference in New Issue
Block a user