Merge pull request #3988 from nabinhait/fix2

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
commit 9f25575e0c

View File

@ -36,20 +36,21 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({
set_default_expense_account: function() {
var me = this;
if (sys_defaults.auto_accounting_for_stock && !this.frm.doc.expense_account) {
return this.frm.call({
method: "erpnext.accounts.utils.get_company_default",
args: {
"fieldname": "stock_adjustment_account",
"company": this.frm.doc.company
},
callback: function(r) {
if (!r.exc) {
me.frm.set_value("expense_account", r.message);
if(this.frm.doc.company) {
if (sys_defaults.auto_accounting_for_stock && !this.frm.doc.expense_account) {
return this.frm.call({
method: "erpnext.accounts.utils.get_company_default",
args: {
"fieldname": "stock_adjustment_account",
"company": this.frm.doc.company
},
callback: function(r) {
if (!r.exc) {
me.frm.set_value("expense_account", r.message);
}
}
}
});
});
}
}
},