diff --git a/hr/doctype/expense_claim/expense_claim.js b/hr/doctype/expense_claim/expense_claim.js index ad3dacebda6..65c557947f8 100644 --- a/hr/doctype/expense_claim/expense_claim.js +++ b/hr/doctype/expense_claim/expense_claim.js @@ -27,8 +27,8 @@ erpnext.hr.ExpenseClaimController = wn.ui.form.Controller.extend({ var d1 = wn.model.add_child(jv, 'Journal Voucher Detail', 'entries'); d1.credit = cur_frm.doc.total_sanctioned_amount; if(r.message) { - d1.account = r.message[0].account; - d1.balance = r.message[0].balance; + d1.account = r.message.account; + d1.balance = r.message.balance; } loaddoc('Journal Voucher', jv.name); diff --git a/stock/doctype/serial_no/serial_no.py b/stock/doctype/serial_no/serial_no.py index e7018a2bebc..1feab02cf57 100644 --- a/stock/doctype/serial_no/serial_no.py +++ b/stock/doctype/serial_no/serial_no.py @@ -52,9 +52,7 @@ class DocType(StockController): webnotes.throw(_("Item Code cannot be changed for Serial No."), SerialNoCannotCannotChangeError) if not self.via_stock_ledger and warehouse != self.doc.warehouse: webnotes.throw(_("Warehouse cannot be changed for Serial No."), SerialNoCannotCannotChangeError) - - if not self.doc.warehouse and self.doc.status=="Available": - self.doc.status = "Not Available" + def validate_item(self): """