midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-379 Reporting wizard for end users / Fix problem with second panel on chrome - fix migration scripts registration

This commit is contained in:
Carlos Ruiz 2012-10-30 23:16:50 -05:00
parent 3a8d5ce4fe
commit 8c58fc91e7
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
migration/360lts-release/oracle/923_PlaceHolder.sql
View File

@ -1 +1,4 @@
-- Just a placeholder -- Just a placeholder
SELECT register_migration_script('923_PlaceHolder.sql') FROM dual
;

2
migration/360lts-release/oracle/952_IDEMPIERE_379.sql
View File

@ -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) 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
; ;

3
migration/360lts-release/postgresql/923_PlaceHolder.sql
View File

@ -1 +1,4 @@
-- Just a placeholder -- Just a placeholder
SELECT register_migration_script('923_PlaceHolder.sql') FROM dual
;

2
migration/360lts-release/postgresql/952_IDEMPIERE_379.sql
View File

@ -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) 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
; ;

10
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC2FieldOrderPanel.java
View File

@ -24,7 +24,6 @@ import org.adempiere.webui.component.ListHeader;
import org.adempiere.webui.component.ListItem; import org.adempiere.webui.component.ListItem;
import org.adempiere.webui.component.Listbox; import org.adempiere.webui.component.Listbox;
import org.adempiere.webui.component.SimpleListModel; import org.adempiere.webui.component.SimpleListModel;
import org.adempiere.webui.component.Window;
import org.compiere.print.MPrintFormatItem; import org.compiere.print.MPrintFormatItem;
import org.compiere.util.KeyNamePair; import org.compiere.util.KeyNamePair;
import org.compiere.util.NamePair; import org.compiere.util.NamePair;
@ -70,8 +69,8 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
} }
public void init() public void init()
{ {
Hlayout hlayout = new Hlayout(); Hlayout hlayout = new Hlayout();
hlayout.setVflex("true"); hlayout.setVflex("true");
hlayout.setHflex("true"); hlayout.setHflex("true");
@ -81,7 +80,8 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
sortModel =new SimpleListModel(); sortModel =new SimpleListModel();
sortList.setHeight("100%"); sortList.setHeight("100%");
sortList.setWidth("40%"); sortList.setWidth("40%");
sortList.setVflex(true); sortList.setHflex("40");
sortList.setVflex("true");
sortList.addDoubleClickListener(this); sortList.addDoubleClickListener(this);
sortList.setSeltype("multiple"); sortList.setSeltype("multiple");
sortList.addOnDropListener(this); sortList.addOnDropListener(this);
@ -145,6 +145,7 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
ListHead listHead = new ListHead(); ListHead listHead = new ListHead();
listHead.setParent(sortList); listHead.setParent(sortList);
ListHeader header=new ListHeader(); ListHeader header=new ListHeader();
header.setHflex("40");
header.setParent(listHead); header.setParent(listHead);
hlayout.appendChild(sortList); hlayout.appendChild(sortList);
@ -166,6 +167,7 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
vbox.appendChild(bUp); vbox.appendChild(bUp);
vbox.appendChild(bDown); vbox.appendChild(bDown);
vbox.setWidth("50px"); vbox.setWidth("50px");
vbox.setHflex("60");
//vbox.setParent(wind); //vbox.setParent(wind);
hlayout.appendChild(vbox); hlayout.appendChild(vbox);
this.appendChild(hlayout); this.appendChild(hlayout);