diff --git a/serverRoot/src/main/server/org/compiere/acct/Doc_InOut.java b/serverRoot/src/main/server/org/compiere/acct/Doc_InOut.java
index b30a2870dc..20698ccba9 100644
--- a/serverRoot/src/main/server/org/compiere/acct/Doc_InOut.java
+++ b/serverRoot/src/main/server/org/compiere/acct/Doc_InOut.java
@@ -21,6 +21,7 @@ import java.sql.*;
 import java.util.*;
 
 import org.compiere.model.*;
+
 import java.util.logging.*;
 import org.compiere.util.*;
 
@@ -62,7 +63,7 @@ public class Doc_InOut extends Doc
 	}   //  loadDocumentDetails
 
 	/**
-	 *	Load Invoice Line
+	 *	Load InOut Line
 	 *	@param inout shipment/receipt
 	 *  @return DocLine Array
 	 */
@@ -199,8 +200,25 @@ public class Doc_InOut extends Doc
 			for (int i = 0; i < p_lines.length; i++)
 			{
 				DocLine line = p_lines[i];
-				BigDecimal costs = line.getProductCosts(as, line.getAD_Org_ID(), false);	//	non-zero costs
+				BigDecimal costs = null;
 				MProduct product = line.getProduct();
+				//get costing method for product
+				String costingMethod = as.getCostingMethod();
+				MProductCategoryAcct pca = MProductCategoryAcct.get(getCtx(), 
+					product.getM_Product_Category_ID(), as.getC_AcctSchema_ID(), getTrxName());
+				if (pca.getCostingMethod() != null)
+					costingMethod = pca.getCostingMethod();
+				if (MAcctSchema.COSTINGMETHOD_AveragePO.equals(costingMethod) ||
+					MAcctSchema.COSTINGMETHOD_LastPOPrice.equals(costingMethod) )
+				{
+					int C_OrderLine_ID = line.getC_OrderLine_ID();
+					MOrderLine orderLine = new MOrderLine (getCtx(), C_OrderLine_ID, getTrxName());
+					costs = orderLine.getPriceCost();
+				}
+				else
+				{
+					costs = line.getProductCosts(as, line.getAD_Org_ID(), false);	//	current costs
+				}
 				if (costs == null || costs.signum() == 0)
 				{
 					p_Error = "Resubmit - No Costs for " + product.getName();
diff --git a/serverRoot/src/main/server/org/compiere/acct/Doc_MatchPO.java b/serverRoot/src/main/server/org/compiere/acct/Doc_MatchPO.java
index cb2ca28575..eef7c8cb26 100644
--- a/serverRoot/src/main/server/org/compiere/acct/Doc_MatchPO.java
+++ b/serverRoot/src/main/server/org/compiere/acct/Doc_MatchPO.java
@@ -147,69 +147,77 @@ public class Doc_MatchPO extends Doc
 			poCost, getQty(),			//	Delivered
 			m_oLine.getDescription(), getTrxName());
 
-		//	Current Costs
+		//	Calculate PPV for standard costing
 		String costingMethod = as.getCostingMethod();
 		MProduct product = MProduct.get(getCtx(), getM_Product_ID());
 		MProductCategoryAcct pca = MProductCategoryAcct.get(getCtx(), 
 			product.getM_Product_Category_ID(), as.getC_AcctSchema_ID(), getTrxName());
 		if (pca.getCostingMethod() != null)
 			costingMethod = pca.getCostingMethod();
+		
+		//get standard cost and also makesure cost for other costing method is updated
 		BigDecimal costs = m_pc.getProductCosts(as, getAD_Org_ID(), 
-			costingMethod, m_C_OrderLine_ID, false);	//	non-zero costs
+			MAcctSchema.COSTINGMETHOD_StandardCosting, m_C_OrderLine_ID, false);	//	non-zero costs
 
