nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-14 04:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-10-11 10:16:31 +05:30
committed by GitHub
parent 41599cf29f
commit cd942d36a8
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -323,10 +323,7 @@ class PurchaseOrder(BuyingController):
update_linked_doc(self.doctype, self.name, self.inter_company_order_reference)
def on_cancel(self):
<<<<<<< HEAD
=======
self.ignore_linked_doctypes = ("GL Entry", "Payment Ledger Entry")
>>>>>>> d806e32030 (fix: PO cancel post advance payment cancel against PO)
super(PurchaseOrder, self).on_cancel()
if self.is_against_so():