nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-09 23:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve conflicts

Browse Source
This commit is contained in:
Sudharsanan11
2026-08-27 22:51:14 +05:30
parent 0e7be81f86
commit c6717fb758
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/stock_ledger.py
View File

@@ -1758,14 +1758,8 @@ class update_entries_after:
if not item_code or not warehouse or (item_code, warehouse) in self.prev_sle_dict: if not item_code or not warehouse or (item_code, warehouse) in self.prev_sle_dict:
return return
<<<<<<< HEAD
if frappe.db.count(
"Stock Ledger Entry",
{"item_code": item_code, "warehouse": warehouse, "is_cancelled": 0},
=======
if frappe.db.exists( if frappe.db.exists(
"Stock Ledger Entry", {"item_code": item_code, "warehouse": warehouse, "is_cancelled": 0} "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 return