nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 20:59:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3988 from nabinhait/fix2

Browse Source 
Set expense account in stock reco only if company available
This commit is contained in:
Anand Doshi
2015-09-08 15:59:18 +05:30
parent e1af7f1a0f f44128f81c
commit 9f25575e0c
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
View File

@@ -36,7 +36,7 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({
set_default_expense_account: function() { set_default_expense_account: function() {
var me = this; var me = this;
if(this.frm.doc.company) {
if (sys_defaults.auto_accounting_for_stock && !this.frm.doc.expense_account) { if (sys_defaults.auto_accounting_for_stock && !this.frm.doc.expense_account) {
return this.frm.call({ return this.frm.call({
method: "erpnext.accounts.utils.get_company_default", method: "erpnext.accounts.utils.get_company_default",
@@ -51,6 +51,7 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({
} }
}); });
} }
}
}, },
setup: function() { setup: function() {