From 93fcc43ee5684fdc1f7e8a7393624e0d85ffb4e4 Mon Sep 17 00:00:00 2001
From: Silvano Trinchero <strinchero@freepath.it>
Date: Tue, 11 Sep 2018 12:37:50 +0200
Subject: [PATCH] IDEMPIERE-3785 Fix potential duplicate key / documento and
 lock on Oracle

---
 .../src/org/compiere/model/MSequence.java     | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/model/MSequence.java b/org.adempiere.base/src/org/compiere/model/MSequence.java
index a63e23aef3..ef52c5dcad 100644
--- a/org.adempiere.base/src/org/compiere/model/MSequence.java
+++ b/org.adempiere.base/src/org/compiere/model/MSequence.java
@@ -123,7 +123,11 @@ public class MSequence extends X_AD_Sequence
 			+ "FROM AD_Sequence "
 			+ "WHERE Name=?"
 			+ " AND IsActive='Y' AND IsTableID='Y' AND IsAutoSequence='Y' ";
-
+			
+			if(adempiereSys)
+				selectSQL += " FOR UPDATE OF CurrentNextSys";
+			else
+				selectSQL += " FOR UPDATE OF CurrentNext";
 		}
 		if (!DB.isOracle() && !DB.isPostgreSQL())
 			selectSQL = DB.getDatabase().convertStatement(selectSQL);
@@ -365,14 +369,27 @@ public class MSequence extends X_AD_Sequence
 					+ "AND s.IsActive='Y' AND s.IsTableID='N' AND s.IsAutoSequence='Y' "
 					+ "ORDER BY s.AD_Client_ID DESC";
 		}
-		if (DB.isPostgreSQL())
+		if (DB.isOracle() == false)
 		{
-			if ( ( isStartNewYear || isUseOrgLevel ) && !adempiereSys ) {
+			if ( isStartNewYear || isUseOrgLevel  ) {
 				selectSQL = selectSQL + " FOR UPDATE OF y";
 			} else {
 				selectSQL = selectSQL + " FOR UPDATE OF s";
 			}
 		}
+		else
+		{
+			if (isStartNewYear || isUseOrgLevel) {
+				selectSQL = selectSQL + " FOR UPDATE OF y.";
+			} else {
+				selectSQL = selectSQL + " FOR UPDATE OF s.";
+			}
+			
+			if(adempiereSys)
+				selectSQL = selectSQL + "CurrentNextSys";
+			else
+				selectSQL = selectSQL + "CurrentNext";
+		}		
 		if (!DB.isOracle() && !DB.isPostgreSQL())
 			selectSQL = DB.getDatabase().convertStatement(selectSQL);
 		Connection conn = null;