diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_Payment.java b/org.adempiere.base/src/org/compiere/acct/Doc_Payment.java
index 837d8f1309..a8c42cc968 100644
--- a/org.adempiere.base/src/org/compiere/acct/Doc_Payment.java
+++ b/org.adempiere.base/src/org/compiere/acct/Doc_Payment.java
@@ -26,6 +26,7 @@ import org.compiere.model.MAcctSchema;
 import org.compiere.model.MBankAccount;
 import org.compiere.model.MCharge;
 import org.compiere.model.MPayment;
+import org.compiere.model.MSysConfig;
 import org.compiere.util.Env;
 
 /**
@@ -108,7 +109,7 @@ public class Doc_Payment extends Doc
 		//  create Fact Header
 		Fact fact = new Fact(this, as, Fact.POST_Actual);
 		//	Cash Transfer
-		if ("X".equals(m_TenderType))
+		if ("X".equals(m_TenderType) && !MSysConfig.getBooleanValue("CASH_AS_PAYMENT", true , getAD_Client_ID()))
 		{
 			ArrayList<Fact> facts = new ArrayList<Fact>();
 			facts.add(fact);