Merge pull request #2409 from ankitjavalkarwork/fixbomerror
Fix Error message, add account_type to 'inventories' in Chart Of Acc.
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/in_indian_chart_template_standard.json b/erpnext/accounts/doctype/account/chart_of_accounts/in_indian_chart_template_standard.json
index 38d1267..4cf51cb 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/in_indian_chart_template_standard.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/in_indian_chart_template_standard.json
@@ -29,7 +29,8 @@
"Deposit Account": {}
},
"Inventories": {
- "Inventories": {}
+ "Inventories": {},
+ "account_type": "Warehouse"
},
"Other Current Assets": {
"Prepaid Insurance": {}
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 73462b1..6652439 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -359,7 +359,7 @@
and docstatus = 1 and is_active = 1)""", self.name)
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):
item_dict = {}