fix: inventory dimension filter not overriding with existing filter for stock ledger report
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 51dcd64..58aa8d7 100755
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -221,9 +221,9 @@
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 @@
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);
+ }
}
});
}
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index 8b63c0f..da17cde 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -306,7 +306,7 @@
query = query.where(sle.item_code.isin(items))
for field in ["voucher_no", "batch_no", "project", "company"]:
- if filters.get(field):
+ if filters.get(field) and field not in inventory_dimension_fields:
query = query.where(sle[field] == filters.get(field))
query = apply_warehouse_filter(query, sle, filters)