From 286ec630123043b550f034ae6906995e86a7ee32 Mon Sep 17 00:00:00 2001
From: Jose Leite <122051639+joseleite550@users.noreply.github.com>
Date: Tue, 31 Oct 2023 09:00:59 -0300
Subject: [PATCH] IDEMPIERE-5900 [AutoProcuce] - Execute only when it is not a
 return (#2080)

---
 .../base/event/delegate/AutoProduceEventDelegate.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/org.adempiere.base/src/org/adempiere/base/event/delegate/AutoProduceEventDelegate.java b/org.adempiere.base/src/org/adempiere/base/event/delegate/AutoProduceEventDelegate.java
index e0a190e47a..181f019919 100644
--- a/org.adempiere.base/src/org/adempiere/base/event/delegate/AutoProduceEventDelegate.java
+++ b/org.adempiere.base/src/org/adempiere/base/event/delegate/AutoProduceEventDelegate.java
@@ -67,7 +67,11 @@ public class AutoProduceEventDelegate extends ModelEventDelegate<MInOut> {
 	@BeforeComplete
 	public void onBeforeComplete() {
 	   MInOut mInOut = getModel();
-	   if (mInOut.isSOTrx()) {
+
+	   boolean isGenerateProduction = (!MInOut.MOVEMENTTYPE_CustomerReturns.equals(mInOut.getMovementType()) 
+			   && !MInOut.MOVEMENTTYPE_VendorReturns.equals(mInOut.getMovementType()));
+
+	   if (mInOut.isSOTrx()  && isGenerateProduction) {
 		   String msg = processShipment(mInOut);
 		   if (msg != null)
 			   throw new RuntimeException (msg);