diff --git a/migration/i2.1z/oracle/201510251210_IDEMPIERE-2296.sql b/migration/i2.1z/oracle/201510251210_IDEMPIERE-2296.sql new file mode 100644 index 0000000000..594ccd6644 --- /dev/null +++ b/migration/i2.1z/oracle/201510251210_IDEMPIERE-2296.sql @@ -0,0 +1,11 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-2296 Value Preference should have precedence over Default Value of field +-- Oct 25, 2015 12:10:37 PM COT +UPDATE AD_SysConfig SET Value='623',Updated=TO_DATE('2015-10-25 12:10:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=200065 +; + +SELECT register_migration_script('201510251210_IDEMPIERE-2296.sql') FROM dual +; + diff --git a/migration/i2.1z/postgresql/201510251210_IDEMPIERE-2296.sql b/migration/i2.1z/postgresql/201510251210_IDEMPIERE-2296.sql new file mode 100644 index 0000000000..83df9f410c --- /dev/null +++ b/migration/i2.1z/postgresql/201510251210_IDEMPIERE-2296.sql @@ -0,0 +1,8 @@ +-- IDEMPIERE-2296 Value Preference should have precedence over Default Value of field +-- Oct 25, 2015 12:10:37 PM COT +UPDATE AD_SysConfig SET Value='623',Updated=TO_TIMESTAMP('2015-10-25 12:10:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=200065 +; + +SELECT register_migration_script('201510251210_IDEMPIERE-2296.sql') FROM dual +; + diff --git a/org.adempiere.base/src/org/compiere/model/GridField.java b/org.adempiere.base/src/org/compiere/model/GridField.java index a24a35326e..f6db152d05 100644 --- a/org.adempiere.base/src/org/compiere/model/GridField.java +++ b/org.adempiere.base/src/org/compiere/model/GridField.java @@ -579,7 +579,7 @@ public class GridField */ public Object getDefaultForPanel (){ //default is preference for field > special case > default logic > sql default > data-type default - String defaultSeq = "63"; + String defaultSeq = "623"; return getDefault (MSysConfig.getValue(MSysConfig.ZK_SEQ_DEFAULT_VALUE_PANEL, defaultSeq, Env.getAD_Client_ID(m_vo.ctx))); } diff --git a/org.adempiere.base/src/org/idempiere/util/ParseSeq.java b/org.adempiere.base/src/org/idempiere/util/ParseSeq.java index bf9c1122f7..5620b0fd4c 100644 --- a/org.adempiere.base/src/org/idempiere/util/ParseSeq.java +++ b/org.adempiere.base/src/org/idempiere/util/ParseSeq.java @@ -212,4 +212,9 @@ public class ParseSeq implements Iterable { } + @Override + public String toString() { + return "OrderConfiguration=" + orderConfiguration; + } + }