diff --git a/.classpath b/.classpath
index 747e77fc23..ad40155b15 100644
--- a/.classpath
+++ b/.classpath
@@ -26,14 +26,13 @@
 	<classpathentry exported="true" kind="lib" path="tools/lib/mail.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/standard.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/Verisign.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/ocrs12.jar"/>
 	<classpathentry exported="true" kind="lib" path="jboss/lib/commons-httpclient.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/ant-commons-net.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/ant-launcher.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/ant.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/jsp-api.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/servlet-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/ojdbc14.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/ojdbc6.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/jpayment.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/jnlp.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/commons-collections-3.1.jar"/>
diff --git a/COMMITTERS b/COMMITTERS
index 180daaf7b2..c4f2918c15 100644
--- a/COMMITTERS
+++ b/COMMITTERS
@@ -85,4 +85,5 @@ fercho_comus    Fernando Saavedra       LEC (Localization Ecuador)
 eloy_gomez      Eloy Gomez              adempiere-osgi: https://sourceforge.net/projects/adempiere/forums/forum/610546/topic/2143547/index/page/4
 jmpiloq         Jens Pfeiffer           LDE
 sureeraya       Sureeraya Limpaibul     Thailand Localization
-peanutblake     Peanut Blake            Translation project
\ No newline at end of file
+peanutblake     Peanut Blake            Translation project
+kittiu          KittiU                  Thailand Localization
\ No newline at end of file
diff --git a/JasperReports/.classpath b/JasperReports/.classpath
index 5cbad27dac..31566a3e61 100644
--- a/JasperReports/.classpath
+++ b/JasperReports/.classpath
@@ -7,8 +7,7 @@
 	<classpathentry kind="src" path="/tools"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JasperReportsTools"/>
 	<classpathentry kind="lib" path="/tools/lib/postgresql.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/ocrs12.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar"/>
 	<classpathentry kind="lib" path="/tools/lib/barbecue-1.5-beta1.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/serverApps"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
diff --git a/base/.classpath b/base/.classpath
index 763edba39e..885bc49ba8 100644
--- a/base/.classpath
+++ b/base/.classpath
@@ -39,12 +39,7 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/ocrs12.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar">
+	<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
diff --git a/base/src/org/compiere/model/MTest.java b/base/src/org/compiere/model/MTest.java
index 7144b2903a..df6af1c52a 100644
--- a/base/src/org/compiere/model/MTest.java
+++ b/base/src/org/compiere/model/MTest.java
@@ -129,7 +129,7 @@ public class MTest extends X_Test
 	 */
 	protected boolean afterSave (boolean newRecord, boolean success)
 	{
-		log.info("New=" + newRecord + ", Seccess=" + success + " ***");
+		log.info("New=" + newRecord + ", Success=" + success + " ***");
 		return success;
 	}	//	afterSave
 
diff --git a/base/src/org/compiere/wf/MWFActivity.java b/base/src/org/compiere/wf/MWFActivity.java
index dcbebf51bd..bca77cd490 100644
--- a/base/src/org/compiere/wf/MWFActivity.java
+++ b/base/src/org/compiere/wf/MWFActivity.java
@@ -1059,7 +1059,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
 				if (isInvoker())
 				{
 					//	Set Approver
-					int startAD_User_ID = getAD_User_ID();
+					int startAD_User_ID = Env.getAD_User_ID(getCtx());
 					if (startAD_User_ID == 0)
 						startAD_User_ID = doc.getDoc_User_ID();
 					int nextAD_User_ID = getApprovalUser(startAD_User_ID, 
@@ -1078,7 +1078,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
 					// [ 1742751 ] Workflow: User Choice is not working
 					if (resp.isHuman())
 					{
-						autoApproval = resp.getAD_User_ID() == m_process.getAD_User_ID();
+						autoApproval = resp.getAD_User_ID() == Env.getAD_User_ID(getCtx());
 						if (!autoApproval && resp.getAD_User_ID() != 0)
 							setAD_User_ID(resp.getAD_User_ID());
 					}
@@ -1087,7 +1087,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
 						MUserRoles[] urs = MUserRoles.getOfRole(getCtx(), resp.getAD_Role_ID());
 						for (int i = 0; i < urs.length; i++)
 						{
-							if(urs[i].getAD_User_ID() == m_process.getAD_User_ID())
+							if(urs[i].getAD_User_ID() == Env.getAD_User_ID(getCtx()))
 							{
 								autoApproval = true;
 								break;
@@ -1241,7 +1241,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
 				{
 					if (isInvoker())
 					{
-						int startAD_User_ID = getAD_User_ID();
+						int startAD_User_ID = Env.getAD_User_ID(getCtx());
 						if (startAD_User_ID == 0)
 							startAD_User_ID = doc.getDoc_User_ID();
 						int nextAD_User_ID = getApprovalUser(startAD_User_ID, 
diff --git a/install/.classpath b/install/.classpath
index 3590689cb1..1d8f58df82 100644
--- a/install/.classpath
+++ b/install/.classpath
@@ -12,7 +12,6 @@
 	<classpathentry kind="lib" path="/tools/lib/ant-commons-net.jar"/>
 	<classpathentry kind="lib" path="/tools/lib/ant-launcher.jar"/>
 	<classpathentry kind="lib" path="/tools/lib/commons-net-1.4.0.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/ocrs12.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/posterita/.classpath b/posterita/.classpath
index 8212e0e983..0d05af4807 100644
--- a/posterita/.classpath
+++ b/posterita/.classpath
@@ -20,8 +20,7 @@
 	<classpathentry kind="lib" path="/tools/lib/jpedal.jar"/>
 	<classpathentry kind="src" path="/serverApps"/>
 	<classpathentry kind="lib" path="/jboss/client/jbossall-client.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/ocrs12.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar"/>
 	<classpathentry kind="lib" path="/tools/lib/postgresql.jar"/>
 	<classpathentry kind="output" path="posterita/web/WEB-INF/classes"/>
 </classpath>
diff --git a/tools/build.xml b/tools/build.xml
index fe841a5d84..d767b0a913 100644
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -138,16 +138,13 @@
 
 		<!-- Create oracle.jar file 	-->
 		<jar jarfile="${dist.dir}/oracle.jar" duplicate="preserve">
-			<zipfileset src="lib/ojdbc14.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/ocrs12.jar">
+			<zipfileset src="lib/ojdbc6.jar">
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
 
 			<manifest>
 				<attribute name="Specification-Title" value="Oracle JDBC" />
-				<attribute name="Specification-Version" value="10g" />
+				<attribute name="Specification-Version" value="11g" />
 				<attribute name="Specification-Vendor" value="Oracle" />
 				<attribute name="Implementation-Title" value="oracle ${env.ADEMPIERE_VERSION}" />
 				<attribute name="Implementation-Version" value="${env.ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}" />