diff --git a/org.adempiere.base/src/org/compiere/model/MInvoice.java b/org.adempiere.base/src/org/compiere/model/MInvoice.java
index 0ead4329e0..b516634e38 100644
--- a/org.adempiere.base/src/org/compiere/model/MInvoice.java
+++ b/org.adempiere.base/src/org/compiere/model/MInvoice.java
@@ -1422,16 +1422,23 @@ public class MInvoice extends X_C_Invoice implements DocAction
 		}
 
 		//	Credit Status
-		if (isSOTrx() && !isReversal())
+		if (isSOTrx())
 		{
-			MBPartner bp = new MBPartner (getCtx(), getC_BPartner_ID(), null);
-			if (MBPartner.SOCREDITSTATUS_CreditStop.equals(bp.getSOCreditStatus()))
-			{
-				m_processMsg = "@BPartnerCreditStop@ - @TotalOpenBalance@="
-					+ bp.getTotalOpenBalance()
-					+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
-				return DocAction.STATUS_Invalid;
-			}
+			MDocType doc = (MDocType) getC_DocTypeTarget();
+			// IDEMPIERE-365 - just check credit if is going to increase the debt
+			if ( (doc.getDocBaseType().equals(MDocType.DOCBASETYPE_ARCreditMemo) && getGrandTotal().signum() < 0 ) ||
+				(doc.getDocBaseType().equals(MDocType.DOCBASETYPE_ARInvoice) && getGrandTotal().signum() > 0 )
+			   )
+			{	
+				MBPartner bp = new MBPartner (getCtx(), getC_BPartner_ID(), null);
+				if ( MBPartner.SOCREDITSTATUS_CreditStop.equals(bp.getSOCreditStatus()) )
+				{
+					m_processMsg = "@BPartnerCreditStop@ - @TotalOpenBalance@="
+							+ bp.getTotalOpenBalance()
+							+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
+					return DocAction.STATUS_Invalid;
+				}
+			}  
 		}
 
 		//	Landed Costs
diff --git a/org.adempiere.base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java
index 4e6f71c603..6273da2e54 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrder.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrder.java
@@ -1333,31 +1333,35 @@ public class MOrder extends X_C_Order implements DocAction
 			} else {
 				MBPartner bp = new MBPartner (getCtx(), getBill_BPartner_ID(), get_TrxName()); // bill bp is guaranteed on beforeSave
 
-				if (MBPartner.SOCREDITSTATUS_CreditStop.equals(bp.getSOCreditStatus()))
-				{
-					m_processMsg = "@BPartnerCreditStop@ - @TotalOpenBalance@=" 
-						+ bp.getTotalOpenBalance()
-						+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
-					return DocAction.STATUS_Invalid;
+				if (getGrandTotal().signum() > 0)  // IDEMPIERE-365 - just check credit if is going to increase the debt
+				{		 
+
+					if (MBPartner.SOCREDITSTATUS_CreditStop.equals(bp.getSOCreditStatus()))
+					{
+						m_processMsg = "@BPartnerCreditStop@ - @TotalOpenBalance@=" 
+								+ bp.getTotalOpenBalance()
+								+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
+						return DocAction.STATUS_Invalid;
+					}
+					if (MBPartner.SOCREDITSTATUS_CreditHold.equals(bp.getSOCreditStatus()))
+					{
+						m_processMsg = "@BPartnerCreditHold@ - @TotalOpenBalance@=" 
+								+ bp.getTotalOpenBalance() 
+								+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
+						return DocAction.STATUS_Invalid;
+					}
+					BigDecimal grandTotal = MConversionRate.convertBase(getCtx(), 
+							getGrandTotal(), getC_Currency_ID(), getDateOrdered(), 
+							getC_ConversionType_ID(), getAD_Client_ID(), getAD_Org_ID());
+					if (MBPartner.SOCREDITSTATUS_CreditHold.equals(bp.getSOCreditStatus(grandTotal)))
+					{
+						m_processMsg = "@BPartnerOverOCreditHold@ - @TotalOpenBalance@=" 
+								+ bp.getTotalOpenBalance() + ", @GrandTotal@=" + grandTotal
+								+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
+						return DocAction.STATUS_Invalid;
+					}
 				}
-				if (MBPartner.SOCREDITSTATUS_CreditHold.equals(bp.getSOCreditStatus()))
-				{
-					m_processMsg = "@BPartnerCreditHold@ - @TotalOpenBalance@=" 
-						+ bp.getTotalOpenBalance() 
-						+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
-					return DocAction.STATUS_Invalid;
-				}
-				BigDecimal grandTotal = MConversionRate.convertBase(getCtx(), 
-						getGrandTotal(), getC_Currency_ID(), getDateOrdered(), 
-						getC_ConversionType_ID(), getAD_Client_ID(), getAD_Org_ID());
-				if (MBPartner.SOCREDITSTATUS_CreditHold.equals(bp.getSOCreditStatus(grandTotal)))
-				{
-					m_processMsg = "@BPartnerOverOCreditHold@ - @TotalOpenBalance@=" 
-						+ bp.getTotalOpenBalance() + ", @GrandTotal@=" + grandTotal
-						+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
-					return DocAction.STATUS_Invalid;
-				}
-			}
+			}  
 		}
 		
 		m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_PREPARE);