From fff1b42f80cbb3cf0d5bf1f2c9dc879f3c373cf2 Mon Sep 17 00:00:00 2001 From: ankitjavalkarwork Date: Fri, 14 Nov 2014 14:19:06 +0530 Subject: [PATCH] Fix Error message, add account_type to 'inventories' in Chart Of Acc. --- .../chart_of_accounts/in_indian_chart_template_standard.json | 3 ++- erpnext/manufacturing/doctype/bom/bom.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 38d1267585..4cf51cb78e 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 73462b1c76..66524396b2 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -359,7 +359,7 @@ class BOM(Document): 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 = {}