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

Merge pull request #2409 from ankitjavalkarwork/fixbomerror

Browse Source 
Fix Error message, add account_type to 'inventories' in Chart Of Acc.
This commit is contained in:
Nabin Hait 2014-11-14 18:02:44 +05:30
commit 69ab2ffb5c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/account/chart_of_accounts/in_indian_chart_template_standard.json
View File

@ -29,7 +29,8 @@
"Deposit Account": {} "Deposit Account": {}
}, },
"Inventories": { "Inventories": {
"Inventories": {} "Inventories": {},
"account_type": "Warehouse"
}, },
"Other Current Assets": { "Other Current Assets": {
"Prepaid Insurance": {} "Prepaid Insurance": {}

2
erpnext/manufacturing/doctype/bom/bom.py
View File

@ -359,7 +359,7 @@ class BOM(Document):
and docstatus = 1 and is_active = 1)""", self.name) and docstatus = 1 and is_active = 1)""", self.name)
if act_pbom and act_pbom[0][0]: if act_pbom and act_pbom[0][0]:
frappe.throw(_("Cannot deactive or cancle BOM as it is linked with other BOMs")) frappe.throw(_("Cannot deactivate or cancel BOM as it is linked with other BOMs"))
def get_bom_items_as_dict(bom, qty=1, fetch_exploded=1): def get_bom_items_as_dict(bom, qty=1, fetch_exploded=1):
item_dict = {} item_dict = {}