diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java
index f5958eef39..4f1422a260 100644
--- a/org.adempiere.base/src/org/compiere/model/MPayment.java
+++ b/org.adempiere.base/src/org/compiere/model/MPayment.java
@@ -726,10 +726,20 @@ public class MPayment extends X_C_Payment
 		if (newRecord 
 			|| is_ValueChanged("C_Charge_ID") || is_ValueChanged("C_Invoice_ID")
 			|| is_ValueChanged("C_Order_ID") || is_ValueChanged("C_Project_ID"))
-			setIsPrepayment (getC_Charge_ID() == 0 
-				&& getC_BPartner_ID() != 0
-				&& (getC_Order_ID() != 0 
-					|| (getC_Project_ID() != 0 && getC_Invoice_ID() == 0)));
+		{
+			if (getReversal_ID() > 0)
+			{
+				setIsPrepayment(getReversal().isPrepayment());
+			}
+			else
+			{
+				setIsPrepayment (getC_Charge_ID() == 0 
+					&& getC_BPartner_ID() != 0
+					&& (getC_Order_ID() != 0 
+						|| (getC_Project_ID() != 0 && getC_Invoice_ID() == 0)));
+			}
+		}
+		
 		if (isPrepayment())
 		{
 			if (newRecord