From 59ec9aa29a08eae2df57a3e05cfc57a49775ad83 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sat, 1 Aug 2015 23:17:35 +0800
Subject: [PATCH] IDEMPIERE-1969:Contextual Menu for Info Window Parameters fix
 issue preference don't work with field without default value

---
 org.adempiere.base/src/org/compiere/model/GridField.java  | 2 +-
 .../WEB-INF/src/org/adempiere/webui/info/InfoWindow.java  | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/model/GridField.java b/org.adempiere.base/src/org/compiere/model/GridField.java
index 467bb6dcc1..8edb7b39ba 100644
--- a/org.adempiere.base/src/org/compiere/model/GridField.java
+++ b/org.adempiere.base/src/org/compiere/model/GridField.java
@@ -575,7 +575,7 @@ public class GridField
 	 */
 	public Object getDefaultForPanel (){
 		//default is preference for field > special case > default logic > sql default > data-type default
-		String defaultSeq = "61327";
+		String defaultSeq = "63";
 		return getDefault (MSysConfig.getValue(MSysConfig.ZK_SEQ_DEFAULT_VALUE_PANEL, defaultSeq, Env.getAD_Client_ID(m_vo.ctx)));
 	}
 	
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
index 8699ba16db..dd335178ed 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
@@ -1289,11 +1289,9 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
         fieldEditor.addEventListener(Events.ON_OK, this);		
 
         mField.addPropertyChangeListener(editor);
-        
-        if (!Util.isEmpty(mField.getVO().DefaultValue, true)) {
-            // set default value
-        	mField.setValue(mField.getDefaultForPanel(), true);
-        }
+                
+        mField.setValue(mField.getDefaultForPanel(), true);
+
     }   // addSelectionColumn
 
 	protected void addSearchParameter(Label label, Component fieldEditor) {