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

fixed document

Browse Source
This commit is contained in:
Rohit Waghchaure 2017-06-16 18:22:30 +05:30
parent 6945d0dd8a
commit 65ccb42f95
5 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -39,7 +39,7 @@ def get_company_currency(company):
def set_perpetual_inventory(enable=1, company=None): def set_perpetual_inventory(enable=1, company=None):
if not company: if not company:
company = get_default_company() company = get_default_company()
if frappe.flags.in_test: if frappe.flags.in_test:
company = "_Test Company" company = "_Test Company"

BIN
erpnext/docs/assets/img/accounts/perpetual-1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 59 KiB

2
erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
View File

@ -8,7 +8,7 @@ On receipt of items in a particular warehouse, the balance in the Warehouse Acco
* Activate Perpetual Inventory * Activate Perpetual Inventory
> Explore > Accounts > Accounts Settings > "Make Accounting Entry For Every Stock Movement" > Setup > Company > Stock Settings > "Enable Perpetual Inventory"
<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-1.png"> <img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-1.png">

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

@ -67,7 +67,7 @@ frappe.ui.form.on('Stock Entry', {
}); });
}); });
} }
if(frm.doc.company) { if(frm.doc.company) {
frm.trigger("toggle_display_account_head"); frm.trigger("toggle_display_account_head");
} }
@ -103,9 +103,8 @@ frappe.ui.form.on('Stock Entry', {
} }
}); });
}, },
toggle_display_account_head: function(frm) { 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); frm.fields_dict["items"].grid.set_column_disp(["cost_center", "expense_account"], enabled);
} }
}) })

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

@ -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", "stock_adjustment_account", "expense_account");
this.frm.add_fetch("company", "cost_center", "cost_center"); this.frm.add_fetch("company", "cost_center", "cost_center");
} }
this.frm.fields_dict["expense_account"].get_query = function() { this.frm.fields_dict["expense_account"].get_query = function() {
if(frappe.get_doc(":Company", me.frm.doc.company).enable_perpetual_inventory) { if(frappe.get_doc(":Company", me.frm.doc.company).enable_perpetual_inventory) {
return { return {