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

Merge

This commit is contained in:
Heng Sin Low 2013-07-05 17:33:46 +08:00
parent df47fc59e4 8b2806797f
commit f4c2a30f44
20 changed files with 158 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migration/i1.0c-release/oracle/20130603172740_IDEMPIERE-1123.sql Normal file
View File

@ -0,0 +1,12 @@
-- Jul 3, 2013 5:16:26 PM COT
-- IDEMPIERE-1123 Unnecessary showing user security fields
UPDATE AD_Field SET IsActive='N',Updated=TO_DATE('2013-07-03 17:16:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200473
;
-- Jul 3, 2013 5:16:32 PM COT
-- IDEMPIERE-1123 Unnecessary showing user security fields
UPDATE AD_Field SET IsActive='N',Updated=TO_DATE('2013-07-03 17:16:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200475
;
SELECT register_migration_script('20130603172740_IDEMPIERE-1123.sql') FROM dual
;

13
migration/i1.0c-release/oracle/20130603182945_IDEMPIERE-1121.sql Normal file
View File

@ -0,0 +1,13 @@
-- Jul 3, 2013 6:25:43 PM COT
-- IDEMPIERE-1121 Field Customization IsUpdateable mandatory on DB not in dict
ALTER TABLE AD_UserDef_Field MODIFY IsUpdateable CHAR(1) DEFAULT NULL
;
-- Jul 3, 2013 6:25:44 PM COT
-- IDEMPIERE-1121 Field Customization IsUpdateable mandatory on DB not in dict
ALTER TABLE AD_UserDef_Field MODIFY IsUpdateable NULL
;
SELECT register_migration_script('20130603182945_IDEMPIERE-1121.sql') FROM dual
;

13
migration/i1.0c-release/oracle/201307041818_IDEMPIERE-1133.sql Normal file
View File

@ -0,0 +1,13 @@
-- 4/07/2013 06:07:52 PM COT
-- IDEMPIERE-1133 Customize grid not translated
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,Created,AD_Org_ID,AD_Client_ID,EntityType) VALUES ('I','Save Column Width',200186,'e55bb769-5507-483c-bfd4-c938c5c5d93f','SaveColumnWidth','Y',TO_DATE('2013-07-04 18:07:52','YYYY-MM-DD HH24:MI:SS'),100,100,TO_DATE('2013-07-04 18:07:52','YYYY-MM-DD HH24:MI:SS'),0,0,'D')
;
-- 4/07/2013 06:07:52 PM COT
-- IDEMPIERE-1133 Customize grid not translated
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=200186 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('201307041818_IDEMPIERE-1133.sql') FROM dual
;

13
migration/i1.0c-release/postgresql/20130603172740_IDEMPIERE-1123.sql Normal file
View File

@ -0,0 +1,13 @@
-- Jul 3, 2013 5:16:26 PM COT
-- IDEMPIERE-1123 Unnecessary showing user security fields
UPDATE AD_Field SET IsActive='N',Updated=TO_TIMESTAMP('2013-07-03 17:16:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200473
;
-- Jul 3, 2013 5:16:32 PM COT
-- IDEMPIERE-1123 Unnecessary showing user security fields
UPDATE AD_Field SET IsActive='N',Updated=TO_TIMESTAMP('2013-07-03 17:16:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200475
;
SELECT register_migration_script('20130603172740_IDEMPIERE-1123.sql') FROM dual
;

13
migration/i1.0c-release/postgresql/20130603182945_IDEMPIERE-1121.sql Normal file
View File

@ -0,0 +1,13 @@
-- Jul 3, 2013 6:25:43 PM COT
-- IDEMPIERE-1121 Field Customization IsUpdateable mandatory on DB not in dict
INSERT INTO t_alter_column values('ad_userdef_field','IsUpdateable','CHAR(1)',null,'NULL')
;
-- Jul 3, 2013 6:25:44 PM COT
-- IDEMPIERE-1121 Field Customization IsUpdateable mandatory on DB not in dict
INSERT INTO t_alter_column values('ad_userdef_field','IsUpdateable',null,'NULL',null)
;
SELECT register_migration_script('20130603182945_IDEMPIERE-1121.sql') FROM dual
;

13
migration/i1.0c-release/postgresql/201307041818_IDEMPIERE-1133.sql Normal file
View File

@ -0,0 +1,13 @@
-- 4/07/2013 06:07:52 PM COT
-- IDEMPIERE-1133 Customize grid not translated
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,Created,AD_Org_ID,AD_Client_ID,EntityType) VALUES ('I','Save Column Width',200186,'e55bb769-5507-483c-bfd4-c938c5c5d93f','SaveColumnWidth','Y',TO_TIMESTAMP('2013-07-04 18:07:52','YYYY-MM-DD HH24:MI:SS'),100,100,TO_TIMESTAMP('2013-07-04 18:07:52','YYYY-MM-DD HH24:MI:SS'),0,0,'D')
;
-- 4/07/2013 06:07:52 PM COT
-- IDEMPIERE-1133 Customize grid not translated
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=200186 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('201307041818_IDEMPIERE-1133.sql') FROM dual
;

7
org.adempiere.base/src/org/compiere/model/MColor.java
View File

@ -34,7 +34,7 @@ public class MColor extends X_AD_Color
/**
*
*/
private static final long serialVersionUID = 8672637038417465668L;
private static final long serialVersionUID = 3054697070898921956L;
/**
* Color Model
@ -48,6 +48,11 @@ public class MColor extends X_AD_Color
if (AD_Color_ID == 0)
setName("-/-");
} // MColor
public MColor(Properties ctx, ResultSet rs, String trxName)
{
super (ctx, rs, trxName);
}
/**
* String Representation

2
org.adempiere.base/src/org/compiere/model/MPaymentTransaction.java
View File

@ -39,7 +39,7 @@ public class MPaymentTransaction extends X_C_PaymentTransaction implements Proce
/**
*
*/
private static final long serialVersionUID = 3136835982476528825L;
private static final long serialVersionUID = 8722189788479132158L;
public MPaymentTransaction(Properties ctx, int C_PaymentTransaction_ID, String trxName) {
super(ctx, C_PaymentTransaction_ID, trxName);

8
org.adempiere.base/src/org/compiere/model/MQualityTestResult.java
View File

@ -1,5 +1,6 @@
package org.compiere.model;
import java.sql.ResultSet;
import java.util.Properties;
public class MQualityTestResult extends X_M_QualityTestResult {
@ -7,11 +8,16 @@ public class MQualityTestResult extends X_M_QualityTestResult {
/**
*
*/
private static final long serialVersionUID = -4253026765149175778L;
private static final long serialVersionUID = -5529865718027582930L;
public MQualityTestResult(Properties ctx, int M_QualityTestResult_ID,
String trxName) {
super(ctx, M_QualityTestResult_ID, trxName);
}
public MQualityTestResult(Properties ctx, ResultSet rs,
String trxName) {
super (ctx, rs, trxName);
}
}

8
org.adempiere.base/src/org/compiere/model/MReplication.java
View File

@ -16,6 +16,7 @@
*****************************************************************************/
package org.compiere.model;
import java.sql.ResultSet;
import java.sql.Timestamp;
import java.util.Properties;
@ -30,7 +31,7 @@ public class MReplication extends X_AD_Replication
/**
*
*/
private static final long serialVersionUID = -7363193371925559167L;
private static final long serialVersionUID = -562186299848949607L;
/**
* Load Constructor
@ -41,6 +42,11 @@ public class MReplication extends X_AD_Replication
{
super (ctx, AD_Replication_ID, trxName);
} // MReplication
public MReplication (Properties ctx, ResultSet rs, String trxName)
{
super (ctx, rs, trxName);
}
/**
* Public Access

10
org.adempiere.base/src/org/compiere/model/MReplicationLog.java
View File

@ -16,6 +16,7 @@
*****************************************************************************/
package org.compiere.model;
import java.sql.ResultSet;
import java.util.Properties;
/**
@ -30,7 +31,7 @@ public class MReplicationLog extends X_AD_Replication_Log
/**
*
*/
private static final long serialVersionUID = -5188563816312329819L;
private static final long serialVersionUID = -8815834636981996509L;
/**
* Create new Log
@ -47,5 +48,10 @@ public class MReplicationLog extends X_AD_Replication_Log
setIsReplicated(false);
setP_Msg(P_Msg);
} // MReplicationLog
public MReplicationLog(Properties ctx, ResultSet rs, String trxName)
{
super (ctx, rs, trxName);
}
} // MReplicationLog

8
org.adempiere.base/src/org/compiere/model/MReplicationRun.java
View File

@ -16,6 +16,7 @@
*****************************************************************************/
package org.compiere.model;
import java.sql.ResultSet;
import java.sql.Timestamp;
import java.util.Properties;
@ -30,7 +31,7 @@ public class MReplicationRun extends X_AD_Replication_Run
/**
*
*/
private static final long serialVersionUID = 2619966943083677072L;
private static final long serialVersionUID = 7609847179225634980L;
/**
* Create new Run
@ -46,6 +47,11 @@ public class MReplicationRun extends X_AD_Replication_Run
super.setIsReplicated (false);
} // MReplicationRun
public MReplicationRun (Properties ctx, ResultSet rs, String trxName)
{
super (ctx, rs, trxName);
}
/**
* Set Replication Flag
* @param IsReplicated replicated

15
org.adempiere.base/src/org/compiere/model/MReplicationStrategy.java
View File

@ -17,6 +17,7 @@
package org.compiere.model;
import java.sql.ResultSet;
import java.util.List;
import java.util.Properties;
@ -34,10 +35,10 @@ import org.compiere.util.CLogger;
*/
public class MReplicationStrategy extends X_AD_ReplicationStrategy {
/**
*
*/
private static final long serialVersionUID = -3017484140206284805L;
/**
*
*/
private static final long serialVersionUID = 7231926756021012730L;
public static final int REPLICATION_TABLE =0;
public static final int REPLICATION_DOCUMENT =1;
@ -56,7 +57,11 @@ public class MReplicationStrategy extends X_AD_ReplicationStrategy {
public MReplicationStrategy(Properties ctx, int AD_ReplicationStrategy_ID, String trxName) {
super(ctx, AD_ReplicationStrategy_ID, trxName);
}
public MReplicationStrategy(Properties ctx, ResultSet rs, String trxName) {
super (ctx, rs, trxName);
}
/**
* @return the list the X_AD_ReplicationTable
*/

6
org.adempiere.base/src/org/compiere/model/MSearchDefinition.java
View File

@ -47,7 +47,7 @@ public class MSearchDefinition extends X_AD_SearchDefinition {
/**
*
*/
private static final long serialVersionUID = 2448668218372939766L;
private static final long serialVersionUID = -5366274782950561962L;
/** Constant for the searchtype table */
public static final String SEARCHTYPE_TABLE = "T";
/** Constant for the searchtype query */
@ -66,6 +66,10 @@ public class MSearchDefinition extends X_AD_SearchDefinition {
public MSearchDefinition(Properties ctx, int AD_SearchDefinition_ID, String trxName) {
super(ctx, AD_SearchDefinition_ID, trxName);
}
public MSearchDefinition(Properties ctx, ResultSet rs, String trxName) {
super (ctx, rs, trxName);
}
/**
* Returns all SearchDefinition objects with the given transaction code

9
org.adempiere.base/src/org/compiere/print/MPrintColor.java
View File

@ -18,6 +18,7 @@ package org.compiere.print;
import java.awt.Color;
import java.awt.SystemColor;
import java.sql.ResultSet;
import java.util.Properties;
import java.util.logging.Level;
@ -36,11 +37,10 @@ import org.compiere.util.Util;
*/
public class MPrintColor extends X_AD_PrintColor
{
/**
*
*/
private static final long serialVersionUID = 8352503254165120016L;
private static final long serialVersionUID = -5611659311562283304L;
/**************************************************************************
* Create Color in Database and save
@ -138,6 +138,11 @@ public class MPrintColor extends X_AD_PrintColor
if (AD_PrintColor_ID == 0)
setIsDefault(false);
} // MPrintColor
public MPrintColor(Properties ctx, ResultSet rs, String trxName)
{
super (ctx, rs, trxName);
}
/** Color cached */
private Color m_cacheColor = null;

2
org.adempiere.base/src/org/compiere/print/MPrintFont.java
View File

@ -40,7 +40,7 @@ public class MPrintFont extends X_AD_PrintFont
/**
*
*/
private static final long serialVersionUID = -4721840631004326810L;
private static final long serialVersionUID = -2986160498367260541L;
/**
* Constructor

7
org.adempiere.base/src/org/compiere/report/MReportColumnSet.java
View File

@ -37,7 +37,7 @@ public class MReportColumnSet extends X_PA_ReportColumnSet
/**
*
*/
private static final long serialVersionUID = 8636368829160472883L;
private static final long serialVersionUID = -3496781398287709753L;
/**
* Constructor
@ -54,6 +54,11 @@ public class MReportColumnSet extends X_PA_ReportColumnSet
else
loadColumns();
} // MReportColumnSet
public MReportColumnSet (Properties ctx, ResultSet rs, String trxName)
{
super (ctx, rs, trxName);
}
/** Contained Columns */
private MReportColumn[] m_columns = null;

7
org.adempiere.base/src/org/compiere/report/MReportLineSet.java
View File

@ -37,7 +37,7 @@ public class MReportLineSet extends X_PA_ReportLineSet
/**
*
*/
private static final long serialVersionUID = -2540937629148624046L;
private static final long serialVersionUID = 6882950634644885097L;
/**
* Constructor
@ -54,6 +54,11 @@ public class MReportLineSet extends X_PA_ReportLineSet
else
loadLines();
} // MReportLineSet
public MReportLineSet (Properties ctx, ResultSet rs, String trxName)
{
super (ctx, rs, trxName);
}
/** Contained Lines */
private MReportLine[] m_lines = null;

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

@ -171,7 +171,7 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
south.setHeight("22%");
//south.setWidth("45%");
acknowledged.setParent(rightCell);
acknowledged.setVisible(false);
//acknowledged.setVisible(false);
//acknowledged.setHflex("6");
acknowledged.setLabel(Msg.getMsg(Env.getCtx(),"Acknowledge"));
acknowledged.addEventListener("onClick", this);

12
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java
View File

@ -231,7 +231,7 @@ public class CustomizeGridViewPanel extends Panel
Div div = new Div();
div.setStyle("margin-top:5px");
div.appendChild(chkSaveWidth);
chkSaveWidth.setLabel("Save Column Width");
chkSaveWidth.setLabel(Msg.getMsg(Env.getCtx(), "SaveColumnWidth"));
centerPanel.appendChild(div);
center.appendChild(centerPanel);
@ -296,14 +296,20 @@ public class CustomizeGridViewPanel extends Panel
{
yesModel.removeAllElements();
noModel.removeAllElements();
String sql = "SELECT t.AD_Field_ID,t.Name,t.SeqNoGrid,AD_Client_ID, AD_Org_ID FROM AD_Field t WHERE t.AD_Tab_ID=? AND t.IsDisplayedGrid ='Y' ORDER BY 3,2";
boolean baseLanguage = Env.isBaseLanguage(Env.getCtx(), "AD_Field");
String sql;
if (baseLanguage)
sql = "SELECT t.AD_Field_ID,t.Name,t.SeqNoGrid,AD_Client_ID, AD_Org_ID FROM AD_Field t WHERE t.AD_Tab_ID=? AND t.IsDisplayedGrid ='Y' AND t.IsActive='Y' ORDER BY 3,2";
else
sql = "SELECT t.AD_Field_ID,trl.Name,t.SeqNoGrid,t.AD_Client_ID, t.AD_Org_ID FROM AD_Field t JOIN AD_Field_Trl trl ON (t.AD_Field_ID = trl.AD_Field_ID)"
+ " WHERE t.AD_Tab_ID=? AND t.IsDisplayedGrid ='Y' AND t.IsActive='Y' AND trl.AD_Language=? ORDER BY 3,2";
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
pstmt = DB.prepareStatement(sql, null);
pstmt.setInt(1, m_AD_Tab_ID);
pstmt.setString(2, Env.getAD_Language(Env.getCtx()));
rs = pstmt.executeQuery();
HashMap<Integer, ListElement> curTabSel = new HashMap<Integer, CustomizeGridViewPanel.ListElement>();