schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: inventory dimension filter not overriding with existing filter for stock ledger report

Browse Source 
(cherry picked from commit 0e388ba872)
This commit is contained in:
Rohit Waghchaure
2023-02-20 12:20:03 +05:30
committed by Mergify
parent 75567391a7
commit 6959283893
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,9 +221,9 @@ $.extend(erpnext.utils, {
callback: function(r) {
if (r.message && r.message.length) {
r.message.forEach((dimension) => {
let found = filters.some(el => el.fieldname === dimension['fieldname']);
let existing_filter = filters.filter(el => el.fieldname === dimension['fieldname']);
if (!found) {
if (!existing_filter.length) {
filters.splice(index, 0, {
"fieldname": dimension["fieldname"],
"label": __(dimension["doctype"]),
@@ -232,6 +232,11 @@ $.extend(erpnext.utils, {
return frappe.db.get_link_options(dimension["doctype"], txt);
},
});
} else {
existing_filter[0]['fieldtype'] = "MultiSelectList";
existing_filter[0]['get_data'] = function(txt) {
return frappe.db.get_link_options(dimension["doctype"], txt);
}
}
});
}