Merge pull request #7956 from manassolanki/sibling
[Fixes] School
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json
index 052284d..5b41154 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json
@@ -1,5 +1,6 @@
{
"allow_copy": 0,
+ "allow_guest_to_view": 0,
"allow_import": 1,
"allow_rename": 0,
"autoname": "naming_series:",
@@ -812,7 +813,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Employees Email Address",
+ "label": "Cost Center",
"length": 0,
"no_copy": 0,
"options": "Cost Center",
@@ -921,19 +922,19 @@
"width": "160px"
}
],
+ "has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"icon": "icon-money",
"idx": 1,
"image_view": 0,
"in_create": 0,
- "in_dialog": 0,
"is_submittable": 1,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-02-17 16:52:25.682739",
+ "modified": "2017-03-08 06:28:46.142302",
"modified_by": "Administrator",
"module": "HR",
"name": "Expense Claim",
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index 244ac66..ca25414 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -393,11 +393,11 @@
prod_order.save()
production_orders.append(prod_order.name)
else:
- errors.append(d.item_code + " in Row " + cstr(d.idx))
+ errors.append(_("Row {0}: Bill of Materials not found for the Item {1}").format(d.idx, d.item_code))
if production_orders:
message = ["""<a href="#Form/Production Order/%s" target="_blank">%s</a>""" % \
(p, p) for p in production_orders]
- msgprint(_("The following Production Orders were created:" + '\n' + new_line_sep(message)))
+ msgprint(_("The following Production Orders were created:") + '\n' + new_line_sep(message))
if errors:
- msgprint(_("Productions Orders cannot be raised for:" + '\n' + new_line_sep(errors)))
+ frappe.throw(_("Productions Orders cannot be raised for:") + '\n' + new_line_sep(errors))
return production_orders