Merge branch 'aii_release' of github.com:webnotes/erpnext into aii_release

This commit is contained in:
Anand Doshi 2013-03-29 19:44:52 +05:30
commit 96a5f1dda0

View File

@ -42,7 +42,7 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({
setup: function() {
var me = this;
this.frm.add_fetch("company", "expense_account", "stock_adjustment_account");
this.frm.add_fetch("company", "stock_adjustment_account", "expense_account");
this.frm.fields_dict["expense_account"].get_query = function() {
return {