Browse Source

Export selected items in Report Builder (#2890)

version-14
KanchanChauhan 8 years ago
committed by Rushabh Mehta
parent
commit
37574d67d1
2 changed files with 9 additions and 2 deletions
  1. +5
    -0
      frappe/desk/reportview.py
  2. +4
    -2
      frappe/public/js/frappe/views/reports/reportview.js

+ 5
- 0
frappe/desk/reportview.py View File

@@ -102,6 +102,11 @@ def export_query():


frappe.permissions.can_export(doctype, raise_exception=True) frappe.permissions.can_export(doctype, raise_exception=True)


if 'selected_items' in form_params:
si = json.loads(frappe.form_dict.get('selected_items'))
form_params["filters"] = {"name": ("in", si)}

del form_params["selected_items"]
db_query = DatabaseQuery(doctype) db_query = DatabaseQuery(doctype)
ret = db_query.execute(**form_params) ret = db_query.execute(**form_params)




+ 4
- 2
frappe/public/js/frappe/views/reports/reportview.js View File

@@ -699,11 +699,10 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({
} }
var export_btn = this.page.add_menu_item(__('Export'), function() { var export_btn = this.page.add_menu_item(__('Export'), function() {
var args = me.get_args(); var args = me.get_args();
selected_items = me.get_checked_items()
frappe.prompt({fieldtype:"Select", label: __("Select File Type"), fieldname:"file_format_type", frappe.prompt({fieldtype:"Select", label: __("Select File Type"), fieldname:"file_format_type",
options:"Excel\nCSV", default:"Excel", reqd: 1}, options:"Excel\nCSV", default:"Excel", reqd: 1},
function(data) { function(data) {

args.cmd = 'frappe.desk.reportview.export_query'; args.cmd = 'frappe.desk.reportview.export_query';
args.file_format_type = data.file_format_type; args.file_format_type = data.file_format_type;


@@ -711,6 +710,9 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({
args.add_totals_row = 1; args.add_totals_row = 1;
} }


if(selected_items.length >= 1) {
args.selected_items = $.map(selected_items, function(d) { return d.name; });
}
open_url_post(frappe.request.url, args); open_url_post(frappe.request.url, args);


}, __("Export Report: " + me.doctype), __("Download")); }, __("Export Report: " + me.doctype), __("Download"));


Loading…
Cancel
Save