diff --git a/base/src/org/compiere/model/CalloutInOut.java b/base/src/org/compiere/model/CalloutInOut.java
index f975d3390b..0cd5c5da44 100644
--- a/base/src/org/compiere/model/CalloutInOut.java
+++ b/base/src/org/compiere/model/CalloutInOut.java
@@ -196,12 +196,17 @@ public class CalloutInOut extends CalloutEngine
 				else
 					mTab.setValue("AD_User_ID", ii);
 
-				//	CreditAvailable
-				double CreditAvailable = rs.getDouble("CreditAvailable");
-				if (!rs.wasNull() && CreditAvailable < 0)
-					mTab.fireDataStatusEEvent("CreditLimitOver",
-						DisplayType.getNumberFormat(DisplayType.Amount).format(CreditAvailable),
-						false);
+				//Bugs item #1679818: checking for SOTrx only
+				boolean IsSOTrx = Env.getContext(ctx, WindowNo, "IsSOTrx").equals("Y");
+				if (IsSOTrx)
+				{
+					//	CreditAvailable
+					double CreditAvailable = rs.getDouble("CreditAvailable");
+					if (!rs.wasNull() && CreditAvailable < 0)
+						mTab.fireDataStatusEEvent("CreditLimitOver",
+							DisplayType.getNumberFormat(DisplayType.Amount).format(CreditAvailable),
+							false);
+				}//
 			}
 			rs.close();
 			pstmt.close();