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

Indicator fix for stock entry item table

Browse Source
This commit is contained in:
Nabin Hait 2018-03-27 13:30:11 +05:30
parent ba4f32be5c
commit 9d7fe1f7cd
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@ -106,8 +106,8 @@ frappe.ui.form.on('Stock Entry', {
frm.trigger("toggle_display_account_head"); frm.trigger("toggle_display_account_head");
} }
if(frm.doc.docstatus==1 && frm.doc.purpose == "Material Receipt") { if(frm.doc.docstatus==1 && frm.doc.purpose == "Material Receipt" && frm.get_sum('items', 'sample_quantity')) {
frm.add_custom_button(__('Make Retention Stock Entry'), function () { frm.add_custom_button(__('Make Sample Retention Stock Entry'), function () {
frm.trigger("make_retention_stock_entry"); frm.trigger("make_retention_stock_entry");
}); });
} }
@ -465,7 +465,13 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
} }
this.frm.set_indicator_formatter('item_code', this.frm.set_indicator_formatter('item_code',
function(doc) { return (doc.qty<=doc.actual_qty) ? "green" : "orange" }) function(doc) {
if (!doc.s_warehouse) {
return 'blue';
} else {
return (doc.qty<=doc.actual_qty) ? "green" : "orange"
}
})
this.frm.add_fetch("purchase_order", "supplier", "supplier"); this.frm.add_fetch("purchase_order", "supplier", "supplier");