refactor(UAE VAT 21): seperate get_chart, get_data
diff --git a/erpnext/regional/report/uae_vat_21/uae_vat_21.py b/erpnext/regional/report/uae_vat_21/uae_vat_21.py
index 1a3537c..d21cecd 100644
--- a/erpnext/regional/report/uae_vat_21/uae_vat_21.py
+++ b/erpnext/regional/report/uae_vat_21/uae_vat_21.py
@@ -8,7 +8,9 @@
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 @@
"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 @@
}
)
- 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: