From c6717fb7583180231802d5adb2e319f58ae356a5 Mon Sep 17 00:00:00 2001 From: Sudharsanan11 Date: Thu, 27 Aug 2026 22:51:14 +0530 Subject: [PATCH] fix: resolve conflicts --- erpnext/stock/stock_ledger.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index 75ce790cf67..67cc1e30fd8 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -1758,14 +1758,8 @@ class update_entries_after: if not item_code or not warehouse or (item_code, warehouse) in self.prev_sle_dict: return -<<<<<<< HEAD - if frappe.db.count( - "Stock Ledger Entry", - {"item_code": item_code, "warehouse": warehouse, "is_cancelled": 0}, -======= if frappe.db.exists( "Stock Ledger Entry", {"item_code": item_code, "warehouse": warehouse, "is_cancelled": 0} ->>>>>>> 8287906 (Revert "refactor(stock): use db.count for the empty ledger check (backport #58486)") ): return