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

Merge 10a791d0c143

This commit is contained in:
Heng Sin Low 2013-03-08 12:59:43 +08:00
parent fdacee09f9 3cbcf56110
commit f3e6c16dcd
8 changed files with 91 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
migration/i1.0a-release/oracle/201303071741_IDEMPIERE-626.sql Normal file
View File

@ -0,0 +1,33 @@
-- Mar 7, 2013 5:39:23 PM COT
-- IDEMPIERE-626 Zk: Ticket #1002211: Context help pane
UPDATE AD_Column SET DefaultValue='SYSDATE',Updated=TO_DATE('2013-03-07 17:39:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=208572
;
-- Mar 7, 2013 5:39:58 PM COT
-- IDEMPIERE-626 Zk: Ticket #1002211: Context help pane
ALTER TABLE AD_CtxHelpMsg_Trl MODIFY Created DATE DEFAULT SYSDATE
;
-- Mar 7, 2013 5:40:04 PM COT
-- IDEMPIERE-626 Zk: Ticket #1002211: Context help pane
UPDATE AD_CtxHelpMsg_Trl SET Created=SYSDATE WHERE Created IS NULL
;
-- Mar 7, 2013 5:45:58 PM COT
-- IDEMPIERE-626 Zk: Ticket #1002211: Context help pane
UPDATE AD_Column SET DefaultValue='SYSDATE',Updated=TO_DATE('2013-03-07 17:45:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=208578
;
-- Mar 7, 2013 5:46:09 PM COT
-- IDEMPIERE-626 Zk: Ticket #1002211: Context help pane
ALTER TABLE AD_CtxHelpMsg_Trl MODIFY Updated DATE DEFAULT SYSDATE
;
-- Mar 7, 2013 5:46:09 PM COT
-- IDEMPIERE-626 Zk: Ticket #1002211: Context help pane
UPDATE AD_CtxHelpMsg_Trl SET Updated=SYSDATE WHERE Updated IS NULL
;
SELECT register_migration_script('201303071741_IDEMPIERE-626.sql') FROM dual
;

33
migration/i1.0a-release/postgresql/201303071741_IDEMPIERE-626.sql Normal file
View File

@ -0,0 +1,33 @@
-- Mar 7, 2013 5:39:23 PM COT
-- IDEMPIERE-626 Zk: Ticket #1002211: Context help pane
UPDATE AD_Column SET DefaultValue='SYSDATE',Updated=TO_TIMESTAMP('2013-03-07 17:39:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=208572
;
-- Mar 7, 2013 5:39:58 PM COT
-- IDEMPIERE-626 Zk: Ticket #1002211: Context help pane
INSERT INTO t_alter_column values('ad_ctxhelpmsg_trl','Created','TIMESTAMP',null,'now()')
;
-- Mar 7, 2013 5:40:04 PM COT
-- IDEMPIERE-626 Zk: Ticket #1002211: Context help pane
UPDATE AD_CtxHelpMsg_Trl SET Created=now() WHERE Created IS NULL
;
-- Mar 7, 2013 5:45:58 PM COT
-- IDEMPIERE-626 Zk: Ticket #1002211: Context help pane
UPDATE AD_Column SET DefaultValue='SYSDATE',Updated=TO_TIMESTAMP('2013-03-07 17:45:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=208578
;
-- Mar 7, 2013 5:46:09 PM COT
-- IDEMPIERE-626 Zk: Ticket #1002211: Context help pane
INSERT INTO t_alter_column values('ad_ctxhelpmsg_trl','Updated','TIMESTAMP',null,'now()')
;
-- Mar 7, 2013 5:46:09 PM COT
-- IDEMPIERE-626 Zk: Ticket #1002211: Context help pane
UPDATE AD_CtxHelpMsg_Trl SET Updated=now() WHERE Updated IS NULL
;
SELECT register_migration_script('201303071741_IDEMPIERE-626.sql') FROM dual
;

2
org.adempiere.base.process/src/org/compiere/process/ColumnSync.java
View File

@ -133,7 +133,7 @@ public class ColumnSync extends SvrProcess
String statements[] = sql.split(DB.SQLSTATEMENT_SEPARATOR);
for (int i = 0; i < statements.length; i++)
{
int count = DB.executeUpdate(statements[i], false, get_TrxName());
int count = DB.executeUpdateEx(statements[i], get_TrxName());
addLog (0, null, new BigDecimal(count), statements[i]);
no += count;
}

2
org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
View File

@ -467,7 +467,7 @@ public class Viewer extends CFrame
}
// IDEMPIERE-297 - Check for Table Access and Window Access for New Report
if ( MRole.getDefault().isTableAccess(MPrintFormat.Table_ID, false)
&& (MRole.getDefault().getWindowAccess(WINDOW_PRINTFORMAT) == Boolean.TRUE))
&& (Boolean.TRUE.equals(MRole.getDefault().getWindowAccess(WINDOW_PRINTFORMAT))))
{
StringBuffer sb = new StringBuffer("** ").append(Msg.getMsg(m_ctx, "NewReport")).append(" **");
KeyNamePair pp = new KeyNamePair(-1, sb.toString());

48
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WReportCustomization.java
View File

@ -31,7 +31,6 @@ import org.adempiere.webui.component.Tab;
import org.adempiere.webui.component.Tabbox;
import org.adempiere.webui.component.Tabpanels;
import org.adempiere.webui.component.Tabs;
import org.adempiere.webui.component.ToolBarButton;
import org.adempiere.webui.component.Window;
import org.adempiere.webui.panel.ADForm;
import org.adempiere.webui.panel.CustomForm;
@ -91,9 +90,9 @@ public class WReportCustomization implements IFormController,EventListener<Even
private Label selectAll;
private Label deselectAll;
private Label pipeSeparator;
private ToolBarButton bExport = new ToolBarButton();
private Button bExport = new Button();
private Button bnext ;
private ToolBarButton btnSave;
private Button btnSave;
private Tabbox tabbox = new Tabbox();
private Tabs tabs = new Tabs();
private Tabpanels tabpanels = new Tabpanels();
@ -264,39 +263,31 @@ public class WReportCustomization implements IFormController,EventListener<Even
Foot f=new Foot();
Grid grid=new Grid();
btnSave = new ToolBarButton();
btnSave.setAttribute("name","btnSave");
btnSave = new Button();
btnSave.setName("btnSave");
btnSave.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Save")));
btnSave.setImage("/images/Save24.png");
if(fm.getAD_Client_ID()== 0 || !isChange)
{
btnSave.setDisabled(true);
}
btnSave.addEventListener(Events.ON_CLICK, this);
foot.appendChild(btnSave);
foot.appendChild(new Separator("vertical"));
confirmPanelMain.addComponentsLeft(btnSave);
if (m_isCanExport)
{
bExport.setImage("/images/ExportX24.png");
bExport.setAttribute("name","btnExport");
bExport.setName("btnExport");
bExport.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Export")));
bExport.addEventListener(Events.ON_CLICK, this);
foot.appendChild(bExport);
foot.appendChild(new Separator("vertical"));
confirmPanelMain.addComponentsLeft(bExport);
}
bnext=new Button();
bnext.setLabel(Msg.getMsg(Env.getCtx(), "NextPage"));
bnext.setName("Next");
bnext.addEventListener(Events.ON_CLICK, this);
foot.appendChild(bnext);
Vbox vb = new Vbox();
vb.setWidth("50%");
foot.appendChild(vb);
vb.appendChild(confirmPanelMain);
confirmPanelMain.addComponentsLeft(bnext);
foot.appendChild(confirmPanelMain);
confirmPanelMain.addActionListener(this);
confirmPanelMain.setVflex("0");
@ -309,16 +300,7 @@ public class WReportCustomization implements IFormController,EventListener<Even
@Override
public void onEvent(Event event) throws Exception {
if (Events.ON_CLICK.equals(event.getName())) {
if (event.getTarget() instanceof ToolBarButton) {
((WRCTabPanel) tabbox.getSelectedTabpanel()).updatePFI();
ToolBarButton button = (ToolBarButton)event.getTarget();
if ("btnSave".equals(button.getAttribute("name").toString())) {
onSave();
}
if ("btnExport".equals(button.getAttribute("name").toString())) {
cmd_export();
}
} else if (event.getTarget() instanceof Label) {
if (event.getTarget() instanceof Label) {
if (tabbox.getSelectedIndex() == 0) {
Label lb = (Label)event.getTarget();
if ("SelectAll".equals(lb.getAttribute("name").toString())) {
@ -337,6 +319,14 @@ public class WReportCustomization implements IFormController,EventListener<Even
((WRCTabPanel) tabbox.getTabpanel(oldtabidx)).refresh();
tabbox.setSelectedIndex(oldtabidx);
}
else if ("btnSave".equals(bt.getName())) {
((WRCTabPanel) tabbox.getSelectedTabpanel()).updatePFI();
onSave();
}
else if ("btnExport".equals(bt.getName())) {
((WRCTabPanel) tabbox.getSelectedTabpanel()).updatePFI();
cmd_export();
}
else{
if("NewPrintFormat".equals(bt.getName())){
copyFormat();

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
View File

@ -404,7 +404,7 @@ public class ReportAction implements EventListener<Event>
log.log(Level.SEVERE, e.getLocalizedMessage(), e);
}
if (MRole.getDefault().isTableAccess(MPrintFormat.Table_ID, false) && MRole.getDefault().getWindowAccess(WINDOW_PRINTFORMAT) == Boolean.TRUE)
if (MRole.getDefault().isTableAccess(MPrintFormat.Table_ID, false) && Boolean.TRUE.equals(MRole.getDefault().getWindowAccess(WINDOW_PRINTFORMAT)))
{
StringBuffer sb = new StringBuffer("** ").append(Msg.getMsg(Env.getCtx(), "NewReport")).append(" **");
pp = new KeyNamePair(-1, sb.toString());

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

@ -606,7 +606,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
}
// IDEMPIERE-297 - Check for Table Access and Window Access for New Report
if ( MRole.getDefault().isTableAccess(MPrintFormat.Table_ID, false)
&& MRole.getDefault().getWindowAccess(WINDOW_PRINTFORMAT) == Boolean.TRUE)
&& Boolean.TRUE.equals(MRole.getDefault().getWindowAccess(WINDOW_PRINTFORMAT)))
{
StringBuffer sb = new StringBuffer("** ").append(Msg.getMsg(Env.getCtx(), "NewReport")).append(" **");
KeyNamePair pp = new KeyNamePair(-1, sb.toString());

4
org.compiere.db.postgresql.provider/src/org/compiere/dbPort/ConvertMap_PostgreSQL.java
View File

@ -63,11 +63,11 @@ public final class ConvertMap_PostgreSQL {
s_pg.put("\\bBITMAP INDEX\\b", "INDEX");
// Functions
s_pg.put("\\bSYSDATE\\b", "CURRENT_TIMESTAMP"); // alternative: NOW()
s_pg.put("\\bSYSDATE\\b", "now()");
//begin vpj-cd e-evolution 03/11/2005 PostgreSQL
s_pg.put("\\bDUMP\\b", "MD5");
s_pg.put("END CASE", "END");
s_pg.put("\\bgetDate\\b\\(\\)", "CURRENT_TIMESTAMP"); // alternative: NOW()
s_pg.put("\\bgetDate\\b\\(\\)", "now()");
//end vpj-cd e-evolution 03/11/2005 PostgreSQL
s_pg.put("\\bNVL\\b", "COALESCE");
s_pg.put("\\bTO_DATE\\b", "TO_TIMESTAMP");