diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 1030440da8..c5fda2ca66 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -80,9 +80,6 @@ def generate_report_result(report, filters=None, user=None): if result: result = get_filtered_data(report.ref_doctype, columns, result, user) - if cint(report.add_total_row) and result: - result = add_total_row(result, columns) - return { "result": result, "columns": columns, diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 984699f3ad..355b4cf1ee 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -356,7 +356,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { inlineFilters: true, treeView: this.tree_report, layout: 'fixed', - cellHeight: 33 + cellHeight: 33, + showTotalRow: this.raw_data.add_total_row }; if (this.report_settings.get_datatable_options) { diff --git a/package.json b/package.json index 752cceae83..3003271177 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "awesomplete": "^1.1.2", "cookie": "^0.3.1", "express": "^4.16.2", - "frappe-datatable": "^1.5.5", + "frappe-datatable": "^1.6.0", "frappe-gantt": "^0.1.0", "fuse.js": "^3.2.0", "highlight.js": "^9.12.0", diff --git a/yarn.lock b/yarn.lock index 48ddcbac93..d8190b4b90 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1219,10 +1219,10 @@ forwarded@~0.1.2: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= -frappe-datatable@^1.5.5: - version "1.5.5" - resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.5.5.tgz#52c4e4263b2598d1685cdfc72dff248365091868" - integrity sha512-0Euo4otAzkpm1S+NrvhYHQ+Bug0aPus/k2W5FvyCXdRyKyDu5aSYAku+Xquj2mhES/EJGhyfhcuTcGLt0Q1h7g== +frappe-datatable@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.6.0.tgz#c86c2c7fc054a500c70cdf6c6362b5fed63c6fe6" + integrity sha512-40iwguZr0w+X0MV/yTzsYDoKlH7b/GuOq6o2lEOrbVT3p4dZYpalxQmO8mkM9gKjNjSgGMVL1r6Se8peq80Qqg== dependencies: hyperlist "^1.0.0-beta" lodash "^4.17.5"