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

Merge pull request #20123 from nextchamp-saqib/so-update-items

Browse Source 
fix: don't allow deletion of items which has work order assigned to it
This commit is contained in:
Deepesh Garg 2019-12-28 21:01:17 +05:30 committed by GitHub
commit e90126f7ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/controllers/accounts_controller.py
View File

@ -1163,8 +1163,13 @@ def check_and_delete_children(parent, data):
deleted_children.append(item) deleted_children.append(item)
for d in deleted_children: for d in deleted_children:
if parent.doctype == "Sales Order" and flt(d.delivered_qty): if parent.doctype == "Sales Order":
frappe.throw(_("Row #{0}: Cannot delete item {1} which has already been delivered").format(d.idx, d.item_code)) if flt(d.delivered_qty):
frappe.throw(_("Row #{0}: Cannot delete item {1} which has already been delivered").format(d.idx, d.item_code))
if flt(d.work_order_qty):
frappe.throw(_("Row #{0}: Cannot delete item {1} which has work order assigned to it.").format(d.idx, d.item_code))
if flt(d.ordered_qty):
frappe.throw(_("Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order.").format(d.idx, d.item_code))
if parent.doctype == "Purchase Order" and flt(d.received_qty): if parent.doctype == "Purchase Order" and flt(d.received_qty):
frappe.throw(_("Row #{0}: Cannot delete item {1} which has already been received").format(d.idx, d.item_code)) frappe.throw(_("Row #{0}: Cannot delete item {1} which has already been received").format(d.idx, d.item_code))

3
erpnext/selling/doctype/sales_order/sales_order.js
View File

@ -12,7 +12,8 @@ frappe.ui.form.on("Sales Order", {
'Material Request': 'Material Request', 'Material Request': 'Material Request',
'Purchase Order': 'Purchase Order', 'Purchase Order': 'Purchase Order',
'Project': 'Project', 'Project': 'Project',
'Payment Entry': "Payment" 'Payment Entry': "Payment",
'Work Order': "Work Order"
} }
frm.add_fetch('customer', 'tax_id', 'tax_id'); frm.add_fetch('customer', 'tax_id', 'tax_id');