From 8c58fc91e70141c7fc502ffa8d471a5c21db2cdd Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Tue, 30 Oct 2012 23:16:50 -0500
Subject: [PATCH] IDEMPIERE-379 Reporting wizard for end users / Fix problem
 with second panel on chrome - fix migration scripts registration

---
 migration/360lts-release/oracle/923_PlaceHolder.sql    |  3 +++
 migration/360lts-release/oracle/952_IDEMPIERE_379.sql  |  2 +-
 .../360lts-release/postgresql/923_PlaceHolder.sql      |  3 +++
 .../360lts-release/postgresql/952_IDEMPIERE_379.sql    |  2 +-
 .../org/adempiere/webui/panel/WRC2FieldOrderPanel.java | 10 ++++++----
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/migration/360lts-release/oracle/923_PlaceHolder.sql b/migration/360lts-release/oracle/923_PlaceHolder.sql
index 097ff34634..5bf39eb459 100644
--- a/migration/360lts-release/oracle/923_PlaceHolder.sql
+++ b/migration/360lts-release/oracle/923_PlaceHolder.sql
@@ -1 +1,4 @@
 -- Just a placeholder
+SELECT register_migration_script('923_PlaceHolder.sql') FROM dual
+;
+
diff --git a/migration/360lts-release/oracle/952_IDEMPIERE_379.sql b/migration/360lts-release/oracle/952_IDEMPIERE_379.sql
index be9728b741..9ac93a957c 100644
--- a/migration/360lts-release/oracle/952_IDEMPIERE_379.sql
+++ b/migration/360lts-release/oracle/952_IDEMPIERE_379.sql
@@ -139,6 +139,6 @@ INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,V
 INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200100 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
 ;
 
-SELECT register_migration_script('923_IDEMPIERE_379.sql') FROM dual
+SELECT register_migration_script('952_IDEMPIERE_379.sql') FROM dual
 ;
 
diff --git a/migration/360lts-release/postgresql/923_PlaceHolder.sql b/migration/360lts-release/postgresql/923_PlaceHolder.sql
index 097ff34634..5bf39eb459 100644
--- a/migration/360lts-release/postgresql/923_PlaceHolder.sql
+++ b/migration/360lts-release/postgresql/923_PlaceHolder.sql
@@ -1 +1,4 @@
 -- Just a placeholder
+SELECT register_migration_script('923_PlaceHolder.sql') FROM dual
+;
+
diff --git a/migration/360lts-release/postgresql/952_IDEMPIERE_379.sql b/migration/360lts-release/postgresql/952_IDEMPIERE_379.sql
index 2cc79d1504..b50cedd224 100644
--- a/migration/360lts-release/postgresql/952_IDEMPIERE_379.sql
+++ b/migration/360lts-release/postgresql/952_IDEMPIERE_379.sql
@@ -139,6 +139,6 @@ INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,V
 INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200100 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
 ;
 
-SELECT register_migration_script('923_IDEMPIERE_379.sql') FROM dual
+SELECT register_migration_script('952_IDEMPIERE_379.sql') FROM dual
 ;
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC2FieldOrderPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC2FieldOrderPanel.java
index 66d74f80b2..6d684ea3b8 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC2FieldOrderPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC2FieldOrderPanel.java
@@ -24,7 +24,6 @@ import org.adempiere.webui.component.ListHeader;
 import org.adempiere.webui.component.ListItem;
 import org.adempiere.webui.component.Listbox;
 import org.adempiere.webui.component.SimpleListModel;
-import org.adempiere.webui.component.Window;
 import org.compiere.print.MPrintFormatItem;
 import org.compiere.util.KeyNamePair;
 import org.compiere.util.NamePair;
@@ -70,8 +69,8 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
 	}
 	
 	public void init()
-	{		
-		
+	{
+
 		Hlayout hlayout = new Hlayout();
 		hlayout.setVflex("true");
 		hlayout.setHflex("true");
@@ -81,7 +80,8 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
 		sortModel =new SimpleListModel();
 		sortList.setHeight("100%");
 		sortList.setWidth("40%");
-		sortList.setVflex(true);
+		sortList.setHflex("40");
+		sortList.setVflex("true");
 		sortList.addDoubleClickListener(this);
 		sortList.setSeltype("multiple");
 		sortList.addOnDropListener(this);
@@ -145,6 +145,7 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
 		ListHead listHead = new ListHead();
 		listHead.setParent(sortList);
 		ListHeader header=new ListHeader();
+		header.setHflex("40");
 		header.setParent(listHead);
 		
 		hlayout.appendChild(sortList);
@@ -166,6 +167,7 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
 		vbox.appendChild(bUp);
 		vbox.appendChild(bDown);
 		vbox.setWidth("50px");
+		vbox.setHflex("60");
 		//vbox.setParent(wind);
 		hlayout.appendChild(vbox);
 		this.appendChild(hlayout);