diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_Production.java b/org.adempiere.base/src/org/compiere/acct/Doc_Production.java
index 64fbcab5a0..334b7e9326 100644
--- a/org.adempiere.base/src/org/compiere/acct/Doc_Production.java
+++ b/org.adempiere.base/src/org/compiere/acct/Doc_Production.java
@@ -111,7 +111,10 @@ public class Doc_Production extends Doc
 				DocLine docLine = new DocLine (line, this);
 				docLine.setQty (line.getMovementQty(), false);
 				//	Identify finished BOM Product
-				docLine.setProductionBOM(line.getM_Product_ID() == prod.getM_Product_ID());
+				if (prod.isUseProductionPlan())
+					docLine.setProductionBOM(line.getM_Product_ID() == line.getM_ProductionPlan().getM_Product_ID());
+				else
+					docLine.setProductionBOM(line.getM_Product_ID() == prod.getM_Product_ID());
 				//
 				if (log.isLoggable(Level.FINE)) log.fine(docLine.toString());
 				list.add (docLine);