From 1d81e52d8e2e62c4c1c87568d44280ef1adb9dc2 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Sat, 27 Jun 2026 17:10:28 +0530 Subject: [PATCH] chore: fix conflicts --- .../stock/doctype/stock_reconciliation/stock_reconciliation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index ce11ea2bfce..ab1358e8293 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -1038,7 +1038,7 @@ class StockReconciliation(StockController): update_modified=False, ) - def get_current_qty_from_ledger(self, row: StockReconciliationItem): + def get_current_qty_from_ledger(self, row): """Current (pre-reconciliation) qty for a row, recomputed from the ledger after reposting. Serial/batch rows cannot have backdated qty changes inserted before a future reconciliation