RobbyV2/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2025-12-03 18:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: negative batch in subcontracting receipt

Browse Source
This commit is contained in:
Rohit Waghchaure
2025-11-28 16:15:55 +05:30
parent 8ed9ee9213
commit 71e46b3ef5
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/controllers/subcontracting_controller.py
View File

@@ -11,6 +11,7 @@ from frappe.model.mapper import get_mapped_doc
from frappe.utils import cint, flt, get_link_to_form 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.batch.batch import get_batch_qty
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 (
combine_datetime, combine_datetime,
get_auto_batch_nos, get_auto_batch_nos,
@@ -758,7 +759,11 @@ class SubcontractingController(StockController):
serial_nos = get_filtered_serial_nos(serial_nos, self, "supplied_items") serial_nos = get_filtered_serial_nos(serial_nos, self, "supplied_items")
row.serial_no = "\n".join(serial_nos) row.serial_no = "\n".join(serial_nos)
elif item_details.has_batch_no and not row.serial_and_batch_bundle and not row.batch_no: elif (
item_details.has_batch_no
and not row.serial_and_batch_bundle
and (not row.batch_no or self.batch_has_not_available(row.batch_no, row.consumed_qty))
):
batches = get_auto_batch_nos(kwargs) batches = get_auto_batch_nos(kwargs)
if batches: if batches:
consumed_qty = row.consumed_qty consumed_qty = row.consumed_qty
@@ -783,6 +788,11 @@ class SubcontractingController(StockController):
) )
consumed_qty -= d.get("qty") consumed_qty -= d.get("qty")
def batch_has_not_available(self, batch_no, qty_required):
batch_qty = get_batch_qty(batch_no, self.supplier_warehouse, consider_negative_batches=True)
return batch_qty < qty_required
def update_rate_for_supplied_items(self): def update_rate_for_supplied_items(self):
if self.doctype != "Subcontracting Receipt": if self.doctype != "Subcontracting Receipt":
return return