From 4a10454d89400720d3d114a9c285acd6b5a007c2 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 1 Nov 2022 21:30:36 +0530 Subject: [PATCH] chore: Resolve conflicts --- .../accounts/doctype/purchase_invoice/purchase_invoice.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 865b0ba2337..9616e93a020 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -1376,12 +1376,7 @@ class PurchaseInvoice(BuyingController): "GL Entry", "Stock Ledger Entry", "Repost Item Valuation", -<<<<<<< HEAD - "Purchase Invoice", -======= - "Payment Ledger Entry", "Tax Withheld Vouchers", ->>>>>>> f7c9258770 (fix: Issues while cancel/amending Purchase Invoice with TDS enabled) ) self.update_advance_tax_references(cancel=1)