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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-09-26 11:21:16 +05:30
committed by GitHub
parent 6c8e8384d5
commit 62959e5a70
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/subcontracting_controller.py
View File

@@ -12,12 +12,8 @@ from frappe.utils import cint, flt, get_link_to_form
from erpnext.controllers.stock_controller import StockController from erpnext.controllers.stock_controller import StockController
from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import ( from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
<<<<<<< HEAD
=======
combine_datetime,
get_auto_batch_nos, get_auto_batch_nos,
get_available_serial_nos, get_available_serial_nos,
>>>>>>> 23f9d4c600 (fix: auto batch not set for raw materials in subcontracting receipt)
get_voucher_wise_serial_batch_from_bundle, get_voucher_wise_serial_batch_from_bundle,
) )
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos