From c80fed8b2f02590d193617dda48bdf45956e9977 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 12 Nov 2025 13:57:00 +0530 Subject: [PATCH] chore: fix conflicts --- .../doctype/stock_reconciliation/stock_reconciliation.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 18f9708349c..6ea39e7c5bf 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -13,11 +13,7 @@ from erpnext.controllers.stock_controller import StockController from erpnext.stock.doctype.batch.batch import get_batch_qty from erpnext.stock.doctype.inventory_dimension.inventory_dimension import get_inventory_dimensions from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos -<<<<<<< HEAD -from erpnext.stock.utils import get_stock_balance -======= -from erpnext.stock.utils import get_combine_datetime, get_incoming_rate, get_stock_balance ->>>>>>> 58315bc963 (fix: current qty in stock reco) +from erpnext.stock.utils import get_combine_datetime, get_stock_balance class OpeningEntryAccountError(frappe.ValidationError):