From 271ddb6add5f062fdc33750c21e124ae275d7bc3 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Wed, 3 Jun 2026 14:22:59 +0530 Subject: [PATCH] fix: resolve conflict --- .../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 31bb09b5446..ff4fea0bf14 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -633,14 +633,9 @@ class PurchaseInvoice(BuyingController): throw(msg, title=_("Mandatory Purchase Order")) def pr_required(self): -<<<<<<< HEAD - stock_items = self.get_stock_items() - if frappe.db.get_value("Buying Settings", None, "pr_required") == "Yes": -======= if frappe.db.get_single_value("Buying Settings", "pr_required") == "Yes": stock_and_asset_items = self.get_stock_items() stock_and_asset_items.extend(self.get_asset_items()) ->>>>>>> d0d9411700 (fix(accounts): include asset items in purchase receipt validation (#55150)) if frappe.get_value( "Supplier", self.supplier, "allow_purchase_invoice_creation_without_purchase_receipt" ):