nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-11-12 13:57:00 +05:30
committed by GitHub
parent 5979683e8e
commit c80fed8b2f
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.batch.batch import get_batch_qty
from erpnext.stock.doctype.inventory_dimension.inventory_dimension import get_inventory_dimensions from erpnext.stock.doctype.inventory_dimension.inventory_dimension import get_inventory_dimensions
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_stock_balance
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)
class OpeningEntryAccountError(frappe.ValidationError): class OpeningEntryAccountError(frappe.ValidationError):