Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update set query for warehouse after changing the company #22632

Merged
merged 6 commits into from
Jul 21, 2020
Merged

fix: update set query for warehouse after changing the company #22632

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e095812
fix: update set query for warehouse after changing the company
AfshanKhan Jul 9, 2020
b5329a2
fix: changed set_query to get_query
AfshanKhan Jul 10, 2020
229f692
Merge remote-tracking branch 'upstream/develop' into fix-warehouse-op…
AfshanKhan Jul 13, 2020
76e9b23
fix: variable filter doesn't get updated once set on load hence removed
AfshanKhan Jul 17, 2020
f96c0c8
Merge remote-tracking branch 'upstream/develop' into fix-warehouse-op…
AfshanKhan Jul 17, 2020
fae8b92
Merge branch 'develop' into fix-warehouse-option-for-mr
marination Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions erpnext/stock/doctype/material_request/material_request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,21 @@ frappe.ui.form.on('Material Request', {
// set schedule_date
set_schedule_date(frm);

let filters = {'company': frm.doc.company}
frm.set_query("warehouse", "items", function(doc) {
return {
filters: {'company': doc.company}
};
});

frm.set_query("warehouse", "items", function() {
frm.set_query("set_warehouse", function(doc){
return {
filters: filters
filters: {'company': doc.company}
};
});

frm.set_query("set_warehouse", function(){
frm.set_query("set_from_warehouse", function(doc){
return {
filters: filters
filters: {'company': doc.company}
};
});
},
Expand Down