From 85ff580ba1f0cc74e2a5c068408a0a06eb2b21b6 Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Wed, 16 Jul 2014 12:40:01 +0800 Subject: [PATCH 01/21] IDEMPIERE-2061 Ticket #1004119: HTML error on Dashboard Report detail --- .../WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java index 2938b784ea..686f49e51f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java @@ -483,7 +483,7 @@ public class WGraph extends Div implements IdSpace { Br br = new Br(); td.appendChild(br); text = new Text(stripHtml(m_goal.getColorSchema() - .getDescription(), true)); + .getDescription(), false)); td.appendChild(text); } From 300ae850ace7fbaef18b31d9d2782b3c69831a66 Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Wed, 16 Jul 2014 17:49:03 +0800 Subject: [PATCH 02/21] IDEMPIERE-2063 Ticket #1004146: cannot remove reserve quantity off order --- .../src/org/compiere/model/MOrder.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java index d72e3eb1f7..07640eb37d 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrder.java +++ b/org.adempiere.base/src/org/compiere/model/MOrder.java @@ -1722,15 +1722,23 @@ public class MOrder extends X_C_Order implements DocAction BigDecimal difference = target .subtract(line.getQtyReserved()) .subtract(line.getQtyDelivered()); - if (difference.signum() <= 0) + + if (difference.signum() == 0 || line.getQtyOrdered().signum() < 0) { - MProduct product = line.getProduct(); - if (product != null) + if (difference.signum() == 0 || line.getQtyReserved().signum() == 0) { - Volume = Volume.add(product.getVolume().multiply(line.getQtyOrdered())); - Weight = Weight.add(product.getWeight().multiply(line.getQtyOrdered())); + MProduct product = line.getProduct(); + if (product != null) + { + Volume = Volume.add(product.getVolume().multiply(line.getQtyOrdered())); + Weight = Weight.add(product.getWeight().multiply(line.getQtyOrdered())); + } + continue; + } + else if (line.getQtyOrdered().signum() < 0 && line.getQtyReserved().signum() > 0) + { + difference = line.getQtyReserved().negate(); } - continue; } if (log.isLoggable(Level.FINE)) log.fine("Line=" + line.getLine() From 5e9593740cc70623b391105981edf0b7b4cb20aa Mon Sep 17 00:00:00 2001 From: hieplq Date: Thu, 6 Feb 2014 14:12:06 +0700 Subject: [PATCH 03/21] IDEMPIERE-1552:When double click into non line area (include header) of infoPanel. panel close. --- .../WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java index 90d7325851..e82958148d 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java @@ -75,6 +75,7 @@ import org.zkoss.zk.ui.Page; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; +import org.zkoss.zk.ui.event.MouseEvent; import org.zkoss.zk.ui.event.SelectEvent; import org.zkoss.zk.ui.util.Clients; import org.zkoss.zul.Listhead; @@ -1136,6 +1137,9 @@ public abstract class InfoPanel extends Window implements EventListener, } else if (event.getTarget() == contentPanel && event.getName().equals(Events.ON_DOUBLE_CLICK)) { + if (event.getClass().equals(MouseEvent.class)){ + return; + } if (contentPanel.isMultiple()) { if (m_lastOnSelectItem != null) contentPanel.setSelectedItem(m_lastOnSelectItem); From 520d4802e50473e45ba3cfdc6731d3da1f3a011f Mon Sep 17 00:00:00 2001 From: hieplq Date: Sun, 29 Jun 2014 13:10:58 +0700 Subject: [PATCH 04/21] IDEMPIERE-2026:when role have limit access to a user, can't select any bpartner have no contact --- org.adempiere.base/src/org/compiere/model/MRole.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MRole.java b/org.adempiere.base/src/org/compiere/model/MRole.java index 9a19c7c78c..cada59c317 100644 --- a/org.adempiere.base/src/org/compiere/model/MRole.java +++ b/org.adempiere.base/src/org/compiere/model/MRole.java @@ -2368,9 +2368,10 @@ public final class MRole extends X_AD_Role // NOT IN (x) if (m_recordAccess[i].isExclude()) { - if (sbExclude.length() == 0) - sbExclude.append(keyColumnName) - .append(" NOT IN ("); + if (sbExclude.length() == 0){ + sbExclude.append("(").append(keyColumnName).append(" IS NULL OR "); + sbExclude.append(keyColumnName).append(" NOT IN ("); + } else sbExclude.append(","); sbExclude.append(m_recordAccess[i].getRecord_ID()); @@ -2390,7 +2391,7 @@ public final class MRole extends X_AD_Role StringBuilder sb = new StringBuilder(); if (sbExclude.length() > 0) - sb.append(sbExclude).append(")"); + sb.append(sbExclude).append("))"); if (sbInclude.length() > 0) { if (sb.length() > 0) From 9d959afca754f426520d48c5868cf28acf91cd12 Mon Sep 17 00:00:00 2001 From: Nicolas Micoud Date: Wed, 16 Jul 2014 15:07:01 -0500 Subject: [PATCH 05/21] IDEMPIERE-775 Documents without C_DocType_ID cannot be distributed directly --- org.adempiere.base/src/org/compiere/acct/Doc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/acct/Doc.java b/org.adempiere.base/src/org/compiere/acct/Doc.java index 17937087a3..d03ac4aab2 100644 --- a/org.adempiere.base/src/org/compiere/acct/Doc.java +++ b/org.adempiere.base/src/org/compiere/acct/Doc.java @@ -129,7 +129,7 @@ public abstract class Doc * M_Requisition POR **************************************************************************/ - private static final String DOC_TYPE_BY_DOC_BASE_TYPE_SQL = "SELECT C_DocType_ID FROM C_DocType WHERE AD_Client_ID=? AND DocBaseType=? AND IsActive='Y'"; + private static final String DOC_TYPE_BY_DOC_BASE_TYPE_SQL = "SELECT C_DocType_ID FROM C_DocType WHERE AD_Client_ID=? AND DocBaseType=? AND IsActive='Y' ORDER BY IsDefault DESC, C_DocType_ID"; /** AR Invoices - ARI */ public static final String DOCTYPE_ARInvoice = MDocType.DOCBASETYPE_ARInvoice; From dc9f9ef96390df01a3f5259af0a5a78566d2dcf0 Mon Sep 17 00:00:00 2001 From: hieplq Date: Sun, 29 Jun 2014 14:59:23 +0700 Subject: [PATCH 06/21] IDEMPIERE-2027:Accounting Fact Reconcilation - Refresh Button Doesn't make sense --- .../adempiere/webui/apps/form/WFactReconcile.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java index a86e3e05d6..be06bff1ef 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java @@ -292,27 +292,40 @@ implements IFormController, EventListener, WTableModelListener, ValueChan if (Account_ID != 0) m_Account_ID = Account_ID; + else + m_Account_ID = 0; if(fieldOrg.getValue()!=null) m_AD_Org_ID = (Integer)fieldOrg.getValue(); + else + m_AD_Org_ID = 0; if(fieldAcctSchema.getValue()!=null) m_C_AcctSchema_ID = (Integer)fieldAcctSchema.getValue(); + else + m_C_AcctSchema_ID = 0; m_isReconciled = isReconciled.isChecked(); if(fieldBPartner.getValue()!=null) m_C_BPartner_ID = (Integer)fieldBPartner.getValue(); + else + m_C_BPartner_ID = 0; if((Integer)fieldProduct.getValue()!=null) m_M_Product_ID = (Integer)fieldProduct.getValue(); + else + m_M_Product_ID = 0; if(fieldDateAcct.getValue()!=null) m_DateAcct = (Timestamp)fieldDateAcct.getValue(); + else + m_DateAcct = null; if(fieldDateAcct2.getValue()!=null) m_DateAcct2 = (Timestamp)fieldDateAcct2.getValue(); - + else + m_DateAcct2 = null; // Set Model Vector> data = getData(); Vector columnNames = getColumnNames(); From 3aa0e36afd094c8990e369b588d69f10e2498db5 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 16 Jul 2014 08:34:24 -0500 Subject: [PATCH 07/21] IDEMPIERE-2055 Changed Constraints for Web Service Security / based on patch from Jan Thielemann --- .../oracle/201407160833_IDEMPIERE-2055.sql | 19 +++++++++++++++++++ .../201407160833_IDEMPIERE-2055.sql | 16 ++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 migration/i2.0/oracle/201407160833_IDEMPIERE-2055.sql create mode 100644 migration/i2.0/postgresql/201407160833_IDEMPIERE-2055.sql diff --git a/migration/i2.0/oracle/201407160833_IDEMPIERE-2055.sql b/migration/i2.0/oracle/201407160833_IDEMPIERE-2055.sql new file mode 100644 index 0000000000..41feeff337 --- /dev/null +++ b/migration/i2.0/oracle/201407160833_IDEMPIERE-2055.sql @@ -0,0 +1,19 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Jul 16, 2014 8:32:31 AM COT +-- IDEMPIERE-2055 Changed Constraints for Web Service Security +UPDATE AD_Column SET IsUpdateable='N', IsToolbarButton='N', FKConstraintType='C',Updated=TO_DATE('2014-07-16 08:32:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56769 +; + +-- Jul 16, 2014 8:32:49 AM COT +ALTER TABLE WS_WebServiceTypeAccess DROP CONSTRAINT wswebservicetype_wswebservicet +; + +-- Jul 16, 2014 8:32:50 AM COT +ALTER TABLE WS_WebServiceTypeAccess ADD CONSTRAINT wswebservicetype_wswebservicet FOREIGN KEY (WS_WebServiceType_ID) REFERENCES ws_webservicetype(ws_webservicetype_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED +; + +SELECT register_migration_script('201407160833_IDEMPIERE-2055.sql') FROM dual +; + diff --git a/migration/i2.0/postgresql/201407160833_IDEMPIERE-2055.sql b/migration/i2.0/postgresql/201407160833_IDEMPIERE-2055.sql new file mode 100644 index 0000000000..b8d3864064 --- /dev/null +++ b/migration/i2.0/postgresql/201407160833_IDEMPIERE-2055.sql @@ -0,0 +1,16 @@ +-- Jul 16, 2014 8:32:31 AM COT +-- IDEMPIERE-2055 Changed Constraints for Web Service Security +UPDATE AD_Column SET IsUpdateable='N', IsToolbarButton='N', FKConstraintType='C',Updated=TO_TIMESTAMP('2014-07-16 08:32:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56769 +; + +-- Jul 16, 2014 8:32:49 AM COT +ALTER TABLE WS_WebServiceTypeAccess DROP CONSTRAINT wswebservicetype_wswebservicet +; + +-- Jul 16, 2014 8:32:50 AM COT +ALTER TABLE WS_WebServiceTypeAccess ADD CONSTRAINT wswebservicetype_wswebservicet FOREIGN KEY (WS_WebServiceType_ID) REFERENCES ws_webservicetype(ws_webservicetype_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED +; + +SELECT register_migration_script('201407160833_IDEMPIERE-2055.sql') FROM dual +; + From 4b4e41a3ab0a7ab0ce21357c0e2a141087a3fef4 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Wed, 16 Jul 2014 11:15:47 +0800 Subject: [PATCH 08/21] 1004150 Process modal dialog: no scrollbar when content overflow. Fixed for RunAsJob for Financial Report ( Ticket #1004121 ). --- .../src/org/adempiere/webui/apps/AbstractProcessDialog.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java index d0331f7974..6906683aea 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java @@ -285,7 +285,10 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI { Component component = event.getTarget(); if (component == runAsJobField && event.getName().equals(Events.ON_CHECK)) + { notificationTypeField.getComponent().getParent().setVisible(runAsJobField.isChecked()); + centerPanel.invalidate(); + } else if (event.getName().equals(ON_COMPLETE)) onComplete(); else if (event.getName().equals(ON_STATUS_UPDATE)) From bcc4bdbc5461a8afb750c8f533011ff301f1d0fd Mon Sep 17 00:00:00 2001 From: Nicolas Micoud Date: Wed, 16 Jul 2014 09:26:15 -0500 Subject: [PATCH 09/21] IDEMPIERE-2062 Add methods for MRefList for getting translation with specific language (and not ctx) --- .../src/org/compiere/model/MRefList.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MRefList.java b/org.adempiere.base/src/org/compiere/model/MRefList.java index f3d5916086..b5e046f198 100644 --- a/org.adempiere.base/src/org/compiere/model/MRefList.java +++ b/org.adempiere.base/src/org/compiere/model/MRefList.java @@ -44,7 +44,7 @@ public class MRefList extends X_AD_Ref_List /** * */ - private static final long serialVersionUID = -6948532574960232289L; + private static final long serialVersionUID = 2210328198547927123L; /** @@ -61,7 +61,7 @@ public class MRefList extends X_AD_Ref_List .setParameters(AD_Reference_ID, Value) .firstOnly(); } // get - + /** * Get Reference List Value Name (cached) * @param ctx context @@ -72,6 +72,18 @@ public class MRefList extends X_AD_Ref_List public static String getListName (Properties ctx, int AD_Reference_ID, String Value) { String AD_Language = Env.getAD_Language(ctx); + return getListName (AD_Language, AD_Reference_ID, Value); + } + + /** + * Get Reference List Value Name (cached) + * @param Language + * @param AD_Reference_ID reference + * @param Value value + * @return List or "" + */ + public static String getListName (String AD_Language, int AD_Reference_ID, String Value) + { String key = AD_Language + "_" + AD_Reference_ID + "_" + Value; String retValue = (String)s_cache.get(key); if (retValue != null) From 83108c00703fb74441050db29bb443510c73c095 Mon Sep 17 00:00:00 2001 From: Nicolas Micoud Date: Wed, 16 Jul 2014 09:36:00 -0500 Subject: [PATCH 10/21] IDEMPIERE-2062 Add methods for MRefList for getting translation with specific language (and not ctx) --- .../src/org/compiere/model/MRefList.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MRefList.java b/org.adempiere.base/src/org/compiere/model/MRefList.java index b5e046f198..678362ca9f 100644 --- a/org.adempiere.base/src/org/compiere/model/MRefList.java +++ b/org.adempiere.base/src/org/compiere/model/MRefList.java @@ -44,8 +44,7 @@ public class MRefList extends X_AD_Ref_List /** * */ - private static final long serialVersionUID = 2210328198547927123L; - + private static final long serialVersionUID = -3612793187620297377L; /** * Get Reference List @@ -129,7 +128,8 @@ public class MRefList extends X_AD_Ref_List // return retValue; } // getListName - + + /** * Get Reference List Value Description (cached) * @param ctx context @@ -140,6 +140,18 @@ public class MRefList extends X_AD_Ref_List public static String getListDescription (Properties ctx, String ListName, String Value) { String AD_Language = Env.getAD_Language(ctx); + return getListDescription (AD_Language, ListName, Value); + } + + /** + * Get Reference List Value Description (cached) + * @param Language + * @param ListName reference + * @param Value value + * @return List or null + */ + public static String getListDescription (String AD_Language, String ListName, String Value) + { String key = AD_Language + "_" + ListName + "_" + Value; String retValue = s_cache.get(key); if (retValue != null) From a948d74076df28fde39258fc35e259ebd58952f3 Mon Sep 17 00:00:00 2001 From: Nicolas Micoud Date: Wed, 16 Jul 2014 09:58:38 -0500 Subject: [PATCH 11/21] IDEMPIERE-1828 Improvement of monitoring of emails --- .../oracle/201403201438_IDEMPIERE-1828.sql | 250 ++++++++++++++++++ .../201403201438_IDEMPIERE-1828.sql | 247 +++++++++++++++++ .../src/org/compiere/model/I_AD_UserMail.java | 36 +++ .../src/org/compiere/model/MClient.java | 5 + .../src/org/compiere/model/MUserMail.java | 44 ++- .../src/org/compiere/model/X_AD_UserMail.java | 58 +++- .../adempiere/webui/window/WEMailDialog.java | 2 + 7 files changed, 640 insertions(+), 2 deletions(-) create mode 100644 migration/i2.0z/oracle/201403201438_IDEMPIERE-1828.sql create mode 100644 migration/i2.0z/postgresql/201403201438_IDEMPIERE-1828.sql diff --git a/migration/i2.0z/oracle/201403201438_IDEMPIERE-1828.sql b/migration/i2.0z/oracle/201403201438_IDEMPIERE-1828.sql new file mode 100644 index 0000000000..70a19dd932 --- /dev/null +++ b/migration/i2.0z/oracle/201403201438_IDEMPIERE-1828.sql @@ -0,0 +1,250 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Mar 20, 2014 2:05:38 PM CET +-- IDEMPIERE-1828 +INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202671,'b640b542-2f7a-4885-a212-5c60138d9480',0,'EMailFrom',TO_DATE('2014-03-20 14:05:38','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','EMail sent from','EMail sent from',TO_DATE('2014-03-20 14:05:38','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:06:01 PM CET +INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202672,'9c423548-1e6b-4899-a179-1304f30adeff',0,'RecipientTo',TO_DATE('2014-03-20 14:06:01','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','To','To',TO_DATE('2014-03-20 14:06:01','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:06:08 PM CET +INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202673,'6bc347b6-83fd-49e5-b34f-949f7e480baf',0,'RecipientCc',TO_DATE('2014-03-20 14:06:08','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Cc','Cc',TO_DATE('2014-03-20 14:06:08','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:06:18 PM CET +INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202674,'e79d13ad-54af-4384-9b11-dc86abd1db21',0,'RecipientBcc',TO_DATE('2014-03-20 14:06:18','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Bcc','Bcc',TO_DATE('2014-03-20 14:06:18','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:06:26 PM CET +UPDATE AD_Element SET EntityType='D',Updated=TO_DATE('2014-03-20 14:06:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=202673 +; + +-- Mar 20, 2014 2:08:07 PM CET +INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210985,'63925720-89dc-4245-86e6-770564e34147',202671,0,10,782,'EMailFrom',TO_DATE('2014-03-20 14:08:07','YYYY-MM-DD HH24:MI:SS'),100,'D','N',255,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','EMail sent from',0,0,TO_DATE('2014-03-20 14:08:07','YYYY-MM-DD HH24:MI:SS'),100,0) +; + +-- Mar 20, 2014 2:08:13 PM CET +ALTER TABLE AD_UserMail ADD EMailFrom VARCHAR2(255) DEFAULT NULL +; + +-- Mar 20, 2014 2:08:46 PM CET +INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210986,'6dd996b8-5e29-4bef-89b3-694bd8c1c9d6',202674,0,10,782,'RecipientBcc',TO_DATE('2014-03-20 14:08:45','YYYY-MM-DD HH24:MI:SS'),100,'D','N',2000,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','Bcc',0,0,TO_DATE('2014-03-20 14:08:45','YYYY-MM-DD HH24:MI:SS'),100,0) +; + +-- Mar 20, 2014 2:08:49 PM CET +ALTER TABLE AD_UserMail ADD RecipientBcc VARCHAR2(2000) DEFAULT NULL +; + +-- Mar 20, 2014 2:09:05 PM CET +UPDATE AD_Column SET AD_Element_ID=202673, ColumnName='RecipientCc', Description=NULL, Help=NULL, Name='Cc',Updated=TO_DATE('2014-03-20 14:09:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210986 +; + +-- Mar 20, 2014 2:09:08 PM CET +ALTER TABLE AD_UserMail ADD RecipientCc VARCHAR2(2000) DEFAULT NULL +; + +-- Mar 20, 2014 2:09:23 PM CET +UPDATE AD_Column SET AD_Element_ID=202672, ColumnName='RecipientTo', Description=NULL, EntityType='D', Help=NULL, Name='To',Updated=TO_DATE('2014-03-20 14:09:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210986 +; + +-- Mar 20, 2014 2:09:26 PM CET +ALTER TABLE AD_UserMail ADD RecipientTo VARCHAR2(2000) DEFAULT NULL +; + +-- Mar 20, 2014 2:10:39 PM CET +INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210987,'b9fd6d34-671a-46cd-8abc-589c0eb256d5',202673,0,10,782,'RecipientCc',TO_DATE('2014-03-20 14:10:38','YYYY-MM-DD HH24:MI:SS'),100,'D','N',2000,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','Cc',0,0,TO_DATE('2014-03-20 14:10:38','YYYY-MM-DD HH24:MI:SS'),100,0) +; + +-- Mar 20, 2014 2:10:41 PM CET +ALTER TABLE AD_UserMail MODIFY RecipientCc VARCHAR2(2000) DEFAULT NULL +; + +-- Mar 20, 2014 2:10:57 PM CET +INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210988,'c9bb532c-3509-4791-a023-55fd661e348c',202674,0,10,782,'RecipientBcc',TO_DATE('2014-03-20 14:10:56','YYYY-MM-DD HH24:MI:SS'),100,'D','N',2000,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','Bcc',0,0,TO_DATE('2014-03-20 14:10:56','YYYY-MM-DD HH24:MI:SS'),100,0) +; + +-- Mar 20, 2014 2:11:00 PM CET +ALTER TABLE AD_UserMail MODIFY RecipientBcc VARCHAR2(2000) DEFAULT NULL +; + +-- Mar 20, 2014 2:12:54 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsDisplayedGrid,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,60533,202691,'76d0d102-0b78-44e9-a041-b38747b69ef0',0,709,2,TO_DATE('2014-03-20 14:12:54','YYYY-MM-DD HH24:MI:SS'),100,36,'D','Y','Y','N','N','N','N','N','N','N','AD_UserMail_UU',120,TO_DATE('2014-03-20 14:12:54','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:12:55 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210985,202692,'dd367b6d-eb5e-44ab-a317-9b73987f4b60',0,709,5,TO_DATE('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100,255,'D','Y','Y','Y','N','N','N','N','N','EMail sent from',130,TO_DATE('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:12:56 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210986,202693,'3aeedc4a-4272-412d-a971-2dc6e0fd7fd1',0,709,5,TO_DATE('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','To',140,TO_DATE('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:12:56 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210987,202694,'70bae5b3-9321-44b9-b645-a3d1533d50c0',0,709,5,TO_DATE('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Cc',150,TO_DATE('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:12:57 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210988,202695,'e41d0273-fcb0-4784-a83b-ca1177532058',0,709,5,TO_DATE('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Bcc',160,TO_DATE('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:13:40 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80, XPosition=1,Updated=TO_DATE('2014-03-20 14:13:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202692 +; + +-- Mar 20, 2014 2:13:40 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90, XPosition=1,Updated=TO_DATE('2014-03-20 14:13:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202693 +; + +-- Mar 20, 2014 2:13:40 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=100, XPosition=1,Updated=TO_DATE('2014-03-20 14:13:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202694 +; + +-- Mar 20, 2014 2:13:41 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=110, XPosition=1,Updated=TO_DATE('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202695 +; + +-- Mar 20, 2014 2:13:41 PM CET +UPDATE AD_Field SET SeqNo=120,Updated=TO_DATE('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12359 +; + +-- Mar 20, 2014 2:13:41 PM CET +UPDATE AD_Field SET SeqNo=130,Updated=TO_DATE('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12358 +; + +-- Mar 20, 2014 2:13:41 PM CET +UPDATE AD_Field SET SeqNo=140,Updated=TO_DATE('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11542 +; + +-- Mar 20, 2014 2:13:41 PM CET +UPDATE AD_Field SET SeqNo=150,Updated=TO_DATE('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11541 +; + +-- Mar 20, 2014 2:13:41 PM CET +UPDATE AD_Field SET SeqNo=0,Updated=TO_DATE('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202691 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=202692 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=202693 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=100,IsDisplayedGrid='Y' WHERE AD_Field_ID=202694 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=110,IsDisplayedGrid='Y' WHERE AD_Field_ID=202695 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=120,IsDisplayedGrid='Y' WHERE AD_Field_ID=12359 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=130,IsDisplayedGrid='Y' WHERE AD_Field_ID=12358 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=140,IsDisplayedGrid='Y' WHERE AD_Field_ID=11542 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=150,IsDisplayedGrid='Y' WHERE AD_Field_ID=11541 +; + +-- Mar 20, 2014 2:14:59 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsDisplayedGrid,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,60533,202696,'ec3f809c-2519-4d75-b1c8-5e553f7fec10',0,53283,2,TO_DATE('2014-03-20 14:14:58','YYYY-MM-DD HH24:MI:SS'),100,36,'D','Y','Y','N','N','N','N','N','N','N','AD_UserMail_UU',120,TO_DATE('2014-03-20 14:14:58','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:14:59 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210985,202697,'6596a658-1014-4f79-8420-099870dfd854',0,53283,5,TO_DATE('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100,255,'D','Y','Y','Y','N','N','N','N','N','EMail sent from',130,TO_DATE('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:15:00 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210986,202698,'120d8134-50a7-4fa8-ab29-7a23f6f324e9',0,53283,5,TO_DATE('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','To',140,TO_DATE('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:15:00 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210987,202699,'48af28b6-9a61-4655-addd-9479206028ae',0,53283,5,TO_DATE('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Cc',150,TO_DATE('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:15:01 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210988,202700,'1c8c16bf-f451-453e-9a85-1b8651733ddf',0,53283,5,TO_DATE('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Bcc',160,TO_DATE('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80, XPosition=1,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202697 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90, XPosition=1,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202698 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=100, XPosition=1,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202699 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=110, XPosition=1,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202700 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET SeqNo=120,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58024 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET SeqNo=130,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58025 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET SeqNo=140,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58026 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET SeqNo=150,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58027 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET SeqNo=0,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202696 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=202697 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=202698 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=100,IsDisplayedGrid='Y' WHERE AD_Field_ID=202699 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=110,IsDisplayedGrid='Y' WHERE AD_Field_ID=202700 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=120,IsDisplayedGrid='Y' WHERE AD_Field_ID=58024 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=130,IsDisplayedGrid='Y' WHERE AD_Field_ID=58025 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=140,IsDisplayedGrid='Y' WHERE AD_Field_ID=58026 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=150,IsDisplayedGrid='Y' WHERE AD_Field_ID=58027 +; + +SELECT register_migration_script('201403201438_IDEMPIERE-1828.sql') FROM dual +; diff --git a/migration/i2.0z/postgresql/201403201438_IDEMPIERE-1828.sql b/migration/i2.0z/postgresql/201403201438_IDEMPIERE-1828.sql new file mode 100644 index 0000000000..a9c545591f --- /dev/null +++ b/migration/i2.0z/postgresql/201403201438_IDEMPIERE-1828.sql @@ -0,0 +1,247 @@ +-- Mar 20, 2014 2:05:38 PM CET +-- IDEMPIERE-1828 +INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202671,'b640b542-2f7a-4885-a212-5c60138d9480',0,'EMailFrom',TO_TIMESTAMP('2014-03-20 14:05:38','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','EMail sent from','EMail sent from',TO_TIMESTAMP('2014-03-20 14:05:38','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:06:01 PM CET +INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202672,'9c423548-1e6b-4899-a179-1304f30adeff',0,'RecipientTo',TO_TIMESTAMP('2014-03-20 14:06:01','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','To','To',TO_TIMESTAMP('2014-03-20 14:06:01','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:06:08 PM CET +INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202673,'6bc347b6-83fd-49e5-b34f-949f7e480baf',0,'RecipientCc',TO_TIMESTAMP('2014-03-20 14:06:08','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Cc','Cc',TO_TIMESTAMP('2014-03-20 14:06:08','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:06:18 PM CET +INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202674,'e79d13ad-54af-4384-9b11-dc86abd1db21',0,'RecipientBcc',TO_TIMESTAMP('2014-03-20 14:06:18','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Bcc','Bcc',TO_TIMESTAMP('2014-03-20 14:06:18','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:06:26 PM CET +UPDATE AD_Element SET EntityType='D',Updated=TO_TIMESTAMP('2014-03-20 14:06:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=202673 +; + +-- Mar 20, 2014 2:08:07 PM CET +INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210985,'63925720-89dc-4245-86e6-770564e34147',202671,0,10,782,'EMailFrom',TO_TIMESTAMP('2014-03-20 14:08:07','YYYY-MM-DD HH24:MI:SS'),100,'D','N',255,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','EMail sent from',0,0,TO_TIMESTAMP('2014-03-20 14:08:07','YYYY-MM-DD HH24:MI:SS'),100,0) +; + +-- Mar 20, 2014 2:08:13 PM CET +ALTER TABLE AD_UserMail ADD COLUMN EMailFrom VARCHAR(255) DEFAULT NULL +; + +-- Mar 20, 2014 2:08:46 PM CET +INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210986,'6dd996b8-5e29-4bef-89b3-694bd8c1c9d6',202674,0,10,782,'RecipientBcc',TO_TIMESTAMP('2014-03-20 14:08:45','YYYY-MM-DD HH24:MI:SS'),100,'D','N',2000,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','Bcc',0,0,TO_TIMESTAMP('2014-03-20 14:08:45','YYYY-MM-DD HH24:MI:SS'),100,0) +; + +-- Mar 20, 2014 2:08:49 PM CET +ALTER TABLE AD_UserMail ADD COLUMN RecipientBcc VARCHAR(2000) DEFAULT NULL +; + +-- Mar 20, 2014 2:09:05 PM CET +UPDATE AD_Column SET AD_Element_ID=202673, ColumnName='RecipientCc', Description=NULL, Help=NULL, Name='Cc',Updated=TO_TIMESTAMP('2014-03-20 14:09:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210986 +; + +-- Mar 20, 2014 2:09:08 PM CET +ALTER TABLE AD_UserMail ADD COLUMN RecipientCc VARCHAR(2000) DEFAULT NULL +; + +-- Mar 20, 2014 2:09:23 PM CET +UPDATE AD_Column SET AD_Element_ID=202672, ColumnName='RecipientTo', Description=NULL, EntityType='D', Help=NULL, Name='To',Updated=TO_TIMESTAMP('2014-03-20 14:09:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210986 +; + +-- Mar 20, 2014 2:09:26 PM CET +ALTER TABLE AD_UserMail ADD COLUMN RecipientTo VARCHAR(2000) DEFAULT NULL +; + +-- Mar 20, 2014 2:10:39 PM CET +INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210987,'b9fd6d34-671a-46cd-8abc-589c0eb256d5',202673,0,10,782,'RecipientCc',TO_TIMESTAMP('2014-03-20 14:10:38','YYYY-MM-DD HH24:MI:SS'),100,'D','N',2000,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','Cc',0,0,TO_TIMESTAMP('2014-03-20 14:10:38','YYYY-MM-DD HH24:MI:SS'),100,0) +; + +-- Mar 20, 2014 2:10:41 PM CET +INSERT INTO t_alter_column values('ad_usermail','RecipientCc','VARCHAR(2000)',null,'NULL') +; + +-- Mar 20, 2014 2:10:57 PM CET +INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210988,'c9bb532c-3509-4791-a023-55fd661e348c',202674,0,10,782,'RecipientBcc',TO_TIMESTAMP('2014-03-20 14:10:56','YYYY-MM-DD HH24:MI:SS'),100,'D','N',2000,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','Bcc',0,0,TO_TIMESTAMP('2014-03-20 14:10:56','YYYY-MM-DD HH24:MI:SS'),100,0) +; + +-- Mar 20, 2014 2:11:00 PM CET +INSERT INTO t_alter_column values('ad_usermail','RecipientBcc','VARCHAR(2000)',null,'NULL') +; + +-- Mar 20, 2014 2:12:54 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsDisplayedGrid,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,60533,202691,'76d0d102-0b78-44e9-a041-b38747b69ef0',0,709,2,TO_TIMESTAMP('2014-03-20 14:12:54','YYYY-MM-DD HH24:MI:SS'),100,36,'D','Y','Y','N','N','N','N','N','N','N','AD_UserMail_UU',120,TO_TIMESTAMP('2014-03-20 14:12:54','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:12:55 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210985,202692,'dd367b6d-eb5e-44ab-a317-9b73987f4b60',0,709,5,TO_TIMESTAMP('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100,255,'D','Y','Y','Y','N','N','N','N','N','EMail sent from',130,TO_TIMESTAMP('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:12:56 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210986,202693,'3aeedc4a-4272-412d-a971-2dc6e0fd7fd1',0,709,5,TO_TIMESTAMP('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','To',140,TO_TIMESTAMP('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:12:56 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210987,202694,'70bae5b3-9321-44b9-b645-a3d1533d50c0',0,709,5,TO_TIMESTAMP('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Cc',150,TO_TIMESTAMP('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:12:57 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210988,202695,'e41d0273-fcb0-4784-a83b-ca1177532058',0,709,5,TO_TIMESTAMP('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Bcc',160,TO_TIMESTAMP('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:13:40 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:13:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202692 +; + +-- Mar 20, 2014 2:13:40 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:13:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202693 +; + +-- Mar 20, 2014 2:13:40 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=100, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:13:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202694 +; + +-- Mar 20, 2014 2:13:41 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=110, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202695 +; + +-- Mar 20, 2014 2:13:41 PM CET +UPDATE AD_Field SET SeqNo=120,Updated=TO_TIMESTAMP('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12359 +; + +-- Mar 20, 2014 2:13:41 PM CET +UPDATE AD_Field SET SeqNo=130,Updated=TO_TIMESTAMP('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12358 +; + +-- Mar 20, 2014 2:13:41 PM CET +UPDATE AD_Field SET SeqNo=140,Updated=TO_TIMESTAMP('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11542 +; + +-- Mar 20, 2014 2:13:41 PM CET +UPDATE AD_Field SET SeqNo=150,Updated=TO_TIMESTAMP('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11541 +; + +-- Mar 20, 2014 2:13:41 PM CET +UPDATE AD_Field SET SeqNo=0,Updated=TO_TIMESTAMP('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202691 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=202692 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=202693 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=100,IsDisplayedGrid='Y' WHERE AD_Field_ID=202694 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=110,IsDisplayedGrid='Y' WHERE AD_Field_ID=202695 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=120,IsDisplayedGrid='Y' WHERE AD_Field_ID=12359 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=130,IsDisplayedGrid='Y' WHERE AD_Field_ID=12358 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=140,IsDisplayedGrid='Y' WHERE AD_Field_ID=11542 +; + +-- Mar 20, 2014 2:14:13 PM CET +UPDATE AD_Field SET SeqNoGrid=150,IsDisplayedGrid='Y' WHERE AD_Field_ID=11541 +; + +-- Mar 20, 2014 2:14:59 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsDisplayedGrid,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,60533,202696,'ec3f809c-2519-4d75-b1c8-5e553f7fec10',0,53283,2,TO_TIMESTAMP('2014-03-20 14:14:58','YYYY-MM-DD HH24:MI:SS'),100,36,'D','Y','Y','N','N','N','N','N','N','N','AD_UserMail_UU',120,TO_TIMESTAMP('2014-03-20 14:14:58','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:14:59 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210985,202697,'6596a658-1014-4f79-8420-099870dfd854',0,53283,5,TO_TIMESTAMP('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100,255,'D','Y','Y','Y','N','N','N','N','N','EMail sent from',130,TO_TIMESTAMP('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:15:00 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210986,202698,'120d8134-50a7-4fa8-ab29-7a23f6f324e9',0,53283,5,TO_TIMESTAMP('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','To',140,TO_TIMESTAMP('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:15:00 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210987,202699,'48af28b6-9a61-4655-addd-9479206028ae',0,53283,5,TO_TIMESTAMP('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Cc',150,TO_TIMESTAMP('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:15:01 PM CET +INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210988,202700,'1c8c16bf-f451-453e-9a85-1b8651733ddf',0,53283,5,TO_TIMESTAMP('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Bcc',160,TO_TIMESTAMP('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100) +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202697 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202698 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=100, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202699 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=110, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202700 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET SeqNo=120,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58024 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET SeqNo=130,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58025 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET SeqNo=140,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58026 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET SeqNo=150,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58027 +; + +-- Mar 20, 2014 2:15:55 PM CET +UPDATE AD_Field SET SeqNo=0,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202696 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=202697 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=202698 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=100,IsDisplayedGrid='Y' WHERE AD_Field_ID=202699 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=110,IsDisplayedGrid='Y' WHERE AD_Field_ID=202700 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=120,IsDisplayedGrid='Y' WHERE AD_Field_ID=58024 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=130,IsDisplayedGrid='Y' WHERE AD_Field_ID=58025 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=140,IsDisplayedGrid='Y' WHERE AD_Field_ID=58026 +; + +-- Mar 20, 2014 2:16:28 PM CET +UPDATE AD_Field SET SeqNoGrid=150,IsDisplayedGrid='Y' WHERE AD_Field_ID=58027 +; + +SELECT register_migration_script('201403201438_IDEMPIERE-1828.sql') FROM dual +; diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_UserMail.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserMail.java index afc98f3aef..156f750708 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_UserMail.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_UserMail.java @@ -128,6 +128,15 @@ public interface I_AD_UserMail */ public String getDeliveryConfirmation(); + /** Column name EMailFrom */ + public static final String COLUMNNAME_EMailFrom = "EMailFrom"; + + /** Set EMail sent from */ + public void setEMailFrom (String EMailFrom); + + /** Get EMail sent from */ + public String getEMailFrom(); + /** Column name IsActive */ public static final String COLUMNNAME_IsActive = "IsActive"; @@ -176,6 +185,33 @@ public interface I_AD_UserMail */ public String getMessageID(); + /** Column name RecipientBcc */ + public static final String COLUMNNAME_RecipientBcc = "RecipientBcc"; + + /** Set Bcc */ + public void setRecipientBcc (String RecipientBcc); + + /** Get Bcc */ + public String getRecipientBcc(); + + /** Column name RecipientCc */ + public static final String COLUMNNAME_RecipientCc = "RecipientCc"; + + /** Set Cc */ + public void setRecipientCc (String RecipientCc); + + /** Get Cc */ + public String getRecipientCc(); + + /** Column name RecipientTo */ + public static final String COLUMNNAME_RecipientTo = "RecipientTo"; + + /** Set To */ + public void setRecipientTo (String RecipientTo); + + /** Get To */ + public String getRecipientTo(); + /** Column name R_MailText_ID */ public static final String COLUMNNAME_R_MailText_ID = "R_MailText_ID"; diff --git a/org.adempiere.base/src/org/compiere/model/MClient.java b/org.adempiere.base/src/org/compiere/model/MClient.java index 51a06cd44d..eea3f1af16 100644 --- a/org.adempiere.base/src/org/compiere/model/MClient.java +++ b/org.adempiere.base/src/org/compiere/model/MClient.java @@ -735,6 +735,11 @@ public class MClient extends X_AD_Client um.setAD_User_ID(to.getAD_User_ID()); um.setSubject(email.getSubject()); um.setMailText(email.getMessageCRLF()); + um.setMailText(email.getMessageCRLF()); + um.setEMailFrom(email.getFrom().toString()); + um.setRecipientTo(MUserMail.getRecipientWithCommaSeparator(email.getTos())); + um.setRecipientCc(MUserMail.getRecipientWithCommaSeparator(email.getCcs())); + um.setRecipientBcc(MUserMail.getRecipientWithCommaSeparator(email.getBccs())); if (email.isSentOK()) um.setMessageID(email.getMessageID()); else diff --git a/org.adempiere.base/src/org/compiere/model/MUserMail.java b/org.adempiere.base/src/org/compiere/model/MUserMail.java index 63f485536c..6b52180bad 100644 --- a/org.adempiere.base/src/org/compiere/model/MUserMail.java +++ b/org.adempiere.base/src/org/compiere/model/MUserMail.java @@ -19,7 +19,10 @@ package org.compiere.model; import java.sql.ResultSet; import java.util.Properties; +import javax.mail.internet.InternetAddress; + import org.compiere.util.EMail; +import org.compiere.util.Env; /** * User Mail Model @@ -31,7 +34,7 @@ public class MUserMail extends X_AD_UserMail /** * */ - private static final long serialVersionUID = -1019980049099249013L; + private static final long serialVersionUID = 925597416692485382L; /** * Standard Constructor @@ -67,6 +70,7 @@ public class MUserMail extends X_AD_UserMail setClientOrg(parent); setAD_User_ID(AD_User_ID); setR_MailText_ID(parent.getR_MailText_ID()); + setSenderAndRecipient(mail); // if (mail.isSentOK()) setMessageID(mail.getMessageID()); @@ -89,6 +93,7 @@ public class MUserMail extends X_AD_UserMail setClientOrg(parent); setAD_User_ID(AD_User_ID); setW_MailMsg_ID(parent.getW_MailMsg_ID()); + setSenderAndRecipient(mail); // if (mail.isSentOK()) setMessageID(mail.getMessageID()); @@ -112,6 +117,24 @@ public class MUserMail extends X_AD_UserMail setAD_User_ID(AD_User_ID); setSubject(mail.getSubject()); setMailText(mail.getMessageCRLF()); + setSenderAndRecipient(mail); + // + if (mail.isSentOK()) + setMessageID(mail.getMessageID()); + else + { + setMessageID(mail.getSentMsg()); + setIsDelivered(ISDELIVERED_No); + } + } // MUserMail + + public MUserMail (Properties ctx, EMail mail) + { + this (ctx, 0, null); + setAD_User_ID(Env.getAD_User_ID(ctx)); + setSubject(mail.getSubject()); + setMailText(mail.getMessageCRLF()); + setSenderAndRecipient(mail); // if (mail.isSentOK()) setMessageID(mail.getMessageID()); @@ -155,4 +178,23 @@ public class MUserMail extends X_AD_UserMail return s == null; } // isDeliveredUnknown + /** Fill sender and recipients fields */ + public void setSenderAndRecipient(EMail mail) + { + setEMailFrom(mail.getFrom().toString()); + setRecipientTo(getRecipientWithCommaSeparator(mail.getTos())); + setRecipientCc(getRecipientWithCommaSeparator(mail.getCcs())); + setRecipientBcc(getRecipientWithCommaSeparator(mail.getBccs())); + } + + static public String getRecipientWithCommaSeparator(InternetAddress[] recipients) + { + StringBuilder retValue = new StringBuilder(""); + if (recipients != null) { + for (InternetAddress ia : recipients) + retValue.append(retValue.length() > 0 ? ", " : "" ).append(ia.getAddress()); + } + return retValue.toString(); + } + } // MUserMail diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java index 4a55e15a62..0606c0d8ae 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java @@ -30,7 +30,7 @@ public class X_AD_UserMail extends PO implements I_AD_UserMail, I_Persistent /** * */ - private static final long serialVersionUID = 20131031L; + private static final long serialVersionUID = 20140716L; /** Standard Constructor */ public X_AD_UserMail (Properties ctx, int AD_UserMail_ID, String trxName) @@ -161,6 +161,20 @@ public class X_AD_UserMail extends PO implements I_AD_UserMail, I_Persistent return (String)get_Value(COLUMNNAME_DeliveryConfirmation); } + /** Set EMail sent from. + @param EMailFrom EMail sent from */ + public void setEMailFrom (String EMailFrom) + { + set_Value (COLUMNNAME_EMailFrom, EMailFrom); + } + + /** Get EMail sent from. + @return EMail sent from */ + public String getEMailFrom () + { + return (String)get_Value(COLUMNNAME_EMailFrom); + } + /** IsDelivered AD_Reference_ID=319 */ public static final int ISDELIVERED_AD_Reference_ID=319; /** Yes = Y */ @@ -216,6 +230,48 @@ public class X_AD_UserMail extends PO implements I_AD_UserMail, I_Persistent return (String)get_Value(COLUMNNAME_MessageID); } + /** Set Bcc. + @param RecipientBcc Bcc */ + public void setRecipientBcc (String RecipientBcc) + { + set_Value (COLUMNNAME_RecipientBcc, RecipientBcc); + } + + /** Get Bcc. + @return Bcc */ + public String getRecipientBcc () + { + return (String)get_Value(COLUMNNAME_RecipientBcc); + } + + /** Set Cc. + @param RecipientCc Cc */ + public void setRecipientCc (String RecipientCc) + { + set_Value (COLUMNNAME_RecipientCc, RecipientCc); + } + + /** Get Cc. + @return Cc */ + public String getRecipientCc () + { + return (String)get_Value(COLUMNNAME_RecipientCc); + } + + /** Set To. + @param RecipientTo To */ + public void setRecipientTo (String RecipientTo) + { + set_Value (COLUMNNAME_RecipientTo, RecipientTo); + } + + /** Get To. + @return To */ + public String getRecipientTo () + { + return (String)get_Value(COLUMNNAME_RecipientTo); + } + public org.compiere.model.I_R_MailText getR_MailText() throws RuntimeException { return (org.compiere.model.I_R_MailText)MTable.get(getCtx(), org.compiere.model.I_R_MailText.Table_Name) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java index 6f42ca31af..51b16ac8f6 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java @@ -521,6 +521,8 @@ public class WEMailDialog extends Window implements EventListener, ValueC // if (m_user != null) new MUserMail(m_user, m_user.getAD_User_ID(), email).saveEx(); + else + new MUserMail(Env.getCtx(), email).saveEx(); if (email.isSentOK()) { FDialog.info(0, this, "MessageSent"); From d28d1e2c82c1af1683bef3d0b5f8ffb895107b14 Mon Sep 17 00:00:00 2001 From: jan thielemann Date: Wed, 16 Jul 2014 10:21:55 -0500 Subject: [PATCH 12/21] IDEMPIERE-1851 New Parameter for "Create Fields" process on Window, Tab and Field > Tab + Patch --- .../oracle/201407161014_IDEMPIERE-1851.sql | 21 ++++++++++++ .../201407161014_IDEMPIERE-1851.sql | 18 ++++++++++ .../org/compiere/process/TabCreateFields.java | 34 +++++++++++++++++-- 3 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 migration/i2.0z/oracle/201407161014_IDEMPIERE-1851.sql create mode 100644 migration/i2.0z/postgresql/201407161014_IDEMPIERE-1851.sql diff --git a/migration/i2.0z/oracle/201407161014_IDEMPIERE-1851.sql b/migration/i2.0z/oracle/201407161014_IDEMPIERE-1851.sql new file mode 100644 index 0000000000..9d89b4b759 --- /dev/null +++ b/migration/i2.0z/oracle/201407161014_IDEMPIERE-1851.sql @@ -0,0 +1,21 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Mar 24, 2014 2:07:01 PM CET +-- https://idempiere.atlassian.net/browse/IDEMPIERE-1851 +INSERT INTO AD_Process_Para (IsRange,AD_Element_ID,AD_Process_Para_ID,AD_Process_Para_UU,Help,AD_Reference_ID,IsMandatory,EntityType,Name,ColumnName,Description,FieldLength,IsCentrallyMaintained,SeqNo,IsActive,UpdatedBy,Updated,CreatedBy,Created,AD_Org_ID,IsEncrypted,AD_Client_ID,AD_Process_ID,AD_Reference_Value_ID) VALUES ('N',1682,200076,'e9ad57d5-86b3-45a1-bd01-6b4079b31a10','The Entity Types "Dictionary", "iDempiere" and "Application" might be automatically synchronized and customizations deleted or overwritten. + +For customizations, copy the entity and select "User"!',18,'N','D','Entity Type','EntityType','Dictionary Entity Type; Determines ownership and synchronization',0,'Y',10,'Y',100,TO_DATE('2014-03-24 14:07:00','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2014-03-24 14:07:00','YYYY-MM-DD HH24:MI:SS'),0,'N',0,174,389) +; + +-- Mar 24, 2014 2:08:12 PM CET +INSERT INTO AD_Process_Para (IsRange,AD_Process_Para_ID,AD_Process_Para_UU,AD_Reference_ID,IsMandatory,EntityType,Name,ColumnName,FieldLength,IsCentrallyMaintained,SeqNo,IsActive,UpdatedBy,Updated,CreatedBy,Created,AD_Org_ID,IsEncrypted,AD_Client_ID,AD_Process_ID) VALUES ('N',200077,'5cc8670c-0715-4351-9c5e-760f902f6ef6',16,'N','D','CreatedSince','CreatedSince',7,'N',20,'Y',100,TO_DATE('2014-03-24 14:08:11','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2014-03-24 14:08:11','YYYY-MM-DD HH24:MI:SS'),0,'N',0,174) +; + +-- Mar 24, 2014 2:08:24 PM CET +UPDATE AD_Process_Para SET Name='Created Since',Updated=TO_DATE('2014-03-24 14:08:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200077 +; + +SELECT register_migration_script('201407161014_IDEMPIERE-1851.sql') FROM dual +; + diff --git a/migration/i2.0z/postgresql/201407161014_IDEMPIERE-1851.sql b/migration/i2.0z/postgresql/201407161014_IDEMPIERE-1851.sql new file mode 100644 index 0000000000..d412fefcda --- /dev/null +++ b/migration/i2.0z/postgresql/201407161014_IDEMPIERE-1851.sql @@ -0,0 +1,18 @@ +-- Mar 24, 2014 2:07:01 PM CET +-- https://idempiere.atlassian.net/browse/IDEMPIERE-1851 +INSERT INTO AD_Process_Para (IsRange,AD_Element_ID,AD_Process_Para_ID,AD_Process_Para_UU,Help,AD_Reference_ID,IsMandatory,EntityType,Name,ColumnName,Description,FieldLength,IsCentrallyMaintained,SeqNo,IsActive,UpdatedBy,Updated,CreatedBy,Created,AD_Org_ID,IsEncrypted,AD_Client_ID,AD_Process_ID,AD_Reference_Value_ID) VALUES ('N',1682,200076,'e9ad57d5-86b3-45a1-bd01-6b4079b31a10','The Entity Types "Dictionary", "iDempiere" and "Application" might be automatically synchronized and customizations deleted or overwritten. + +For customizations, copy the entity and select "User"!',18,'N','D','Entity Type','EntityType','Dictionary Entity Type; Determines ownership and synchronization',0,'Y',10,'Y',100,TO_TIMESTAMP('2014-03-24 14:07:00','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2014-03-24 14:07:00','YYYY-MM-DD HH24:MI:SS'),0,'N',0,174,389) +; + +-- Mar 24, 2014 2:08:12 PM CET +INSERT INTO AD_Process_Para (IsRange,AD_Process_Para_ID,AD_Process_Para_UU,AD_Reference_ID,IsMandatory,EntityType,Name,ColumnName,FieldLength,IsCentrallyMaintained,SeqNo,IsActive,UpdatedBy,Updated,CreatedBy,Created,AD_Org_ID,IsEncrypted,AD_Client_ID,AD_Process_ID) VALUES ('N',200077,'5cc8670c-0715-4351-9c5e-760f902f6ef6',16,'N','D','CreatedSince','CreatedSince',7,'N',20,'Y',100,TO_TIMESTAMP('2014-03-24 14:08:11','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2014-03-24 14:08:11','YYYY-MM-DD HH24:MI:SS'),0,'N',0,174) +; + +-- Mar 24, 2014 2:08:24 PM CET +UPDATE AD_Process_Para SET Name='Created Since',Updated=TO_TIMESTAMP('2014-03-24 14:08:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200077 +; + +SELECT register_migration_script('201407161014_IDEMPIERE-1851.sql') FROM dual +; + diff --git a/org.adempiere.base.process/src/org/compiere/process/TabCreateFields.java b/org.adempiere.base.process/src/org/compiere/process/TabCreateFields.java index e5bc1ff033..e4d7239cf4 100644 --- a/org.adempiere.base.process/src/org/compiere/process/TabCreateFields.java +++ b/org.adempiere.base.process/src/org/compiere/process/TabCreateFields.java @@ -18,6 +18,7 @@ package org.compiere.process; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.sql.Timestamp; import java.util.logging.Level; import org.compiere.model.MColumn; @@ -28,6 +29,7 @@ import org.compiere.model.PO; import org.compiere.util.AdempiereSystemError; import org.compiere.util.DB; import org.compiere.util.DisplayType; +import org.compiere.util.Util; /** @@ -47,14 +49,29 @@ import org.compiere.util.DisplayType; */ public class TabCreateFields extends SvrProcess { - /** Tab NUmber */ + /** Tab Number */ private int p_AD_Tab_ID= 0; + private String p_EntityType = null; + private Timestamp p_CreatedSince = null; /** * prepare */ protected void prepare () { + ProcessInfoParameter[] para = getParameter(); + for (int i = 0; i < para.length; i++) + { + String name = para[i].getParameterName(); + if (para[i].getParameter() == null) + ; + else if (name.equals("EntityType")) + p_EntityType = (String)para[i].getParameter(); + else if (name.equals("CreatedSince")) + p_CreatedSince = para[i].getParameterAsTimestamp(); + else + log.log(Level.SEVERE, "Unknown Parameter: " + name); + } p_AD_Tab_ID = getRecord_ID(); } // prepare @@ -78,8 +95,14 @@ public class TabCreateFields extends SvrProcess + " AND f.AD_Tab_ID=?)" // #2 + " AND AD_Table_ID=?" // #3 + " AND NOT (Name LIKE 'Created%' OR Name LIKE 'Updated%')" - + " AND IsActive='Y' " - + "ORDER BY CASE " + + " AND IsActive='Y' "; + + if(!Util.isEmpty(p_EntityType)) + sql += " AND c.entitytype = ?"; + if(p_CreatedSince != null) + sql += " AND c.created >= ? "; + + sql += "ORDER BY CASE " + " WHEN c.ColumnName = 'AD_Client_ID' THEN -100 " + " WHEN c.ColumnName = 'AD_Org_ID' THEN -90 " + " WHEN c.ColumnName = 'Value' THEN -80 " @@ -101,6 +124,11 @@ public class TabCreateFields extends SvrProcess pstmt.setInt (1, tab.getAD_Table_ID()); pstmt.setInt (2, tab.getAD_Tab_ID()); pstmt.setInt (3, tab.getAD_Table_ID()); + int i = 4; + if(!Util.isEmpty(p_EntityType)) + pstmt.setString(i++, p_EntityType); + if(p_CreatedSince != null) + pstmt.setTimestamp(i++, p_CreatedSince); rs = pstmt.executeQuery (); String uuidcolname = PO.getUUIDColumnName(tab.getAD_Table().getTableName()); while (rs.next ()) From b71367607cefa79ad9f1f6af01fcd21fa400e9d7 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 16 Jul 2014 10:23:51 -0500 Subject: [PATCH 13/21] IDEMPIERE-2055 Changed Constraints for Web Service Security / move scripts to correct folder --- migration/{i2.0 => i2.0z}/oracle/201407160833_IDEMPIERE-2055.sql | 0 .../{i2.0 => i2.0z}/postgresql/201407160833_IDEMPIERE-2055.sql | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename migration/{i2.0 => i2.0z}/oracle/201407160833_IDEMPIERE-2055.sql (100%) rename migration/{i2.0 => i2.0z}/postgresql/201407160833_IDEMPIERE-2055.sql (100%) diff --git a/migration/i2.0/oracle/201407160833_IDEMPIERE-2055.sql b/migration/i2.0z/oracle/201407160833_IDEMPIERE-2055.sql similarity index 100% rename from migration/i2.0/oracle/201407160833_IDEMPIERE-2055.sql rename to migration/i2.0z/oracle/201407160833_IDEMPIERE-2055.sql diff --git a/migration/i2.0/postgresql/201407160833_IDEMPIERE-2055.sql b/migration/i2.0z/postgresql/201407160833_IDEMPIERE-2055.sql similarity index 100% rename from migration/i2.0/postgresql/201407160833_IDEMPIERE-2055.sql rename to migration/i2.0z/postgresql/201407160833_IDEMPIERE-2055.sql From d76ac082e268cabc8ed3a57f41f2586cd90022c8 Mon Sep 17 00:00:00 2001 From: hieplq Date: Wed, 16 Jul 2014 11:27:45 -0500 Subject: [PATCH 14/21] IDEMPIERE-1970:Improve t_selection logic for info window --- .../oracle/201406061604_IDEMPIERE-1970.sql | 36 +++++ .../201406061604_IDEMPIERE-1970.sql | 32 ++++ .../src/org/adempiere/model/MInfoProcess.java | 24 +++ .../org/compiere/model/I_AD_InfoProcess.java | 15 ++ .../org/compiere/model/X_AD_InfoProcess.java | 30 +++- .../src/org/compiere/util/DB.java | 53 +++++++ .../src/test/functional/QueryTest.java | 18 ++- .../webui/component/WListItemRenderer.java | 3 + .../adempiere/webui/component/WListbox.java | 6 + .../org/adempiere/webui/info/InfoWindow.java | 74 ++++++--- .../org/adempiere/webui/panel/InfoPanel.java | 147 +++++++++++++++++- 11 files changed, 407 insertions(+), 31 deletions(-) create mode 100644 migration/i2.0z/oracle/201406061604_IDEMPIERE-1970.sql create mode 100644 migration/i2.0z/postgresql/201406061604_IDEMPIERE-1970.sql diff --git a/migration/i2.0z/oracle/201406061604_IDEMPIERE-1970.sql b/migration/i2.0z/oracle/201406061604_IDEMPIERE-1970.sql new file mode 100644 index 0000000000..214aba1f42 --- /dev/null +++ b/migration/i2.0z/oracle/201406061604_IDEMPIERE-1970.sql @@ -0,0 +1,36 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Jun 6, 2014 7:41:43 PM ICT +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,IsSecure,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID,AD_Val_Rule_ID) VALUES (0,'N',0,211377,'N','N','N',0,'N',22,'N','N','N','Y','eff69801-5afa-4898-bc2b-c02e2ad4f94d','Y','AD_Column_ID','Column in the table','Link to the database column of the table','Column','Y',TO_DATE('2014-06-06 19:41:33','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2014-06-06 19:41:33','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N','N','N',104,19,200129,100) +; + +-- Jun 6, 2014 7:43:12 PM ICT +UPDATE AD_Column SET Description='Name of unique column in a view. value of this column will save to t_selection table', Help='Column to resolve issue in https://idempiere.atlassian.net/browse/IDEMPIERE-1970', Name='ViewID Column', FKConstraintName='ADColumn_ADInfoProcess',Updated=TO_DATE('2014-06-06 19:43:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=211377 +; + +-- Jun 6, 2014 7:43:23 PM ICT +ALTER TABLE AD_InfoProcess ADD AD_Column_ID NUMBER(10) DEFAULT NULL +; + +-- Jun 6, 2014 7:43:23 PM ICT +ALTER TABLE AD_InfoProcess ADD CONSTRAINT ADColumn_ADInfoProcess FOREIGN KEY (AD_Column_ID) REFERENCES ad_column(ad_column_id) DEFERRABLE INITIALLY DEFERRED +; + +-- Jun 6, 2014 7:45:32 PM ICT +INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,Created) VALUES (0,'N',200142,0,'N','N',100,'N',203108,'N','Column to resolve issue in https://idempiere.atlassian.net/browse/IDEMPIERE-1970','Name of unique column in a view. value of this column will save to t_selection table','ViewID Column','5aacf0a1-baba-4bab-9b24-047b538a6f5d','Y','N',100,0,100,TO_DATE('2014-06-06 19:45:26','YYYY-MM-DD HH24:MI:SS'),'Y','Y',70,1,'N',0,1,1,'N','N',211377,'D',TO_DATE('2014-06-06 19:45:26','YYYY-MM-DD HH24:MI:SS')) +; + +-- Jun 6, 2014 7:46:32 PM ICT +UPDATE AD_Field SET SeqNo=80, IsDisplayed='Y', XPosition=4, ColumnSpan=2,Updated=TO_DATE('2014-06-06 19:46:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203108 +; + +-- Jun 6, 2014 7:46:32 PM ICT +UPDATE AD_Field SET SeqNo=100, IsDisplayed='Y', XPosition=2,Updated=TO_DATE('2014-06-06 19:46:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203038 +; +ALTER TABLE t_selection ADD ViewID VARCHAR2(30) DEFAULT NULL +; +SELECT register_migration_script('201406061604_IDEMPIERE-1970.sql') FROM dual +; + diff --git a/migration/i2.0z/postgresql/201406061604_IDEMPIERE-1970.sql b/migration/i2.0z/postgresql/201406061604_IDEMPIERE-1970.sql new file mode 100644 index 0000000000..611fbcc91d --- /dev/null +++ b/migration/i2.0z/postgresql/201406061604_IDEMPIERE-1970.sql @@ -0,0 +1,32 @@ +-- Jun 6, 2014 7:41:43 PM ICT +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,IsSecure,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID,AD_Val_Rule_ID) VALUES (0,'N',0,211377,'N','N','N',0,'N',22,'N','N','N','Y','eff69801-5afa-4898-bc2b-c02e2ad4f94d','Y','AD_Column_ID','Column in the table','Link to the database column of the table','Column','Y',TO_TIMESTAMP('2014-06-06 19:41:33','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2014-06-06 19:41:33','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N','N','N',104,19,200129,100) +; + +-- Jun 6, 2014 7:43:12 PM ICT +UPDATE AD_Column SET Description='Name of unique column in a view. value of this column will save to t_selection table', Help='Column to resolve issue in https://idempiere.atlassian.net/browse/IDEMPIERE-1970', Name='ViewID Column', FKConstraintName='ADColumn_ADInfoProcess',Updated=TO_TIMESTAMP('2014-06-06 19:43:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=211377 +; + +-- Jun 6, 2014 7:43:23 PM ICT +ALTER TABLE AD_InfoProcess ADD COLUMN AD_Column_ID NUMERIC(10) DEFAULT NULL +; + +-- Jun 6, 2014 7:43:23 PM ICT +ALTER TABLE AD_InfoProcess ADD CONSTRAINT ADColumn_ADInfoProcess FOREIGN KEY (AD_Column_ID) REFERENCES ad_column(ad_column_id) DEFERRABLE INITIALLY DEFERRED +; + +-- Jun 6, 2014 7:45:32 PM ICT +INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,Created) VALUES (0,'N',200142,0,'N','N',100,'N',203108,'N','Column to resolve issue in https://idempiere.atlassian.net/browse/IDEMPIERE-1970','Name of unique column in a view. value of this column will save to t_selection table','ViewID Column','5aacf0a1-baba-4bab-9b24-047b538a6f5d','Y','N',100,0,100,TO_TIMESTAMP('2014-06-06 19:45:26','YYYY-MM-DD HH24:MI:SS'),'Y','Y',70,1,'N',0,1,1,'N','N',211377,'D',TO_TIMESTAMP('2014-06-06 19:45:26','YYYY-MM-DD HH24:MI:SS')) +; + +-- Jun 6, 2014 7:46:32 PM ICT +UPDATE AD_Field SET SeqNo=80, IsDisplayed='Y', XPosition=4, ColumnSpan=2,Updated=TO_TIMESTAMP('2014-06-06 19:46:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203108 +; + +-- Jun 6, 2014 7:46:32 PM ICT +UPDATE AD_Field SET SeqNo=100, IsDisplayed='Y', XPosition=2,Updated=TO_TIMESTAMP('2014-06-06 19:46:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=203038 +; +ALTER TABLE t_selection ADD COLUMN ViewID character varying(30) +; +SELECT register_migration_script('201406061604_IDEMPIERE-1970.sql') FROM dual +; diff --git a/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java b/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java index 1934a076e4..2a6c7e57a0 100644 --- a/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java +++ b/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java @@ -16,6 +16,7 @@ package org.adempiere.model; import java.sql.ResultSet; import java.util.Properties; import java.util.logging.Level; +import org.compiere.model.MColumn; import org.compiere.model.MProcess; import org.compiere.model.X_AD_InfoProcess; import org.compiere.util.Env; @@ -56,6 +57,8 @@ public class MInfoProcess extends X_AD_InfoProcess { } + protected String m_viewIDName; + /************************************************************************** * Is the Column Visible ? Evaluater base in display logic expression and context of this po * @return true, if visible @@ -86,4 +89,25 @@ public class MInfoProcess extends X_AD_InfoProcess { return retValue; } + /** + * name of column define is ViewID + * @return + */ + public String getViewIDName (){ + // no column define + if (getAD_Column_ID() == 0) + return null; + + // return cache value + if (m_viewIDName != null) + return m_viewIDName; + + MColumn viewIDColumn = (MColumn)getAD_Column(); + if (viewIDColumn != null){ + return viewIDColumn.getColumnName(); +} + + return null; + } + } diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_InfoProcess.java b/org.adempiere.base/src/org/compiere/model/I_AD_InfoProcess.java index 9adeeda0ef..da0c5bfbba 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_InfoProcess.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_InfoProcess.java @@ -49,6 +49,21 @@ public interface I_AD_InfoProcess */ public int getAD_Client_ID(); + /** Column name AD_Column_ID */ + public static final String COLUMNNAME_AD_Column_ID = "AD_Column_ID"; + + /** Set ViewID Column. + * Name of unique column in a view. value of this column will save to t_selection table + */ + public void setAD_Column_ID (int AD_Column_ID); + + /** Get ViewID Column. + * Name of unique column in a view. value of this column will save to t_selection table + */ + public int getAD_Column_ID(); + + public org.compiere.model.I_AD_Column getAD_Column() throws RuntimeException; + /** Column name AD_InfoProcess_ID */ public static final String COLUMNNAME_AD_InfoProcess_ID = "AD_InfoProcess_ID"; diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java index a88e564dce..0003f046d5 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java @@ -30,7 +30,7 @@ public class X_AD_InfoProcess extends PO implements I_AD_InfoProcess, I_Persiste /** * */ - private static final long serialVersionUID = 20140531L; + private static final long serialVersionUID = 20140606L; /** Standard Constructor */ public X_AD_InfoProcess (Properties ctx, int AD_InfoProcess_ID, String trxName) @@ -76,6 +76,34 @@ public class X_AD_InfoProcess extends PO implements I_AD_InfoProcess, I_Persiste return sb.toString(); } + public org.compiere.model.I_AD_Column getAD_Column() throws RuntimeException + { + return (org.compiere.model.I_AD_Column)MTable.get(getCtx(), org.compiere.model.I_AD_Column.Table_Name) + .getPO(getAD_Column_ID(), get_TrxName()); } + + /** Set ViewID Column. + @param AD_Column_ID + Name of unique column in a view. value of this column will save to t_selection table + */ + public void setAD_Column_ID (int AD_Column_ID) + { + if (AD_Column_ID < 1) + set_Value (COLUMNNAME_AD_Column_ID, null); + else + set_Value (COLUMNNAME_AD_Column_ID, Integer.valueOf(AD_Column_ID)); + } + + /** Get ViewID Column. + @return Name of unique column in a view. value of this column will save to t_selection table + */ + public int getAD_Column_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_AD_Column_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set Info Process. @param AD_InfoProcess_ID Info Process */ public void setAD_InfoProcess_ID (int AD_InfoProcess_ID) diff --git a/org.adempiere.base/src/org/compiere/util/DB.java b/org.adempiere.base/src/org/compiere/util/DB.java index d8a2ac7d7a..5ea1e72ae8 100644 --- a/org.adempiere.base/src/org/compiere/util/DB.java +++ b/org.adempiere.base/src/org/compiere/util/DB.java @@ -34,6 +34,7 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.logging.Level; @@ -2291,6 +2292,8 @@ public final class DB /** * Create persistent selection in T_Selection table + * remain this function for backward compatibility. + * refer: IDEMPIERE-1970 * @param AD_PInstance_ID * @param selection * @param trxName @@ -2325,6 +2328,56 @@ public final class DB } } + /** + * Create persistent selection in T_Selection table + * saveKeys is map with key is rowID, value is list value of all viewID + * viewIDIndex is index of viewID need save. + * @param AD_PInstance_ID + * @param selection + * @param trxName + */ + public static void createT_Selection(int AD_PInstance_ID, Map> saveKeys, int viewIDIndex, String trxName) + { + StringBuilder insert = new StringBuilder(); + insert.append("INSERT INTO T_SELECTION(AD_PINSTANCE_ID, T_SELECTION_ID, ViewID) "); + int counter = 0; + for(Integer selectedId : saveKeys.keySet()) + { + counter++; + if (counter > 1) + insert.append(" UNION "); + insert.append("SELECT "); + insert.append(AD_PInstance_ID); + insert.append(", "); + insert.append(selectedId); + insert.append(", "); + + List viewIDValues = saveKeys.get(selectedId); + // when no process have viewID or this process have no viewID or value of viewID is null + if (viewIDValues == null || viewIDIndex < 0 || viewIDValues.get(viewIDIndex) == null){ + insert.append("NULL"); + }else{ + insert.append("'"); + insert.append(viewIDValues.get(viewIDIndex)); + insert.append("'"); + } + + insert.append(" FROM DUAL "); + + if (counter >= 1000) + { + DB.executeUpdateEx(insert.toString(), trxName); + insert = new StringBuilder(); + insert.append("INSERT INTO T_SELECTION(AD_PINSTANCE_ID, T_SELECTION_ID, ViewID) "); + counter = 0; + } + } + if (counter > 0) + { + DB.executeUpdateEx(insert.toString(), trxName); + } + } + private static boolean m_isUUIDVerified = false; private static boolean m_isUUIDSupported = false; /*** diff --git a/org.adempiere.extend/src/test/functional/QueryTest.java b/org.adempiere.extend/src/test/functional/QueryTest.java index 61cb02ef8b..1be6f76fcf 100644 --- a/org.adempiere.extend/src/test/functional/QueryTest.java +++ b/org.adempiere.extend/src/test/functional/QueryTest.java @@ -14,9 +14,10 @@ package test.functional; import java.sql.Timestamp; -import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import org.adempiere.exceptions.DBException; import org.compiere.model.MTable; @@ -286,11 +287,11 @@ public class QueryTest extends AdempiereTestCase assertTrue(AD_PInstance_ID > 0); // Create selection list - List elements = new ArrayList(); - elements.add(102); // AD_Element_ID=102 => AD_Client_ID - elements.add(104); // AD_Element_ID=104 => AD_Column_ID + Map> elements = new HashMap> (); + elements.put(102, null); // AD_Element_ID=102 => AD_Client_ID + elements.put(104, null); // AD_Element_ID=104 => AD_Column_ID DB.executeUpdateEx("DELETE FROM T_Selection WHERE AD_PInstance_ID="+AD_PInstance_ID, getTrxName()); - DB.createT_Selection(AD_PInstance_ID, elements, getTrxName()); + DB.createT_Selection(AD_PInstance_ID, elements, 0, getTrxName()); String whereClause = "1=1"; // some dummy where clause int[] ids = new Query(getCtx(), X_AD_Element.Table_Name, whereClause, getTrxName()) @@ -299,9 +300,12 @@ public class QueryTest extends AdempiereTestCase .getIDs(); assertEquals("Resulting number of elements differ", elements.size(), ids.length); - for (int i = 0; i < elements.size(); i++) + Integer[] keys = new Integer[elements.keySet().size()]; + keys = elements.keySet().toArray(keys); + + for (int i = 0; i < keys .length; i++) { - int expected = elements.get(i); + int expected = keys[i]; assertEquals("Element "+i+" not equals", expected, ids[i]); } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java index 200a4244ad..52d34ba87b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java @@ -178,6 +178,9 @@ public class WListItemRenderer implements ListitemRenderer, EventListene listcell.setParent(item); listcell.addEventListener(Events.ON_DOUBLE_CLICK, cellListener); colIndex++; + // just render column in list m_tableColumns + if (m_tableColumns != null && m_tableColumns.size() == colIndex) + break; } return; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java index e4e8ce0c88..ef04eaffbc 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java @@ -1135,6 +1135,12 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis //no op } + /** + * TODO:in theory column of model maybe not map with column of view + * in case set other data model this function always return number of column of model, + * maybe not equal with number of column of view + * so it should is m_layout.length + */ public int getColumnCount() { return getModel() != null ? getModel().getNoColumns() : 0; } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java index da3d70daec..2867b122b9 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java @@ -122,26 +122,6 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL private List gridFields; private int AD_InfoWindow_ID; private Checkbox checkAND; - /** - * All info process of this infoWindow - */ - protected MInfoProcess [] infoProcessList; - /** - * flag detect exists info process - */ - protected boolean haveProcess = false; - /** - * Info process have style is button - */ - protected List infoProcessBtList; - /** - * Info process have style is drop down list - */ - protected List infoProcessDropList; - /** - * Info process have style is menu - */ - protected List infoProcessMenuList; /** * Menu contail process menu item */ @@ -903,6 +883,8 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL } } + addViewIDToQuery(); + if (m_sqlMain.length() > 0 && infoWindow.isDistinct()) { m_sqlMain = m_sqlMain.substring("SELECT ".length()); m_sqlMain = "SELECT DISTINCT " + m_sqlMain; @@ -918,6 +900,58 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL } } + /** + * add all ViewID in each MInfoProcess to query + * if main query have subquery in SELECT, it will beak or incorrect + */ + protected void addViewIDToQuery () { + + if (m_sqlMain.length() > 0 && infoProcessList != null && infoProcessList.length > 0){ + int fromIndex = m_sqlMain.indexOf("FROM"); + // split Select and from clause + String selectClause = m_sqlMain.substring(0, fromIndex); + String fromClause = m_sqlMain.substring(fromIndex); + + // get alias of main table + String alias = getTableName(); + StringBuilder sqlBuilder = new StringBuilder(selectClause); + + // reset flag relate viewID to recount + numOfViewID = 0; + isHasViewID = false; + + // add View_ID column to select clause + for (MInfoProcess infoProcess : infoProcessList){ + String columnInQuery = infoProcess.getViewIDName(); + // this process hasn't viewID column, next other infoProcess + if (columnInQuery == null) + continue; + + // add alias of main table to column + columnInQuery = alias + "." + columnInQuery; + + // maintain varial relate to ViewID, it can init just one time when load infoWindow define + // but let it here for simple logic control + numOfViewID++; + isHasViewID = true; + + // if query is include this viewID column, not need add + if (sqlBuilder.toString().toLowerCase().contains(columnInQuery.toLowerCase())){ + continue; + } + + // add column to SELECT clause of main sql + sqlBuilder.append(", "); + sqlBuilder.append (columnInQuery); + sqlBuilder.append(" "); + } + + sqlBuilder.append(fromClause); + // update main sql + m_sqlMain = sqlBuilder.toString(); + } + } + protected void renderWindow() { setTitle(infoWindow.get_Translation("Name")); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java index 4b19d07b6d..5df2b94152 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java @@ -33,6 +33,7 @@ import java.util.Map; import java.util.Vector; import java.util.logging.Level; +import org.adempiere.model.MInfoProcess; import org.adempiere.webui.AdempiereWebUI; import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.apps.BusyDialog; @@ -322,6 +323,39 @@ public abstract class InfoPanel extends Window implements EventListener, protected List prevQueryOperators = null; private static final String[] lISTENER_EVENTS = {}; + /** + * All info process of this infoWindow + */ + protected MInfoProcess [] infoProcessList; + /** + * flag detect exists info process + */ + protected boolean haveProcess = false; + /** + * Info process have style is button + */ + protected List infoProcessBtList; + /** + * Info process have style is drop down list + */ + protected List infoProcessDropList; + /** + * Info process have style is menu + */ + protected List infoProcessMenuList; + /** + * save selected id and viewID + */ + protected Map> m_viewIDMap = new HashMap>(); + /** + * flag indicate have infoOProcess define ViewID + */ + protected boolean isHasViewID = false; + /** + * number of infoProcess contain ViewID + */ + protected int numOfViewID = 0; + /** * IDEMPIERE-1334 * button and combobox when layout process button as dropdow list @@ -375,7 +409,6 @@ public abstract class InfoPanel extends Window implements EventListener, m_sqlOrder = " ORDER BY " + orderBy; } // prepareTable - /************************************************************************** * Execute Query */ @@ -472,6 +505,34 @@ public abstract class InfoPanel extends Window implements EventListener, data.add(value); } line.add(data); + + readViewID(rs, data); + } + + /** + * save all viewID to end of data line + * when override readData(ResultSet rs), consider call this method + * IDEMPIERE-1970 + */ + protected void readViewID(ResultSet rs, List data) throws SQLException { + if (infoProcessList == null || infoProcessList.length == 0){ + return; + } + + // with each process have viewID, read it form resultSet by name + for (MInfoProcess infoProcess : infoProcessList){ + if (infoProcess.getAD_Column_ID() == 0){ + continue; + } + + String viewIDSql = infoProcess.getViewIDName(); + String viewIDValue = rs.getString(viewIDSql); + if (rs.wasNull()){ + data.add(null); + }else{ + data.add(viewIDValue); + } + } } protected void renderItems() @@ -762,10 +823,11 @@ public abstract class InfoPanel extends Window implements EventListener, return; if (log.isLoggable(Level.CONFIG)) log.config( "OK=" + m_ok); + // clear prev selected result + m_results.clear(); if (!m_ok) // did not press OK { - m_results.clear(); contentPanel = null; this.detach(); return; @@ -851,6 +913,7 @@ public abstract class InfoPanel extends Window implements EventListener, /** * Get selected Keys as Collection + * @deprecated use getSaveKeys * @return selected keys (Integers) */ public Collection getSelectedKeysCollection() @@ -862,6 +925,66 @@ public abstract class InfoPanel extends Window implements EventListener, return m_results; } + /** + * Save selected id, viewID of all process to map viewIDMap to save into T_Selection + */ + public Map> getSaveKeys (){ + // clear result from prev time + m_viewIDMap.clear(); + + if (p_multipleSelection) + { + int[] rows = contentPanel.getSelectedIndices(); + + // this flag to just check key column in first record + boolean isCheckedKeyType = false; + + for (int row = 0; row < rows.length; row++) + { + // get key data column + Object keyData = contentPanel.getModel().getValueAt(rows[row], contentPanel.getKeyColumnIndex()); + + // check key data must is IDColumn + if (!isCheckedKeyType){ + if (keyData instanceof IDColumn){ + isCheckedKeyType = true; + }else{ + log.severe("For multiple selection, IDColumn should be key column for selection"); + break; + } + } + + IDColumn dataColumn = (IDColumn)keyData; + + if (isHasViewID){ + // have viewID, get it + List viewIDValueList = new ArrayList (); + String viewIDValue = null; + for (int viewIDIndex = 0; viewIDIndex < numOfViewID; viewIDIndex++){ + // get row data from model + @SuppressWarnings("unchecked") + List selectedRowData = (List)contentPanel.getModel().get(rows[row]); + // view data store at end of data line + viewIDValue = (String)selectedRowData.get (contentPanel.getLayout().length + viewIDIndex); + viewIDValueList.add(viewIDValue); + } + + m_viewIDMap.put(dataColumn.getRecord_ID(), viewIDValueList); + }else{ + // hasn't viewID, set viewID value collection is null + m_viewIDMap.put(dataColumn.getRecord_ID(), null); + } + + } + + return m_viewIDMap; + }else{ + // never has this case, because when have process, p_multipleSelection always is true + return null; + } + + } + /** * Get selected Keys * @return selected keys (Integers) @@ -1311,7 +1434,7 @@ public abstract class InfoPanel extends Window implements EventListener, ProcessModalDialog processModalDialog = (ProcessModalDialog)event.getTarget(); if (DialogEvents.ON_BEFORE_RUN_PROCESS.equals(event.getName())){ // store in T_Selection table selected rows for Execute Process that retrieves from T_Selection in code. - DB.createT_Selection(pInstanceID, getSelectedKeysCollection(), + DB.createT_Selection(pInstanceID, getSaveKeys(), getProcessIndex(processModalDialog.getAD_Process_ID()), null); }else if (ProcessModalDialog.ON_WINDOW_CLOSE.equals(event.getName())){ if (processModalDialog.isCancel()){ @@ -1337,6 +1460,24 @@ public abstract class InfoPanel extends Window implements EventListener, }); } + /** + * Get index of infoProcess have processId + * @param processId + * @return + */ + protected int getProcessIndex (int processId){ + int index = 0; + for (int i = 0; i < infoProcessList.length; i++){ + if (infoProcessList[i].getAD_Process_ID() == processId){ + return index; + } + // just increase index when process is have ViewID column + if (infoProcessList[i].getAD_Column_ID() > 0) + index++; + } + return -1; + } + private void showBusyDialog() { progressWindow = new BusyDialog(); From 562f579eb66afd5259f68e5cc65d5ddd88b6711b Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 16 Jul 2014 11:55:18 -0500 Subject: [PATCH 15/21] IDEMPIERE-1970:Improve t_selection logic for info window / regenerate serialVersionUID --- org.adempiere.base/src/org/adempiere/model/MInfoProcess.java | 2 +- .../WEB-INF/src/org/adempiere/webui/info/InfoWindow.java | 2 +- .../WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java b/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java index 2a6c7e57a0..d9d4d37b25 100644 --- a/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java +++ b/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java @@ -33,7 +33,7 @@ public class MInfoProcess extends X_AD_InfoProcess { /** * */ - private static final long serialVersionUID = -7324387365288006121L; + private static final long serialVersionUID = -2167041563372362436L; /** * {@inheritDoc} diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java index 2867b122b9..2b8f3a82f5 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java @@ -96,7 +96,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL /** * */ - private static final long serialVersionUID = 1913208136527058096L; + private static final long serialVersionUID = 6606023722122538154L; protected Grid parameterGrid; private Borderlayout layout; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java index 5df2b94152..054b09f72a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java @@ -107,7 +107,7 @@ public abstract class InfoPanel extends Window implements EventListener, /** * */ - private static final long serialVersionUID = -6257894588906175658L; + private static final long serialVersionUID = 7393899696081833013L; private final static int DEFAULT_PAGE_SIZE = 100; protected List