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

Merge pull request #8034 from mbauskar/hotfix

Browse Source 
[minor] make item code mandatory if update_stock is selected
This commit is contained in:
Nabin Hait 2017-03-15 19:40:20 +05:30 committed by GitHub
commit f494626ce4
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,6 +205,7 @@ function hide_fields(doc) {
cur_frm.cscript.update_stock = function(doc, dt, dn) { cur_frm.cscript.update_stock = function(doc, dt, dn) {
hide_fields(doc, dt, dn); hide_fields(doc, dt, dn);
this.frm.fields_dict.items.grid.toggle_reqd("item_code", doc.update_stock? true: false)
} }
cur_frm.fields_dict.cash_bank_account.get_query = function(doc) { cur_frm.fields_dict.cash_bank_account.get_query = function(doc) {

7
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -156,6 +156,12 @@ class PurchaseInvoice(BuyingController):
super(PurchaseInvoice, self).validate_warehouse() super(PurchaseInvoice, self).validate_warehouse()
def validate_item_code(self):
for d in self.get('items'):
if not d.item_code:
frappe.msgprint(_("Item Code required at Row No {0}").format(d.idx), raise_exception=True)
def set_expense_account(self, for_validate=False): def set_expense_account(self, for_validate=False):
auto_accounting_for_stock = cint(frappe.defaults.get_global_default("auto_accounting_for_stock")) auto_accounting_for_stock = cint(frappe.defaults.get_global_default("auto_accounting_for_stock"))
@ -164,6 +170,7 @@ class PurchaseInvoice(BuyingController):
stock_items = self.get_stock_items() stock_items = self.get_stock_items()
if self.update_stock: if self.update_stock:
self.validate_item_code()
self.validate_warehouse() self.validate_warehouse()
warehouse_account = get_warehouse_account() warehouse_account = get_warehouse_account()

1
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -321,6 +321,7 @@ cur_frm.cscript.hide_fields = function(doc) {
cur_frm.cscript.update_stock = function(doc, dt, dn) { cur_frm.cscript.update_stock = function(doc, dt, dn) {
cur_frm.cscript.hide_fields(doc, dt, dn); cur_frm.cscript.hide_fields(doc, dt, dn);
this.frm.fields_dict.items.grid.toggle_reqd("item_code", doc.update_stock? true: false)
} }
cur_frm.cscript['Make Delivery Note'] = function() { cur_frm.cscript['Make Delivery Note'] = function() {

1
erpnext/public/js/controllers/transaction.js
View File

@ -1047,5 +1047,4 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
return method return method
}, },
}); });