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

Minor fix, if no default company

Browse Source
This commit is contained in:
nabinhait 2014-07-14 12:39:50 +05:30
parent b0a8d000b1
commit d5fd535909
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/public/js/queries.js
View File

@ -71,7 +71,7 @@ $.extend(erpnext.queries, {
warehouse: function(doc) {
return {
filters: [["Warehouse", "company", "in", ["", doc.company]]]
filters: [["Warehouse", "company", "in", ["", cstr(doc.company)]]]
}
}
});

2
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@ -92,7 +92,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
set_default_account: function() {
var me = this;
if(cint(frappe.defaults.get_default("auto_accounting_for_stock"))) {
if(cint(frappe.defaults.get_default("auto_accounting_for_stock")) && this.frm.doc.company) {
var account_for = "stock_adjustment_account";
if (this.frm.doc.purpose == "Purchase Return")