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

Merge branch 'develop' into german-translations-2022-05-23

Browse Source
This commit is contained in:
Raffael Meyer 2022-05-24 11:41:46 +02:00 committed by GitHub
commit e3bc3bf0f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/doctype/material_request/material_request.py
View File

@ -23,7 +23,7 @@ form_grid_templates = {"items": "templates/form_grid/material_request_grid.html"
class MaterialRequest(BuyingController): class MaterialRequest(BuyingController):
def get_feed(self): def get_feed(self):
return _("{0}: {1}").format(self.status, self.material_request_type) return
def check_if_already_pulled(self): def check_if_already_pulled(self):
pass pass

13
erpnext/stock/reorder_item.py
View File

@ -252,11 +252,14 @@ def notify_errors(exceptions_list):
) )
for exception in exceptions_list: for exception in exceptions_list:
exception = json.loads(exception) try:
error_message = """<div class='small text-muted'>{0}</div><br>""".format( exception = json.loads(exception)
_(exception.get("message")) error_message = """<div class='small text-muted'>{0}</div><br>""".format(
) _(exception.get("message"))
content += error_message )
content += error_message
except Exception:
pass
content += _("Regards,") + "<br>" + _("Administrator") content += _("Regards,") + "<br>" + _("Administrator")