From 6fab4e02038302a9c9593a92928e32d7ae887099 Mon Sep 17 00:00:00 2001 From: Sudharsanan11 Date: Thu, 17 Sep 2026 18:12:54 +0530 Subject: [PATCH] fix: resolve conflicts --- .../test_stock_ledger_entry.py | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py index ce08ac3c299..aa1f9f37683 100644 --- a/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py +++ b/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py @@ -1594,34 +1594,6 @@ class TestStockLedgerEntry(ERPNextTestSuite, StockTestMixin): item_code=item_code, source=warehouse, qty=470.84, rate=100, posting_date=add_days(today(), -1) ) -<<<<<<< HEAD -======= - def test_zero_qty_row_is_skipped(self): - """A zero-qty non-reconciliation row must be skipped entirely: no SLE, - no crash, no reprocessing of the previous row's entry.""" - from erpnext.stock.stock_ledger import make_sl_entries - - item = make_item(properties={"is_stock_item": 1}) - voucher_no = f"zero-qty-{uuid4()}" - - make_sl_entries( - [ - frappe._dict( - item_code=item.name, - warehouse="_Test Warehouse - _TC", - company="_Test Company", - posting_date=today(), - posting_time="12:00:00", - voucher_type="Stock Entry", - voucher_no=voucher_no, - actual_qty=0, - stock_uom=item.stock_uom, - ) - ] - ) - - self.assertFalse(frappe.db.exists("Stock Ledger Entry", {"voucher_no": voucher_no})) - def test_repost_with_diverged_posting_datetime(self): """Reposting must use the stored posting_datetime, not one rebuilt from posting_date and posting_time.""" from erpnext.stock.stock_ledger import get_sle_against_current_voucher @@ -1740,7 +1712,6 @@ class TestStockLedgerEntry(ERPNextTestSuite, StockTestMixin): flt(frappe.db.get_value("Bin", {"item_code": fg, "warehouse": warehouse}, "actual_qty")), 615.0 ) ->>>>>>> 6cee9c3 (fix(stock): use stored posting_datetime when reposting stock ledger entries (#58998)) def create_repack_entry(**args): args = frappe._dict(args)