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

chore: fix conflicts

Browse Source 
Removed unused import for StockReconciliationItem.
This commit is contained in:
rohitwaghchaure
2026-06-08 15:30:48 +05:30
committed by GitHub
parent a03e3bfe9f
commit 5efeb2af18
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@@ -17,12 +17,7 @@ from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle impor
get_available_serial_nos, get_available_serial_nos,
) )
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
<<<<<<< HEAD
from erpnext.stock.utils import get_combine_datetime, get_incoming_rate, get_stock_balance
=======
from erpnext.stock.doctype.stock_reconciliation_item.stock_reconciliation_item import StockReconciliationItem
from erpnext.stock.utils import get_incoming_rate, get_stock_balance from erpnext.stock.utils import get_incoming_rate, get_stock_balance
>>>>>>> e36426e235 (fix: do not allow to make changes in SABB after submit)
class OpeningEntryAccountError(frappe.ValidationError): class OpeningEntryAccountError(frappe.ValidationError):