From 2978793e37bc0bb8ecf36fbe31b031ff3abced12 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 12 May 2014 17:41:23 +0530 Subject: [PATCH] set route options for Report --- frappe/core/doctype/report/report.js | 6 +++--- frappe/core/doctype/report/report.json | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frappe/core/doctype/report/report.js b/frappe/core/doctype/report/report.js index 4f3e162577..d8d4bf90cc 100644 --- a/frappe/core/doctype/report/report.js +++ b/frappe/core/doctype/report/report.js @@ -2,7 +2,7 @@ cur_frm.cscript.refresh = function(doc) { cur_frm.add_custom_button("Show Report", function() { switch(doc.report_type) { case "Report Builder": - frappe.set_route("Report", doc.name); + frappe.set_route("Report", doc.ref_doctype, doc.name); break; case "Query Report": frappe.set_route("query-report", doc.name); @@ -12,7 +12,7 @@ cur_frm.cscript.refresh = function(doc) { break; } }, "icon-table") - + cur_frm.set_intro(""); switch(doc.report_type) { case "Report Builder": @@ -30,4 +30,4 @@ cur_frm.cscript.refresh = function(doc) { cur_frm.set_intro(__("Write a Python file in the same folder where this is saved and return column and result.")) break; } -} \ No newline at end of file +} diff --git a/frappe/core/doctype/report/report.json b/frappe/core/doctype/report/report.json index f4a5bde8b2..62e81b08b9 100644 --- a/frappe/core/doctype/report/report.json +++ b/frappe/core/doctype/report/report.json @@ -1,6 +1,6 @@ { "autoname": "field:report_name", - "creation": "2013-03-09 15:45:57.000000", + "creation": "2013-03-09 15:45:57", "docstatus": 0, "doctype": "DocType", "document_type": "System", @@ -101,7 +101,7 @@ ], "icon": "icon-table", "idx": 1, - "modified": "2014-03-07 15:20:02.000000", + "modified": "2014-05-12 17:08:04.185601", "modified_by": "Administrator", "module": "Core", "name": "Report", @@ -157,5 +157,7 @@ "role": "All", "submit": 0 } - ] + ], + "sort_field": "modified", + "sort_order": "DESC" } \ No newline at end of file