diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py index 5ca0bef74fc..45790ed89c4 100644 --- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py +++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py @@ -757,11 +757,16 @@ class SerialandBatchBundle(Document): precision = frappe.get_precision("Serial and Batch Entry", "incoming_rate") for d in self.entries: + fifo_batch_wise_val = True + if valuation_method == "FIFO" and d.batch_no in batches: + fifo_batch_wise_val = False + if self.is_rejected and not set_valuation_rate_for_rejected_materials: rate = 0.0 elif ( (flt(d.incoming_rate, precision) == flt(rate, precision)) and not stock_queue + and fifo_batch_wise_val and d.qty and d.stock_value_difference ):