From 015a221d8d572afeb37724061ebdcf3d0fad8d65 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 18 Oct 2022 09:11:58 +0530 Subject: [PATCH] chore: Resolve conflicts --- .../accounts/doctype/purchase_invoice/purchase_invoice.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 7dd29854245..a1a18f0becd 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -1368,17 +1368,14 @@ class PurchaseInvoice(BuyingController): frappe.db.set(self, "status", "Cancelled") unlink_inter_company_doc(self.doctype, self.name, self.inter_company_invoice_reference) -<<<<<<< HEAD - self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Repost Item Valuation") -======= + self.ignore_linked_doctypes = ( "GL Entry", "Stock Ledger Entry", "Repost Item Valuation", - "Payment Ledger Entry", "Purchase Invoice", ) ->>>>>>> faadf78332 (fix: Ignore linked purchase invoice on cancel) + self.update_advance_tax_references(cancel=1) def update_project(self):