Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: typerror on multi select dialog

Browse Source 
(cherry picked from commit 7da9ffa3bd072fbfc9627e6eb5afb3dd3078f560)
This commit is contained in:
ruthra kumar 2024-01-03 17:59:15 +05:30 committed by Mergify
parent 40ec5ff90f
commit 54a0df5164
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/public/js/utils.js
View File

@ -865,16 +865,20 @@ erpnext.utils.map_current_doc = function(opts) {
} }
if (opts.source_doctype) { if (opts.source_doctype) {
let data_fields = [];
if(opts.source_doctype == "Purchase Receipt") {
data_fields.push({
fieldname: 'merge_taxes',
fieldtype: 'Check',
label: __('Merge taxes from multiple documents'),
});
}
const d = new frappe.ui.form.MultiSelectDialog({ const d = new frappe.ui.form.MultiSelectDialog({
doctype: opts.source_doctype, doctype: opts.source_doctype,
target: opts.target, target: opts.target,
date_field: opts.date_field || undefined, date_field: opts.date_field || undefined,
setters: opts.setters, setters: opts.setters,
data_fields: [{ data_fields: data_fields,
fieldname: 'merge_taxes',
fieldtype: 'Check',
label: __('Merge taxes from multiple documents'),
}],
get_query: opts.get_query, get_query: opts.get_query,
add_filters_group: 1, add_filters_group: 1,
allow_child_item_selection: opts.allow_child_item_selection, allow_child_item_selection: opts.allow_child_item_selection,
@ -888,7 +892,10 @@ erpnext.utils.map_current_doc = function(opts) {
return; return;
} }
opts.source_name = values; opts.source_name = values;
opts.args = args; if (opts.allow_child_item_selection || opts.source_doctype == "Purchase Receipt") {
// args contains filtered child docnames
opts.args = args;
}
d.dialog.hide(); d.dialog.hide();
_map(); _map();
}, },