Merge branch 'develop' into german-translations-2022-05-23
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index c998629..2614a7f 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -23,7 +23,7 @@
class MaterialRequest(BuyingController):
def get_feed(self):
- return _("{0}: {1}").format(self.status, self.material_request_type)
+ return
def check_if_already_pulled(self):
pass
diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py
index 4763b47..f19c75f 100644
--- a/erpnext/stock/reorder_item.py
+++ b/erpnext/stock/reorder_item.py
@@ -252,11 +252,14 @@
)
for exception in exceptions_list:
- exception = json.loads(exception)
- error_message = """<div class='small text-muted'>{0}</div><br>""".format(
- _(exception.get("message"))
- )
- content += error_message
+ try:
+ exception = json.loads(exception)
+ error_message = """<div class='small text-muted'>{0}</div><br>""".format(
+ _(exception.get("message"))
+ )
+ content += error_message
+ except Exception:
+ pass
content += _("Regards,") + "<br>" + _("Administrator")