Merge 0aec556dd146

migration/i1.0b-release/oracle/201305101047_IDEMPIERE-919.sql

@@ -0,0 +1,12 @@
+-- May 10, 2013 10:43:39 AM COT
+-- IDEMPIERE-919 Values for "Partner Location & User / Contact", no changes when value changed business partner
+UPDATE AD_Column SET AD_Reference_Value_ID=NULL, AD_Reference_ID=19, AD_Val_Rule_ID=123, DefaultValue='-1',Updated=TO_DATE('2013-05-10 10:43:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=53973
+;
+
+-- May 10, 2013 10:44:19 AM COT
+-- IDEMPIERE-919 Values for "Partner Location & User / Contact", no changes when value changed business partner
+UPDATE AD_Column SET AD_Reference_ID=19, AD_Val_Rule_ID=167,Updated=TO_DATE('2013-05-10 10:44:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=53975
+;
+
+SELECT register_migration_script('201305101047_IDEMPIERE-919.sql') FROM dual;
+

migration/i1.0b-release/postgresql/201305101047_IDEMPIERE-919.sql

@@ -0,0 +1,12 @@
+-- May 10, 2013 10:43:39 AM COT
+-- IDEMPIERE-919 Values for "Partner Location & User / Contact", no changes when value changed business partner
+UPDATE AD_Column SET AD_Reference_Value_ID=NULL, AD_Reference_ID=19, AD_Val_Rule_ID=123, DefaultValue='-1',Updated=TO_TIMESTAMP('2013-05-10 10:43:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=53973
+;
+
+-- May 10, 2013 10:44:19 AM COT
+-- IDEMPIERE-919 Values for "Partner Location & User / Contact", no changes when value changed business partner
+UPDATE AD_Column SET AD_Reference_ID=19, AD_Val_Rule_ID=167,Updated=TO_TIMESTAMP('2013-05-10 10:44:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=53975
+;
+
+SELECT register_migration_script('201305101047_IDEMPIERE-919.sql') FROM dual;
+

org.adempiere.base/src/org/adempiere/base/DefaultLookupFactory.java

@@ -34,6 +34,8 @@ public class DefaultLookupFactory implements ILookupFactory{
 	@Override
 	public Lookup getLookup(GridFieldVO gridFieldVO) {
 		Lookup lookup = null;
+		if (gridFieldVO.lookupInfo == null && DisplayType.isLookup(gridFieldVO.displayType)) // IDEMPIERE-913
+			gridFieldVO.loadLookupInfo();
 		if (gridFieldVO.displayType == Location)   //  not cached
 		{
 			lookup = new MLocationLookup (gridFieldVO.ctx, gridFieldVO.WindowNo);

org.adempiere.base/src/org/compiere/model/GridField.java

@@ -208,7 +208,7 @@ public class GridField
 	 * bypass isdisplay validation, used by findwindow
 	 */
 	public void loadLookupNoValidate() {
-		if (m_vo.lookupInfo == null) {
+		if (m_vo.lookupInfo == null && isLookup()) {
 			m_vo.loadLookupInfo();
 		}
 		if (m_vo.lookupInfo == null) {
@@ -234,6 +234,7 @@ public class GridField
 	 */
 	public Lookup getLookup()
 	{ 
+		if (m_lookup == null) loadLookupNoValidate(); // IDEMPIERE-913
 		return m_lookup;
 	}    //  getLookup
 

org.adempiere.server/idempiere.html

@@ -190,6 +190,7 @@ Start iDempiere via RUN_Adempiere </td>
             <td bgcolor="#fbf8f1">
             <p><a href="idempiereMonitor">iDempiere Server Management</a>
 <!--a href="/jmx-console" target="_blank">JBoss 3.2.3 Management Server Agent</a -->
+            </br><a href="osgi/system/console">Felix Console</a>
             </p>
             </td>
 

org.adempiere.ui.swing/src/org/compiere/grid/ed/VString.java

@@ -369,7 +369,7 @@ public final class VString extends CTextField
 		String text = super.getText();
 		if (m_obscure != null && text != null && text.length() > 0)
 		{
-			if (text.equals(m_obscure.getObscuredValue()))
+			if (isReadWrite() && text.equals(m_obscure.getObscuredValue()))
 				text = m_obscure.getClearValue();
 		}
 		return text;

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Textbox.java

@@ -86,7 +86,7 @@ public class Textbox extends org.zkoss.zul.Textbox implements EventListener<Even
 		String value = super.getValue();
 		if (m_obscure != null && value != null && value.length() > 0)
 		{
-			if (value.equals(m_obscure.getObscuredValue()))
+			if (!isReadonly() && value.equals(m_obscure.getObscuredValue()))
 				value = m_obscure.getClearValue();
 		}
 		return value;

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java

@@ -139,9 +139,12 @@ public class WStringEditor extends WEditor implements ContextMenuListener
 	        if (getComponent() instanceof Textbox)
 	        	((Textbox)getComponent()).setObscureType(obscureType);
 
+
+	        if(!(this instanceof WPasswordEditor)){ // check password field
 	        	popupMenu = new WEditorPopupMenu(false, false, isShowPreference());
 	        	addTextEditorMenu(popupMenu);
 	        	addChangeLogMenu(popupMenu);
+	        }
 
 	        if (gridField.isAutocomplete()) {
 	        	Combobox combo = (Combobox)getComponent();

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java

@@ -822,7 +822,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 			winExportFile = new Window();
 			winExportFile.setTitle(Msg.getMsg(Env.getCtx(), "Export") + ": " + getTitle());
 			winExportFile.setWidth("450px");
-			winExportFile.setHeight("300px");
+			winExportFile.setHeight("150px");
 			winExportFile.setClosable(true);
 			winExportFile.setBorder("normal");
 			winExportFile.setStyle("position:absolute");
@@ -857,7 +857,6 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 			vb.appendChild(hb);
 			vb.appendChild(confirmPanel);
 			confirmPanel.addActionListener(this);
-			confirmPanel.setVflex("0");
 		}
 		
 		winExportFile.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED);