From 815b7584dddbe4c29cc453c98d80d697035103c7 Mon Sep 17 00:00:00 2001 From: hasnain2808 Date: Mon, 28 Sep 2020 13:24:40 +0530 Subject: [PATCH] refactor(UAE VAT 21): seperate get_chart, get_data --- erpnext/regional/report/uae_vat_21/uae_vat_21.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 1a3537c268a..d21cecd8263 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 @@ 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: