diff --git a/org.adempiere.base/src/org/compiere/model/MMovement.java b/org.adempiere.base/src/org/compiere/model/MMovement.java
index 31bc0ef42f..a85bc9f60a 100644
--- a/org.adempiere.base/src/org/compiere/model/MMovement.java
+++ b/org.adempiere.base/src/org/compiere/model/MMovement.java
@@ -474,26 +474,71 @@ public class MMovement extends X_M_Movement implements DocAction
 				//	Fallback - We have ASI
 				if (trxFrom == null)
 				{
+					Timestamp dateMPolicy= null;
+					
+					MStorageOnHand[] storages = null;
+					if (line.getMovementQty().compareTo(Env.ZERO) > 0) {
+						// Find Date Material Policy bases on ASI
+						storages = MStorageOnHand.getWarehouse(getCtx(), 0,
+								line.getM_Product_ID(), line
+										.getM_AttributeSetInstance_ID(), null,
+								MClient.MMPOLICY_FiFo.equals(product
+										.getMMPolicy()), false, line
+										.getM_Locator_ID(), get_TrxName());
+					}
+					else{
+						//Case of reversal
+						storages = MStorageOnHand
+								.getWarehouse(getCtx(), 0, line.getM_Product_ID(),
+										line.getM_AttributeSetInstanceTo_ID(), null,
+										MClient.MMPOLICY_FiFo.equals(product
+												.getMMPolicy()), false, line
+												.getM_LocatorTo_ID(), get_TrxName());
+					}
+					for (MStorageOnHand storage : storages) {
+						if (storage.getQtyOnHand().compareTo(
+								line.getMovementQty()) >= 0) {
+							dateMPolicy = storage.getDateMaterialPolicy();
+							break;
+						}
+					}
+
+					if (dateMPolicy == null && storages.length > 0)
+						dateMPolicy = storages[0].getDateMaterialPolicy();
+					
+					if(dateMPolicy==null && line.getM_AttributeSetInstanceTo_ID()!=0){
+						I_M_AttributeSetInstance asi = line.getM_AttributeSetInstance();
+						dateMPolicy = asi.getCreated();
+					}
+					else if(dateMPolicy==null )
+						dateMPolicy = getMovementDate();
+					
 					MLocator locator = new MLocator (getCtx(), line.getM_Locator_ID(), get_TrxName());
 					//Update Storage 
 					if (!MStorageOnHand.add(getCtx(),locator.getM_Warehouse_ID(),
 							line.getM_Locator_ID(),
 							line.getM_Product_ID(), 
 							line.getM_AttributeSetInstance_ID(),
-							line.getMovementQty().negate(), null, get_TrxName()))
+							line.getMovementQty().negate(),dateMPolicy, get_TrxName()))
 					{
 						String lastError = CLogger.retrieveErrorString("");
 						m_processMsg = "Cannot correct Inventory OnHand (MA) - " + lastError;
 						return DocAction.STATUS_Invalid;
 					}
 
+					//TO may have Different material policy
+					I_M_AttributeSetInstance asiTo = line.getM_AttributeSetInstanceTo();
+					Timestamp dateMPolicyTo= null;
+					
+					
+					
 					//Update Storage 
 					MLocator locatorTo = new MLocator (getCtx(), line.getM_LocatorTo_ID(), get_TrxName());
 					if (!MStorageOnHand.add(getCtx(),locatorTo.getM_Warehouse_ID(),
 							line.getM_LocatorTo_ID(),
 							line.getM_Product_ID(), 
 							line.getM_AttributeSetInstanceTo_ID(),
-							line.getMovementQty(), null, get_TrxName()))
+							line.getMovementQty(),dateMPolicy, get_TrxName()))
 					{
 						String lastError = CLogger.retrieveErrorString("");
 						m_processMsg = "Cannot correct Inventory OnHand (MA) - " + lastError;