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

chore: Format unassigned Items dialog and add freeze message

Browse Source
This commit is contained in:
marination 2020-11-23 19:19:35 +05:30
parent 90598ea19c
commit 0cec1477f2
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@ -347,7 +347,8 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
make_purchase_receipt: function() { make_purchase_receipt: function() {
frappe.model.open_mapped_doc({ frappe.model.open_mapped_doc({
method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_receipt", method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_receipt",
frm: cur_frm frm: cur_frm,
freeze_message: __("Creating Purchase Receipt ...")
}) })
}, },

27
erpnext/stock/doctype/putaway_rule/putaway_rule.py
View File

@ -42,6 +42,9 @@ class PutawayRule(Document):
frappe.throw(_("Warehouse Capacity for Item '{0}' must be greater than the existing stock level of {1} qty.") frappe.throw(_("Warehouse Capacity for Item '{0}' must be greater than the existing stock level of {1} qty.")
.format(self.item_code, frappe.bold(balance_qty)), title=_("Insufficient Capacity")) .format(self.item_code, frappe.bold(balance_qty)), title=_("Insufficient Capacity"))
if not self.capacity:
frappe.throw(_("Capacity must be greater than 0"), title=_("Invalid"))
@frappe.whitelist() @frappe.whitelist()
def get_ordered_putaway_rules(item_code, company): def get_ordered_putaway_rules(item_code, company):
"""Returns an ordered list of putaway rules to apply on an item.""" """Returns an ordered list of putaway rules to apply on an item."""
@ -137,10 +140,26 @@ def apply_putaway_rule(items, company):
items_not_accomodated.append([item.item_code, pending_qty]) items_not_accomodated.append([item.item_code, pending_qty])
if items_not_accomodated: if items_not_accomodated:
msg = _("The following Items, having Putaway Rules, could not be accomodated:") + "<br><br><ul><li>" msg = _("The following Items, having Putaway Rules, could not be accomodated:") + "<br><br>"
formatted_item_qty = [entry[0] + " : " + str(entry[1]) for entry in items_not_accomodated] formatted_item_rows = ""
msg += "</li><li>".join(formatted_item_qty)
msg += "</li></ul>" for entry in items_not_accomodated:
item_link = frappe.utils.get_link_to_form("Item", entry[0])
formatted_item_rows += """
<td>{0}</td>
<td>{1}</td>
</tr>""".format(item_link, frappe.bold(entry[1]))
msg += """
<table class="table">
<thead>
<td>{0}</td>
<td>{1}</td>
</thead>
{2}
</table>
""".format(_("Item"), _("Unassigned Qty"), formatted_item_rows)
frappe.msgprint(msg, title=_("Insufficient Capacity"), is_minimizable=True, wide=True) frappe.msgprint(msg, title=_("Insufficient Capacity"), is_minimizable=True, wide=True)
return updated_table if updated_table else items return updated_table if updated_table else items