diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index e57da3cd71b..75ce790cf67 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -1758,9 +1758,14 @@ 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