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

Merge pull request #34139 from rohitwaghchaure/fixed-stock-ledger-report-filter-issue

Browse Source 
fix: inventory dimension filter not overriding with existing filter for stock ledger report
This commit is contained in:
rohitwaghchaure 2023-02-20 13:04:23 +05:30 committed by GitHub
commit 5e9620b98b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats 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) { callback: function(r) {
if (r.message && r.message.length) { if (r.message && r.message.length) {
r.message.forEach((dimension) => { 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, { filters.splice(index, 0, {
"fieldname": dimension["fieldname"], "fieldname": dimension["fieldname"],
"label": __(dimension["doctype"]), "label": __(dimension["doctype"]),
@ -232,6 +232,11 @@ $.extend(erpnext.utils, {
return frappe.db.get_link_options(dimension["doctype"], txt); 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);
}
} }
}); });
} }

2
erpnext/stock/report/stock_ledger/stock_ledger.py
View File

@ -306,7 +306,7 @@ def get_stock_ledger_entries(filters, items):
query = query.where(sle.item_code.isin(items)) query = query.where(sle.item_code.isin(items))
for field in ["voucher_no", "batch_no", "project", "company"]: 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 = query.where(sle[field] == filters.get(field))
query = apply_warehouse_filter(query, sle, filters) query = apply_warehouse_filter(query, sle, filters)