diff --git a/org.adempiere.base/src/org/compiere/util/DisplayType.java b/org.adempiere.base/src/org/compiere/util/DisplayType.java
index 517d8f0d72..e7c5fb5c96 100644
--- a/org.adempiere.base/src/org/compiere/util/DisplayType.java
+++ b/org.adempiere.base/src/org/compiere/util/DisplayType.java
@@ -655,6 +655,9 @@ public final class DisplayType
if (!DisplayType.isText(displayType))
s_log.severe("Unhandled Data Type = " + displayType);
+ if (columnName.endsWith("_ID"))
+ return "NUMBER(10)";
+
return "VARCHAR2(" + fieldLength + ")";
} // getSQLDataType
diff --git a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java
index 50bd809429..763e77c17b 100644
--- a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java
+++ b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java
@@ -163,7 +163,7 @@ public class ColumnElementHandler extends AbstractElementHandler {
throw new POSaveFailedException("Failed to save column " + mColumn.getName());
}
- if (recreateColumn || syncDatabase) {
+ if (mColumn.isActive() && (recreateColumn || syncDatabase)) {
deferFK(element, mColumn);
syncColumn(ctx, mColumn, action, recreateColumn);
}
diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
index 981a462bcb..489bdd6af2 100644
--- a/org.adempiere.server-feature/server.product
+++ b/org.adempiere.server-feature/server.product
@@ -41,7 +41,7 @@
-
+
@@ -60,6 +60,10 @@
+
+
+
+
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index ff70375960..e35a28c593 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -27,8 +27,8 @@
-
-
+
+
diff --git a/org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh b/org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh
index ea6bff708a..ed6a40b4ac 100644
--- a/org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh
+++ b/org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh
@@ -28,7 +28,7 @@ ADEMPIERE_DB_USER=$1
ADEMPIERE_DB_PASSWORD=$2
ADEMPIERE_DB_PATH=$3
CMD="sqlplus $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME"
-SILENTCMD="$CMD -S"
+SILENTCMD="sqlplus -S $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME"
ERROR_STRINGS="^(ORA-[0-9]+:|TNS-|PLS-)"
cd $IDEMPIERE_HOME/migration
diff --git a/org.idempiere.p2/server.product b/org.idempiere.p2/server.product
index 981a462bcb..33fd8328de 100644
--- a/org.idempiere.p2/server.product
+++ b/org.idempiere.p2/server.product
@@ -17,6 +17,7 @@
+
@@ -41,7 +42,7 @@
-
+
@@ -60,6 +61,10 @@
+
+
+
+