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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-02-03 20:30:40 +05:30
committed by GitHub
parent ba17fdd072
commit c0116bcde5
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
View File

@@ -8,15 +8,7 @@ from frappe.utils import flt
from erpnext.buying.utils import check_on_hold_or_closed_status from erpnext.buying.utils import check_on_hold_or_closed_status
from erpnext.controllers.subcontracting_controller import SubcontractingController from erpnext.controllers.subcontracting_controller import SubcontractingController
<<<<<<< HEAD
from erpnext.stock.stock_balance import update_bin_qty
=======
from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
StockReservation,
has_reserved_stock,
)
from erpnext.stock.stock_balance import get_ordered_qty, update_bin_qty from erpnext.stock.stock_balance import get_ordered_qty, update_bin_qty
>>>>>>> de8f8ef9f4 (fix(stock): include subcontracting order qty while calculating the bin qty)
from erpnext.stock.utils import get_bin from erpnext.stock.utils import get_bin