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

Merge pull request #21174 from rohitwaghchaure/material_request_incorrect_filter_issue_develop

Browse Source 
fix: material request type manufacture shows items with Is Purchase I…
This commit is contained in:
rohitwaghchaure 2020-04-07 12:06:18 +05:30 committed by GitHub
commit f8e8333d77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/public/js/controllers/buying.js
View File

@ -85,12 +85,6 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
filters:{ 'is_sub_contracted_item': 1 } filters:{ 'is_sub_contracted_item': 1 }
} }
} }
else if (me.frm.doc.material_request_type == "Customer Provided") {
return{
query: "erpnext.controllers.queries.item_query",
filters:{ 'customer': me.frm.doc.customer }
}
}
else { else {
return{ return{
query: "erpnext.controllers.queries.item_query", query: "erpnext.controllers.queries.item_query",

24
erpnext/stock/doctype/material_request/material_request.js
View File

@ -19,11 +19,6 @@ frappe.ui.form.on('Material Request', {
frm.set_indicator_formatter('item_code', frm.set_indicator_formatter('item_code',
function(doc) { return (doc.qty<=doc.ordered_qty) ? "green" : "orange"; }); function(doc) { return (doc.qty<=doc.ordered_qty) ? "green" : "orange"; });
frm.set_query("item_code", "items", function() {
return {
query: "erpnext.controllers.queries.item_query"
};
});
}, },
onload: function(frm) { onload: function(frm) {
@ -145,7 +140,8 @@ frappe.ui.form.on('Material Request', {
}, },
get_item_data: function(frm, item) { get_item_data: function(frm, item) {
if (!item.item_code) return; if (item && !item.item_code) { return; }
frm.call({ frm.call({
method: "erpnext.stock.get_item_details.get_item_details", method: "erpnext.stock.get_item_details.get_item_details",
child: item, child: item,
@ -360,6 +356,22 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten
set_schedule_date(this.frm); set_schedule_date(this.frm);
}, },
onload: function(doc, cdt, cdn) {
this.frm.set_query("item_code", "items", function() {
if (doc.material_request_type == "Customer Provided") {
return{
query: "erpnext.controllers.queries.item_query",
filters:{ 'customer': me.frm.doc.customer }
}
} else if (doc.material_request_type != "Manufacture") {
return{
query: "erpnext.controllers.queries.item_query",
filters: {'is_purchase_item': 1}
}
}
});
},
items_add: function(doc, cdt, cdn) { items_add: function(doc, cdt, cdn) {
var row = frappe.get_doc(cdt, cdn); var row = frappe.get_doc(cdt, cdn);
if(doc.schedule_date) { if(doc.schedule_date) {