From 838904b96128b83a0d5fce434735e06ed6acff3c Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Mon, 19 Mar 2012 01:02:49 +0800 Subject: [PATCH] Revert changeset 6f7e1d47b072 for IDEMPIERE-187 Support developer to generate migration script from webui --- .../src/org/compiere/dbPort/Convert.java | 8 +------- .../src/org/compiere/model/MSequence.java | 11 +---------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/dbPort/Convert.java b/org.adempiere.base/src/org/compiere/dbPort/Convert.java index de45eb29b6..66c002bfce 100644 --- a/org.adempiere.base/src/org/compiere/dbPort/Convert.java +++ b/org.adempiere.base/src/org/compiere/dbPort/Convert.java @@ -435,13 +435,7 @@ public abstract class Convert public static void logMigrationScript(String oraStatement, String pgStatement) { // Check AdempiereSys // check property Log migration script - boolean logMigrationScript = false; - if (Ini.isClient()) { - logMigrationScript = Ini.isPropertyBool(Ini.P_LOGMIGRATIONSCRIPT); - } else { - String sysProperty = System.getProperty(Ini.P_LOGMIGRATIONSCRIPT); - logMigrationScript = "y".equalsIgnoreCase(sysProperty) || "true".equalsIgnoreCase(sysProperty); - } + boolean logMigrationScript = Ini.isPropertyBool(Ini.P_LOGMIGRATIONSCRIPT); if (logMigrationScript) { if (dontLog(oraStatement)) return; diff --git a/org.adempiere.base/src/org/compiere/model/MSequence.java b/org.adempiere.base/src/org/compiere/model/MSequence.java index 569642a9af..5f4b2bb1ea 100644 --- a/org.adempiere.base/src/org/compiere/model/MSequence.java +++ b/org.adempiere.base/src/org/compiere/model/MSequence.java @@ -88,16 +88,7 @@ public class MSequence extends X_AD_Sequence int retValue = -1; // Check AdempiereSys - boolean adempiereSys = false; - if (Ini.isClient()) - { - adempiereSys = Ini.isPropertyBool(Ini.P_ADEMPIERESYS); - } - else - { - String sysProperty = System.getProperty(Ini.P_ADEMPIERESYS); - adempiereSys = "y".equalsIgnoreCase(sysProperty) || "true".equalsIgnoreCase(sysProperty); - } + boolean adempiereSys = Ini.isPropertyBool(Ini.P_ADEMPIERESYS); if (adempiereSys && AD_Client_ID > 11) adempiereSys = false; //