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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta 2013-08-08 14:17:09 +05:30
commit 51ae205e0e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hr/doctype/expense_claim/expense_claim.js
View File

@ -25,9 +25,11 @@ erpnext.hr.ExpenseClaimController = wn.ui.form.Controller.extend({
// credit to bank
var d1 = wn.model.add_child(jv, 'Journal Voucher Detail', 'entries');
d1.account = r.message[0].account;
d1.credit = cur_frm.doc.total_sanctioned_amount;
d1.balance = r.message[0].balance;
if(r.message) {
d1.account = r.message[0].account;
d1.balance = r.message[0].balance;
}
loaddoc('Journal Voucher', jv.name);
}

3
stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@ -286,6 +286,9 @@ class DocType(StockController):
item_list = [d.item_code for d in self.entries]
warehouse_list = [d.warehouse for d in self.entries]
if not (item_list and warehouse_list):
webnotes.throw(_("Invalid Item or Warehouse Data"))
stock_ledger_entries = self.get_stock_ledger_entries(item_list, warehouse_list)
self.doc.stock_value_difference = 0.0