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

fix: work order creation message against material request (#21413)

Browse Source
This commit is contained in:
rohitwaghchaure 2020-04-26 09:38:18 +05:30 committed by GitHub
parent 9ab53c045e
commit 8b1c71ea44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/stock/doctype/material_request/material_request.js
View File

@ -299,6 +299,7 @@ frappe.ui.form.on('Material Request', {
args: {
"material_request": frm.doc.name
},
freeze: true,
callback: function(r) {
if(r.message.length) {
frm.reload_doc();

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

@ -8,7 +8,7 @@ from __future__ import unicode_literals
import frappe
import json
from frappe.utils import cstr, flt, getdate, new_line_sep, nowdate, add_days
from frappe.utils import cstr, flt, getdate, new_line_sep, nowdate, add_days, get_link_to_form
from frappe import msgprint, _
from frappe.model.mapper import get_mapped_doc
from erpnext.stock.stock_balance import update_bin_qty, get_indented_qty
@ -522,15 +522,22 @@ def raise_work_orders(material_request):
work_orders.append(wo_order.name)
else:
errors.append(_("Row {0}: Bill of Materials not found for the Item {1}").format(d.idx, d.item_code))
errors.append(_("Row {0}: Bill of Materials not found for the Item {1}")
.format(d.idx, get_link_to_form("Item", d.item_code)))
if work_orders:
message = ["""<a href="#Form/Work Order/%s" target="_blank">%s</a>""" % \
(p, p) for p in work_orders]
msgprint(_("The following Work Orders were created:") + '\n' + new_line_sep(message))
work_orders_list = [get_link_to_form("Work Order", d) for d in work_orders]
if len(work_orders) > 1:
msgprint(_("The following {0} were created: {1}")
.format(frappe.bold(_("Work Orders")), '<br>' + ', '.join(work_orders_list)))
else:
msgprint(_("The {0} {1} created sucessfully")
.format(frappe.bold(_("Work Order")), work_orders_list[0]))
if errors:
frappe.throw(_("Work Order cannot be created for following reason:") + '\n' + new_line_sep(errors))
frappe.throw(_("Work Order cannot be created for following reason: <br> {0}")
.format(new_line_sep(errors)))
return work_orders