Skip to content

Commit

Permalink
Merge pull request #28133 from frappe/mergify/bp/version-13-hotfix/pr…
Browse files Browse the repository at this point in the history
…-27609

fix: Unlink PO on cancelling SO (backport #27609)
  • Loading branch information
deepeshgarg007 authored Oct 29, 2021
2 parents c822f28 + a60ecb9 commit 1c0ae92
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 0 deletions.
32 changes: 32 additions & 0 deletions erpnext/controllers/accounts_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,38 @@ def on_cancel(self):
if frappe.db.get_single_value('Accounts Settings', 'unlink_advance_payment_on_cancelation_of_order'):
unlink_ref_doc_from_payment_entries(self)

if self.doctype == "Sales Order":
self.unlink_ref_doc_from_po()

def unlink_ref_doc_from_po(self):
so_items = []
for item in self.items:
so_items.append(item.name)

linked_po = list(set(frappe.get_all(
'Purchase Order Item',
filters = {
'sales_order': self.name,
'sales_order_item': ['in', so_items],
'docstatus': ['<', 2]
},
pluck='parent'
)))

if linked_po:
frappe.db.set_value(
'Purchase Order Item', {
'sales_order': self.name,
'sales_order_item': ['in', so_items],
'docstatus': ['<', 2]
},{
'sales_order': None,
'sales_order_item': None
}
)

frappe.msgprint(_("Purchase Orders {0} are un-linked").format("\n".join(linked_po)))

def get_tax_map(self):
tax_map = {}
for tax in self.get('taxes'):
Expand Down
2 changes: 2 additions & 0 deletions erpnext/selling/doctype/sales_order/sales_order.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ frappe.ui.form.on("Sales Order", {
});

erpnext.queries.setup_warehouse_query(frm);

frm.ignore_doctypes_on_cancel_all = ['Purchase Order'];
},

delivery_date: function(frm) {
Expand Down

0 comments on commit 1c0ae92

Please sign in to comment.