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

fix: Change Received qty to accepted qty and validation for indicators

Browse Source
This commit is contained in:
deepeshgarg007 2019-02-18 18:42:15 +05:30
parent f3b33f3ab2
commit 9a19e06856
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@ -9,9 +9,12 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
this.setup_posting_date_time_check(); this.setup_posting_date_time_check();
this._super(doc); this._super(doc);
// formatter for material request item // formatter for purchase invoice item
this.frm.set_indicator_formatter('item_code', if(this.frm.doc.update_stock) {
function(doc) { return (doc.qty<=doc.received_qty) ? "green" : "orange" }) this.frm.set_indicator_formatter('item_code', function(doc) {
return (doc.qty<=doc.received_qty) ? "green" : "orange";
});
}
}, },
onload: function() { onload: function() {
this._super(); this._super();

6
erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
View File

@ -293,7 +293,7 @@
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "2", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
@ -321,7 +321,7 @@
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Qty", "label": "Accepted Qty",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "qty", "oldfieldname": "qty",
@ -2626,7 +2626,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2019-01-07 16:52:00.749414", "modified": "2019-02-18 18:13:40.390806",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice Item", "name": "Purchase Invoice Item",

4
erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
View File

@ -417,7 +417,7 @@
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Recd Quantity", "label": "Received Quantity",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "received_qty", "oldfieldname": "received_qty",
@ -2608,7 +2608,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2019-01-07 16:51:59.002215", "modified": "2019-02-18 16:04:36.138776",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt Item", "name": "Purchase Receipt Item",