diff --git a/erpnext/__init__.py b/erpnext/__init__.py index adaae4feff..f026b6adc9 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -39,7 +39,7 @@ def get_company_currency(company): def set_perpetual_inventory(enable=1, company=None): if not company: company = get_default_company() - + if frappe.flags.in_test: company = "_Test Company" diff --git a/erpnext/docs/assets/img/accounts/perpetual-1.png b/erpnext/docs/assets/img/accounts/perpetual-1.png index d9e9342d9f..458f364926 100644 Binary files a/erpnext/docs/assets/img/accounts/perpetual-1.png and b/erpnext/docs/assets/img/accounts/perpetual-1.png differ diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md index 92e0544e03..343e3f4769 100644 --- a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md +++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md @@ -8,7 +8,7 @@ On receipt of items in a particular warehouse, the balance in the Warehouse Acco * Activate Perpetual Inventory - > Explore > Accounts > Accounts Settings > "Make Accounting Entry For Every Stock Movement" + > Setup > Company > Stock Settings > "Enable Perpetual Inventory" Perpetual Inventory diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 6a044f78e8..f1dbeeac73 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -67,7 +67,7 @@ frappe.ui.form.on('Stock Entry', { }); }); } - + if(frm.doc.company) { frm.trigger("toggle_display_account_head"); } @@ -103,9 +103,8 @@ frappe.ui.form.on('Stock Entry', { } }); }, - toggle_display_account_head: function(frm) { - var enabled = frappe.get_doc(":Company", frm.doc.company).enable_perpetual_inventory + var enabled = frappe.get_doc(":Company", frm.doc.company).enable_perpetual_inventory; frm.fields_dict["items"].grid.set_column_disp(["cost_center", "expense_account"], enabled); } }) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js index 0c38d01e54..2a6ef7be61 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js @@ -170,7 +170,6 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({ this.frm.add_fetch("company", "stock_adjustment_account", "expense_account"); this.frm.add_fetch("company", "cost_center", "cost_center"); } - this.frm.fields_dict["expense_account"].get_query = function() { if(frappe.get_doc(":Company", me.frm.doc.company).enable_perpetual_inventory) { return {