details: /erp/devel/pi/rev/fb8f96dce3e8
changeset: 7311:fb8f96dce3e8
user: Manoharan Iyyadurai <manoharan.iyyadurai <at> openbravo.com>
date: Thu May 13 16:13:00 2010 +0530
summary: Backout the changes due to build breakage
details: /erp/devel/pi/rev/76fb5e74c37a
changeset: 7312:76fb5e74c37a
user: Manoharan Iyyadurai <manoharan.iyyadurai <at> openbravo.com>
date: Thu May 13 16:13:57 2010 +0530
summary: committing the backout changeset
diffstat:
src-db/database/model/tables/C_BANKSTATEMENTLINE.xml | 1 -
src-db/database/sourcedata/AD_MESSAGE.xml | 11 ------
src/org/openbravo/dal/core/DalUtil.java | 20 ++++++++++++
src/org/openbravo/erpCommon/ad_forms/TranslationHandler.java | 7 +++-
4 files changed, 25 insertions(+), 14 deletions(-)
diffs (106 lines):
diff -r aed852c713b8 -r 76fb5e74c37a
src-db/database/model/tables/C_BANKSTATEMENTLINE.xml
--- a/src-db/database/model/tables/C_BANKSTATEMENTLINE.xml Thu May 13
14:30:14 2010 +0530
+++ b/src-db/database/model/tables/C_BANKSTATEMENTLINE.xml Thu May 13
16:13:57 2010 +0530
@@ -129,6 +129,5 @@
<index-column name="C_BANKSTATEMENT_ID"/>
</index>
<check name="C_BANKSTATLN_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
- <check name="C_BANKSTATLN_PA_GLITEM_ID_CHK"><![CDATA[((C_DEBT_PAYMENT_ID
IS NOT NULL) AND (C_GLITEM_ID IS NULL)) OR ((C_GLITEM_ID IS NOT NULL) AND
(C_DEBT_PAYMENT_ID IS NULL))]]></check>
</table>
</database>
diff -r aed852c713b8 -r 76fb5e74c37a src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Thu May 13 14:30:14 2010 +0530
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu May 13 16:13:57 2010 +0530
@@ -31482,17 +31482,6 @@
<!--7BF4B33E022E407BB6615E106AC7A8A6-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--7BF4B33E022E407BB6615E106AC7A8A6--></AD_MESSAGE>
-<!--7FD28F8FE35B492FA9200FF14D0A7749--><AD_MESSAGE>
-<!--7FD28F8FE35B492FA9200FF14D0A7749-->
<AD_MESSAGE_ID><![CDATA[7FD28F8FE35B492FA9200FF14D0A7749]]></AD_MESSAGE_ID>
-<!--7FD28F8FE35B492FA9200FF14D0A7749-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7FD28F8FE35B492FA9200FF14D0A7749--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7FD28F8FE35B492FA9200FF14D0A7749--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FD28F8FE35B492FA9200FF14D0A7749-->
<VALUE><![CDATA[C_BANKSTATLN_PA_GLITEM_ID_CHK]]></VALUE>
-<!--7FD28F8FE35B492FA9200FF14D0A7749--> <MSGTEXT><![CDATA[You should not
allow to select a debt payment and g/l item at same time.]]></MSGTEXT>
-<!--7FD28F8FE35B492FA9200FF14D0A7749--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
-<!--7FD28F8FE35B492FA9200FF14D0A7749-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7FD28F8FE35B492FA9200FF14D0A7749--></AD_MESSAGE>
-
<!--81088F7236714F8A9D6FE754B10D31E8--><AD_MESSAGE>
<!--81088F7236714F8A9D6FE754B10D31E8-->
<AD_MESSAGE_ID><![CDATA[81088F7236714F8A9D6FE754B10D31E8]]></AD_MESSAGE_ID>
<!--81088F7236714F8A9D6FE754B10D31E8-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r aed852c713b8 -r 76fb5e74c37a src/org/openbravo/dal/core/DalUtil.java
--- a/src/org/openbravo/dal/core/DalUtil.java Thu May 13 14:30:14 2010 +0530
+++ b/src/org/openbravo/dal/core/DalUtil.java Thu May 13 16:13:57 2010 +0530
@@ -22,6 +22,8 @@
import java.io.Serializable;
import java.lang.reflect.Field;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -47,6 +49,24 @@
private static final String IDENTIFIER_PART_PATH = "_identifier";
/**
+ * Sorts the passed list according to the identifier of the objects.
+ *
+ * @param objects
+ * the objects (must be BaseOBObjects) to sort.
+ */
+ public static void sortByIdentifier(List<? extends BaseOBObject> objects) {
+ Collections.sort(objects, new OBObjectComparator());
+ }
+
+ private static class OBObjectComparator implements Comparator<BaseOBObject> {
+
+ @Override
+ public int compare(BaseOBObject arg0, BaseOBObject arg1) {
+ return arg0.getIdentifier().compareTo(arg1.getIdentifier());
+ }
+ }
+
+ /**
* Translates a so-called property path to a property. The passed entity is
the starting entity.
* For example the property: organization.name and entity: Product will
result in the
* Organization.name property to be returned.
diff -r aed852c713b8 -r 76fb5e74c37a
src/org/openbravo/erpCommon/ad_forms/TranslationHandler.java
--- a/src/org/openbravo/erpCommon/ad_forms/TranslationHandler.java Thu May
13 14:30:14 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/TranslationHandler.java Thu May
13 16:13:57 2010 +0530
@@ -10,7 +10,7 @@
* Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
* created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved.
* Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2009 Openbravo S.L.U.
+ * Contributions are Copyright (C) 2001-2010 Openbravo S.L.U.
******************************************************************************/
package org.openbravo.erpCommon.ad_forms;
@@ -67,6 +67,8 @@
private int m_updateCount = 0;
+ private String m_Translated = null;
+
static Logger log4j = Logger.getLogger(TranslationHandler.class);
/*************************************************************************/
@@ -98,6 +100,7 @@
log4j.debug("AD_Language=" + m_AD_Language + ", TableName=" +
m_TableName);
} else if (qName.equals(Translation.XML_ROW_TAG)) {
m_curID = attributes.getValue(Translation.XML_ROW_ATTRIBUTE_ID);
+ m_Translated =
attributes.getValue(Translation.XML_ROW_ATTRIBUTE_TRANSLATED);
m_sql = new StringBuffer();
} else if (qName.equals(Translation.XML_VALUE_TAG)) {
m_curColumnName =
attributes.getValue(Translation.XML_VALUE_ATTRIBUTE_COLUMN);
@@ -146,7 +149,7 @@
m_sql.append(",");
m_sql.append("Updated=now()"); // .append(DB.TO_DATE(m_time,
// false));
- m_sql.append(",IsTranslated='Y'");
+ m_sql.append(",IsTranslated='" + m_Translated + "'");
// Where section
m_sql.append(" WHERE
").append(m_TableName).append("_ID='").append(m_curID).append("'");
m_sql.append(" AND AD_Language='").append(m_AD_Language).append("'");
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