-		//	No Costs yet - no PPV
-		if (costs == null || costs.signum() == 0)
+		if (MAcctSchema.COSTINGMETHOD_StandardCosting.equals(costingMethod))
 		{
-			p_Error = "Resubmit - No Costs for " + product.getName();
-			log.log(Level.SEVERE, p_Error);
-			return null;
-		}
-
-		//	Difference
-		BigDecimal difference = poCost.subtract(costs);
-		//	Nothing to post
-		if (difference.signum() == 0)
-		{
-			log.log(Level.FINE, "No Cost Difference for M_Product_ID=" + getM_Product_ID());
+			//	No Costs yet - no PPV
+			if (costs == null || costs.signum() == 0)
+			{
+				p_Error = "Resubmit - No Costs for " + product.getName();
+				log.log(Level.SEVERE, p_Error);
+				return null;
+			}
+	
+			//	Difference
+			BigDecimal difference = poCost.subtract(costs);
+			//	Nothing to post
+			if (difference.signum() == 0)
+			{
+				log.log(Level.FINE, "No Cost Difference for M_Product_ID=" + getM_Product_ID());
+				return facts;
+			}
+	
+			//  Product PPV
+			FactLine cr = fact.createLine(null,
+				m_pc.getAccount(ProductCost.ACCTTYPE_P_PPV, as),
+				as.getC_Currency_ID(), difference);
+			if (cr != null)
+			{
+				cr.setQty(getQty());
+				cr.setC_BPartner_ID(m_oLine.getC_BPartner_ID());
+				cr.setC_Activity_ID(m_oLine.getC_Activity_ID());
+				cr.setC_Campaign_ID(m_oLine.getC_Campaign_ID());
+				cr.setC_Project_ID(m_oLine.getC_Project_ID());
+				cr.setC_UOM_ID(m_oLine.getC_UOM_ID());
+				cr.setUser1_ID(m_oLine.getUser1_ID());
+				cr.setUser2_ID(m_oLine.getUser2_ID());
+			}
+	
+			//  PPV Offset
+			FactLine dr = fact.createLine(null,
+				getAccount(Doc.ACCTTYPE_PPVOffset, as),
+				as.getC_Currency_ID(), difference.negate());
+			if (dr != null)
+			{
+				dr.setQty(getQty().negate());
+				dr.setC_BPartner_ID(m_oLine.getC_BPartner_ID());
+				dr.setC_Activity_ID(m_oLine.getC_Activity_ID());
+				dr.setC_Campaign_ID(m_oLine.getC_Campaign_ID());
+				dr.setC_Project_ID(m_oLine.getC_Project_ID());
+				dr.setC_UOM_ID(m_oLine.getC_UOM_ID());
+				dr.setUser1_ID(m_oLine.getUser1_ID());
+				dr.setUser2_ID(m_oLine.getUser2_ID());
+			}
+			
+			//
 			facts.add(fact);
 			return facts;
 		}
-
-		//  Product PPV
-		FactLine cr = fact.createLine(null,
-			m_pc.getAccount(ProductCost.ACCTTYPE_P_PPV, as),
-			as.getC_Currency_ID(), difference);
-		if (cr != null)
+		else
 		{
-			cr.setQty(getQty());
-			cr.setC_BPartner_ID(m_oLine.getC_BPartner_ID());
-			cr.setC_Activity_ID(m_oLine.getC_Activity_ID());
-			cr.setC_Campaign_ID(m_oLine.getC_Campaign_ID());
-			cr.setC_Project_ID(m_oLine.getC_Project_ID());
-			cr.setC_UOM_ID(m_oLine.getC_UOM_ID());
-			cr.setUser1_ID(m_oLine.getUser1_ID());
-			cr.setUser2_ID(m_oLine.getUser2_ID());
+			return facts;
 		}
-
-		//  PPV Offset
-		FactLine dr = fact.createLine(null,
-			getAccount(Doc.ACCTTYPE_PPVOffset, as),
-			as.getC_Currency_ID(), difference.negate());
-		if (dr != null)
-		{
-			dr.setQty(getQty().negate());
-			dr.setC_BPartner_ID(m_oLine.getC_BPartner_ID());
-			dr.setC_Activity_ID(m_oLine.getC_Activity_ID());
-			dr.setC_Campaign_ID(m_oLine.getC_Campaign_ID());
-			dr.setC_Project_ID(m_oLine.getC_Project_ID());
-			dr.setC_UOM_ID(m_oLine.getC_UOM_ID());
-			dr.setUser1_ID(m_oLine.getUser1_ID());
-			dr.setUser2_ID(m_oLine.getUser2_ID());
-		}
-
-		//
-		facts.add(fact);
-		return facts;
 	}   //  createFact
 
 	/**