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

fix: resolve conflicts

Browse Source
This commit is contained in:
Sudharsanan11
2026-09-17 18:12:54 +05:30
parent 39d6f2a236
commit 6fab4e0203
1 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
View File

@@ -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)