From 2043cee08fbbdae779f8117e41520f33cfc9b969 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 11 Jun 2019 15:26:08 +0530 Subject: [PATCH 1/3] fix: prepared report not working for the Batch-Wise Balance History, Accounts Receivable Report --- frappe/desk/query_report.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 09b6cda08b..9bb5b09684 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -256,13 +256,17 @@ def get_prepared_report_result(report, filters, dn="", user=None): data = json.loads(uncompressed_content) if data: columns = json.loads(doc.columns) if doc.columns else data[0] + for column in columns: - column["label"] = _(column["label"]) + if isinstance(column, dict): + column["label"] = _(column["label"]) + latest_report_data = { "columns": columns, "result": data } except Exception: + frappe.log_error(frappe.get_traceback()) frappe.delete_doc("Prepared Report", doc.name) frappe.db.commit() doc = None From be36538a8cca498a8ed91bf2db6ed8de51af9672 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Tue, 11 Jun 2019 16:17:35 +0530 Subject: [PATCH 2/3] fix: Upgrade frappe datatable --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8052734731..5c7f0b1149 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "cookie": "^0.3.1", "express": "^4.16.2", "fast-deep-equal": "^2.0.1", - "frappe-datatable": "^1.13.2", + "frappe-datatable": "^1.13.3", "frappe-gantt": "^0.1.0", "fuse.js": "^3.2.0", "highlight.js": "^9.12.0", diff --git a/yarn.lock b/yarn.lock index 75aa246a07..4053427952 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1224,10 +1224,10 @@ forwarded@~0.1.2: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= -frappe-datatable@^1.13.2: - version "1.13.2" - resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.13.2.tgz#8b36c7cfc0ea660fc72eea8b1ae3c5dcc2a7d67d" - integrity sha512-4PyPDX22K4e4S3WGlLQx3oyxIW+ENsbGiN9L6aUpmjU+fOCC7J/FfSwGKdua2f+4yD+2ObpkyJYazBl3inAeCA== +frappe-datatable@^1.13.3: + version "1.13.3" + resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.13.3.tgz#14036f3eb40ddec9a1cd303747e7d6378b3a596d" + integrity sha512-9uSk35ELiwRPrR1OZeSR+MdN82Vz32vssw8z/YYPYAbJTjqpraMVsjztBbqfIyDYTmxnG0MHSWp8HOgxeTphqA== dependencies: hyperlist "^1.0.0-beta" lodash "^4.17.5" From 386f6f030e4f1f4ec87aaf113c6cdd944f982de6 Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Tue, 11 Jun 2019 17:22:50 +0550 Subject: [PATCH 3/3] bumped to version 11.1.35 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 8801f18166..5027a11f99 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -23,7 +23,7 @@ if sys.version[0] == '2': reload(sys) sys.setdefaultencoding("utf-8") -__version__ = '11.1.34' +__version__ = '11.1.35' __title__ = "Frappe Framework" local = Local()