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

chore: Code cleanup, reduce redundancy

Browse Source
This commit is contained in:
marination 2020-10-16 16:47:23 +05:30
parent be4dbad823
commit 359778e235
3 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
View File

@ -326,7 +326,7 @@ erpnext.buying.RequestforQuotationController = erpnext.buying.BuyingController.e
d.show(); d.show();
}, __("Get items from")); }, __("Get items from"));
//Link Material Requests // Link Material Requests
this.frm.add_custom_button(__('Link to Material Requests'), this.frm.add_custom_button(__('Link to Material Requests'),
function() { function() {
erpnext.buying.link_to_mrs(me.frm); erpnext.buying.link_to_mrs(me.frm);

2
erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
View File

@ -55,7 +55,7 @@ erpnext.buying.SupplierQuotationController = erpnext.buying.BuyingController.ext
}) })
}, __("Get items from")); }, __("Get items from"));
//Link Material Requests // Link Material Requests
this.frm.add_custom_button(__('Link to Material Requests'), this.frm.add_custom_button(__('Link to Material Requests'),
function() { function() {
erpnext.buying.link_to_mrs(me.frm); erpnext.buying.link_to_mrs(me.frm);

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

@ -363,54 +363,54 @@ erpnext.buying.link_to_mrs = function(frm) {
frappe.call({ frappe.call({
method: "erpnext.buying.utils.get_linked_material_requests", method: "erpnext.buying.utils.get_linked_material_requests",
args:{ args:{
items: frm.doc.items.map((item) => {return item.item_code;}) items: frm.doc.items.map((item) => item.item_code)
}, },
callback: function(r) { callback: function(r) {
if(!r.message || r.message.length == 0) { if (!r.message || r.message.length == 0) {
frappe.throw({message: __("No pending Material Requests found to link for the given items."), title: __("Note")}); frappe.throw({
message: __("No pending Material Requests found to link for the given items."),
title: __("Note")
});
} }
else {
var i = 0; var item_length = frm.doc.items.length;
var item_length = frm.doc.items.length; for (let item of frm.doc.items) {
while (i < item_length) { var qty = item.qty;
var qty = frm.doc.items[i].qty; (r.message[0] || []).forEach(function(d) {
(r.message[0] || []).forEach(function(d) { if (d.qty > 0 && qty > 0 && item.item_code == d.item_code && !item.material_request_item)
if (d.qty > 0 && qty > 0 && frm.doc.items[i].item_code == d.item_code && !frm.doc.items[i].material_request_item) {
item.material_request = d.mr_name;
item.material_request_item = d.mr_item;
var my_qty = Math.min(qty, d.qty);
qty = qty - my_qty;
d.qty = d.qty - my_qty;
item.stock_qty = my_qty*item.conversion_factor;
item.qty = my_qty;
frappe.msgprint("Assigning " + d.mr_name + " to " + d.item_code + " (row " + item.idx + ")");
if (qty > 0)
{ {
frm.doc.items[i].material_request = d.mr_name; frappe.msgprint("Splitting " + qty + " units of " + d.item_code);
frm.doc.items[i].material_request_item = d.mr_item; var newrow = frappe.model.add_child(frm.doc, item.doctype, "items");
var my_qty = Math.min(qty, d.qty); item_length++;
qty = qty - my_qty;
d.qty = d.qty - my_qty;
frm.doc.items[i].stock_qty = my_qty*frm.doc.items[i].conversion_factor;
frm.doc.items[i].qty = my_qty;
frappe.msgprint("Assigning " + d.mr_name + " to " + d.item_code + " (row " + frm.doc.items[i].idx + ")"); for (var key in item)
if (qty > 0)
{ {
frappe.msgprint("Splitting " + qty + " units of " + d.item_code); newrow[key] = item[key];
var newrow = frappe.model.add_child(frm.doc, frm.doc.items[i].doctype, "items");
item_length++;
for (var key in frm.doc.items[i])
{
newrow[key] = frm.doc.items[i][key];
}
newrow.idx = item_length;
newrow["stock_qty"] = newrow.conversion_factor*qty;
newrow["qty"] = qty;
newrow["material_request"] = "";
newrow["material_request_item"] = "";
} }
newrow.idx = item_length;
newrow["stock_qty"] = newrow.conversion_factor*qty;
newrow["qty"] = qty;
newrow["material_request"] = "";
newrow["material_request_item"] = "";
} }
}); }
i++; });
}
refresh_field("items");
} }
refresh_field("items");
} }
}); });
} }