details: /erp/devel/main/rev/3e4ba05c6ca0
changeset: 8912:3e4ba05c6ca0
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Nov 16 13:16:29 2010 +0100
summary: Fixed issue 15178. Modules containing datasets will not be shown in
the Enterprise Module Management if the datasets didn't change
details: /erp/devel/main/rev/aa44e0a959be
changeset: 8913:aa44e0a959be
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Nov 16 21:10:59 2010 +0000
summary: CI: promote changesets from pi to main
diffstat:
src-db/database/model/tables/AD_DATASET.xml | 4 +
src-db/database/model/tables/AD_ORGMODULE.xml | 4 +
src-db/database/sourcedata/AD_COLUMN.xml | 64
++++++++++
src-db/database/sourcedata/AD_ELEMENT.xml | 13 ++
src-db/database/sourcedata/AD_MODULE.xml | 4 +-
src/org/openbravo/erpCommon/ad_actionButton/ExportReferenceData.java | 8 +
src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java | 14 ++
src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql | 20 ++-
src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree.java | 63
+++++++++
9 files changed, 189 insertions(+), 5 deletions(-)
diffs (truncated from 365 to 300 lines):
diff -r 1b773d75b484 -r aa44e0a959be src-db/database/model/tables/AD_DATASET.xml
--- a/src-db/database/model/tables/AD_DATASET.xml Mon Nov 15 17:59:06
2010 +0100
+++ b/src-db/database/model/tables/AD_DATASET.xml Tue Nov 16 21:10:59
2010 +0000
@@ -61,6 +61,10 @@
<default><![CDATA[Y]]></default>
<onCreateDefault><![CDATA['Y']]></onCreateDefault>
</column>
+ <column name="CHECKSUM" primaryKey="false" required="false"
type="VARCHAR" size="100" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="AD_DATASET_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r 1b773d75b484 -r aa44e0a959be
src-db/database/model/tables/AD_ORGMODULE.xml
--- a/src-db/database/model/tables/AD_ORGMODULE.xml Mon Nov 15 17:59:06
2010 +0100
+++ b/src-db/database/model/tables/AD_ORGMODULE.xml Tue Nov 16 21:10:59
2010 +0000
@@ -41,6 +41,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="CHECKSUM" primaryKey="false" required="false" type="CLOB"
size="4000" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="AD_ORGMODULE_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r 1b773d75b484 -r aa44e0a959be src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Nov 15 17:59:06 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Nov 16 21:10:59 2010 +0000
@@ -281307,6 +281307,38 @@
<!--605B65500DC8E13BE040007F01002829-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--605B65500DC8E13BE040007F01002829--></AD_COLUMN>
+<!--608CA57238D146F9A5019B1574916FC5--><AD_COLUMN>
+<!--608CA57238D146F9A5019B1574916FC5-->
<AD_COLUMN_ID><![CDATA[608CA57238D146F9A5019B1574916FC5]]></AD_COLUMN_ID>
+<!--608CA57238D146F9A5019B1574916FC5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--608CA57238D146F9A5019B1574916FC5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--608CA57238D146F9A5019B1574916FC5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--608CA57238D146F9A5019B1574916FC5--> <NAME><![CDATA[Checksum]]></NAME>
+<!--608CA57238D146F9A5019B1574916FC5--> <DESCRIPTION><![CDATA[Contains the
checksum information of this dataset]]></DESCRIPTION>
+<!--608CA57238D146F9A5019B1574916FC5--> <HELP><![CDATA[The checksum
information is used to verify whether the version of the dataset which was
imported in the database is up to date, or needs to be updated.]]></HELP>
+<!--608CA57238D146F9A5019B1574916FC5-->
<COLUMNNAME><![CDATA[Checksum]]></COLUMNNAME>
+<!--608CA57238D146F9A5019B1574916FC5-->
<AD_TABLE_ID><![CDATA[08A203FD84AA412BB38882A1EDDD1A83]]></AD_TABLE_ID>
+<!--608CA57238D146F9A5019B1574916FC5-->
<AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--608CA57238D146F9A5019B1574916FC5-->
<FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
+<!--608CA57238D146F9A5019B1574916FC5--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--608CA57238D146F9A5019B1574916FC5--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--608CA57238D146F9A5019B1574916FC5-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--608CA57238D146F9A5019B1574916FC5-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--608CA57238D146F9A5019B1574916FC5-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--608CA57238D146F9A5019B1574916FC5--> <SEQNO><![CDATA[160]]></SEQNO>
+<!--608CA57238D146F9A5019B1574916FC5-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--608CA57238D146F9A5019B1574916FC5-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--608CA57238D146F9A5019B1574916FC5-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--608CA57238D146F9A5019B1574916FC5-->
<AD_ELEMENT_ID><![CDATA[E38B247A2EEF426C9908594598D1559B]]></AD_ELEMENT_ID>
+<!--608CA57238D146F9A5019B1574916FC5-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--608CA57238D146F9A5019B1574916FC5-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--608CA57238D146F9A5019B1574916FC5-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--608CA57238D146F9A5019B1574916FC5-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--608CA57238D146F9A5019B1574916FC5-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--608CA57238D146F9A5019B1574916FC5-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--608CA57238D146F9A5019B1574916FC5--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--608CA57238D146F9A5019B1574916FC5-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--608CA57238D146F9A5019B1574916FC5--></AD_COLUMN>
+
<!--60CA42CC2D6246D6AF02CFED573960F1--><AD_COLUMN>
<!--60CA42CC2D6246D6AF02CFED573960F1-->
<AD_COLUMN_ID><![CDATA[60CA42CC2D6246D6AF02CFED573960F1]]></AD_COLUMN_ID>
<!--60CA42CC2D6246D6AF02CFED573960F1-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -294025,6 +294057,38 @@
<!--7E5CC370CF414A1FA0D6671EBAA3EFFE-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--7E5CC370CF414A1FA0D6671EBAA3EFFE--></AD_COLUMN>
+<!--7E7444273E934B0EA16208658FD6C52E--><AD_COLUMN>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<AD_COLUMN_ID><![CDATA[7E7444273E934B0EA16208658FD6C52E]]></AD_COLUMN_ID>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E7444273E934B0EA16208658FD6C52E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E7444273E934B0EA16208658FD6C52E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E7444273E934B0EA16208658FD6C52E--> <NAME><![CDATA[Checksum]]></NAME>
+<!--7E7444273E934B0EA16208658FD6C52E--> <DESCRIPTION><![CDATA[Contains the
checksum information of this dataset]]></DESCRIPTION>
+<!--7E7444273E934B0EA16208658FD6C52E--> <HELP><![CDATA[The checksum
information is used to verify whether the version of the dataset which was
imported in the database is up to date, or needs to be updated.]]></HELP>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<COLUMNNAME><![CDATA[Checksum]]></COLUMNNAME>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<AD_TABLE_ID><![CDATA[2E558CB7A6D94238A6789C092EE60AD6]]></AD_TABLE_ID>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<FIELDLENGTH><![CDATA[10000]]></FIELDLENGTH>
+<!--7E7444273E934B0EA16208658FD6C52E--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E7444273E934B0EA16208658FD6C52E--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E7444273E934B0EA16208658FD6C52E--> <SEQNO><![CDATA[110]]></SEQNO>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<AD_ELEMENT_ID><![CDATA[E38B247A2EEF426C9908594598D1559B]]></AD_ELEMENT_ID>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E7444273E934B0EA16208658FD6C52E--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7E7444273E934B0EA16208658FD6C52E-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7E7444273E934B0EA16208658FD6C52E--></AD_COLUMN>
+
<!--7E8829EBCFF6143AE040007F010018ED--><AD_COLUMN>
<!--7E8829EBCFF6143AE040007F010018ED-->
<AD_COLUMN_ID><![CDATA[7E8829EBCFF6143AE040007F010018ED]]></AD_COLUMN_ID>
<!--7E8829EBCFF6143AE040007F010018ED-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 1b773d75b484 -r aa44e0a959be src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Mon Nov 15 17:59:06 2010 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Tue Nov 16 21:10:59 2010 +0000
@@ -27789,6 +27789,19 @@
<!--E0AAAEDD15444468A96DDAF14AF227F2-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--E0AAAEDD15444468A96DDAF14AF227F2--></AD_ELEMENT>
+<!--E38B247A2EEF426C9908594598D1559B--><AD_ELEMENT>
+<!--E38B247A2EEF426C9908594598D1559B-->
<AD_ELEMENT_ID><![CDATA[E38B247A2EEF426C9908594598D1559B]]></AD_ELEMENT_ID>
+<!--E38B247A2EEF426C9908594598D1559B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E38B247A2EEF426C9908594598D1559B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E38B247A2EEF426C9908594598D1559B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E38B247A2EEF426C9908594598D1559B-->
<COLUMNNAME><![CDATA[Checksum]]></COLUMNNAME>
+<!--E38B247A2EEF426C9908594598D1559B--> <NAME><![CDATA[Checksum]]></NAME>
+<!--E38B247A2EEF426C9908594598D1559B-->
<PRINTNAME><![CDATA[Checksum]]></PRINTNAME>
+<!--E38B247A2EEF426C9908594598D1559B--> <DESCRIPTION><![CDATA[Contains the
checksum information of this dataset]]></DESCRIPTION>
+<!--E38B247A2EEF426C9908594598D1559B--> <HELP><![CDATA[The checksum
information is used to verify whether the version of the dataset which was
imported in the database is up to date, or needs to be updated.]]></HELP>
+<!--E38B247A2EEF426C9908594598D1559B-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E38B247A2EEF426C9908594598D1559B--></AD_ELEMENT>
+
<!--E46619B0FD944516A50C9B18E0E4E727--><AD_ELEMENT>
<!--E46619B0FD944516A50C9B18E0E4E727-->
<AD_ELEMENT_ID><![CDATA[E46619B0FD944516A50C9B18E0E4E727]]></AD_ELEMENT_ID>
<!--E46619B0FD944516A50C9B18E0E4E727-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 1b773d75b484 -r aa44e0a959be src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Mon Nov 15 17:59:06 2010 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml Tue Nov 16 21:10:59 2010 +0000
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[Core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.18840]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18912]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
<!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders,
invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r 1b773d75b484 -r aa44e0a959be
src/org/openbravo/erpCommon/ad_actionButton/ExportReferenceData.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/ExportReferenceData.java
Mon Nov 15 17:59:06 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/ExportReferenceData.java
Tue Nov 16 21:10:59 2010 +0000
@@ -22,6 +22,8 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
+import java.math.BigInteger;
+import java.security.MessageDigest;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -97,9 +99,15 @@
+ "/referencedata/standard/" + Utility.wikifiedName(data[0].name) +
".xml");
if (!myFolder.exists())
myFolder.mkdirs();
+
FileOutputStream myOutputStream = new FileOutputStream(myFile);
myOutputStream.write(xml.getBytes("UTF-8"));
myOutputStream.close();
+
+ MessageDigest cs = MessageDigest.getInstance("MD5");
+ cs.update(xml.getBytes("UTF-8"));
+ myDataset.setChecksum(new BigInteger(1, cs.digest()).toString());
+ OBDal.getInstance().save(myDataset);
myError = new OBError();
myError.setType("Success");
myError.setTitle(Utility.messageBD(this, "Success", vars.getLanguage()));
diff -r 1b773d75b484 -r aa44e0a959be
src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java
--- a/src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java Mon Nov
15 17:59:06 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java Tue Nov
16 21:10:59 2010 +0000
@@ -21,6 +21,7 @@
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.HashMap;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -254,6 +255,19 @@
SALTO_LINEA);
}
}
+ HashMap<String, String> checksums = new HashMap<String, String>();
+ for (int j = 0; j < data.length; j++) {
+ String checksum = data[j].checksum;
+ if (checksums.get(data[j].adModuleId) == null) {
+ checksums.put(data[j].adModuleId, checksum);
+ } else {
+ checksums.put(data[j].adModuleId,
checksums.get(data[j].adModuleId) + "," + checksum);
+ }
+ }
+ for (String moduleId : checksums.keySet()) {
+ UpdateReferenceDataData.updateOrgModuleChecksum(this,
checksums.get(moduleId), vars
+ .getUser(), vars.getClient(), strOrganization, moduleId);
+ }
} else
return "WrongModules";
} else
diff -r 1b773d75b484 -r aa44e0a959be
src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql
Mon Nov 15 17:59:06 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql
Tue Nov 16 21:10:59 2010 +0000
@@ -27,7 +27,7 @@
<Sql>
<![CDATA[
SELECT '' as id, '' as NAME, '' AS HASCHARTOFACCOUNTS, '' AS
ISTRANSLATIONMODULE,
- '' AS AD_MODULE_ID, '' AS PATH, '' AS JAVAPACKAGE, '' AS DATASETNAME,
'' AS VERSION
+ '' AS AD_MODULE_ID, '' AS PATH, '' AS JAVAPACKAGE, '' AS DATASETNAME,
'' AS VERSION, '' AS CHECKSUM
FROM DUAL
]]>
</Sql>
@@ -57,7 +57,7 @@
<Sql>
<![CDATA[
SELECT AD_MODULE.NAME, AD_MODULE.HASCHARTOFACCOUNTS,
AD_MODULE.ISTRANSLATIONMODULE,
- AD_MODULE.AD_MODULE_ID , AD_MODULE.JAVAPACKAGE, AD_DATASET.NAME AS
DATASETNAME, AD_MODULE.VERSION
+ AD_MODULE.AD_MODULE_ID , AD_MODULE.JAVAPACKAGE, AD_DATASET.NAME AS
DATASETNAME, AD_MODULE.VERSION, AD_DATASET.CHECKSUM
FROM AD_MODULE, AD_DATASET
WHERE AD_MODULE.AD_MODULE_ID = AD_DATASET.AD_MODULE_ID
AND AD_MODULE.AD_MODULE_ID IN ('1')
@@ -84,7 +84,7 @@
<SqlMethod name="updateOrgModule" type="preparedStatement" return="rowCount">
<SqlMethodComment></SqlMethodComment>
<Sql>
- UPDATE AD_ORGMODULE SET VERSION = ?, UPDATED=NOW(), UPDATEDBY=?
+ UPDATE AD_ORGMODULE SET CHECKSUM = ?, UPDATED=NOW(), UPDATEDBY=?
WHERE AD_CLIENT_ID = ?
AND AD_ORG_ID = ?
AND AD_MODULE_ID = ?
@@ -95,4 +95,18 @@
<Parameter name="AD_Org_ID"/>
<Parameter name="AD_Module_ID"/>
</SqlMethod>
+ <SqlMethod name="updateOrgModuleChecksum" type="preparedStatement"
return="rowCount">
+ <SqlMethodComment></SqlMethodComment>
+ <Sql>
+ UPDATE AD_ORGMODULE SET CHECKSUM = ?, UPDATED=NOW(), UPDATEDBY=?
+ WHERE AD_CLIENT_ID = ?
+ AND AD_ORG_ID = ?
+ AND AD_MODULE_ID = ?
+ </Sql>
+ <Parameter name="checksum"/>
+ <Parameter name="AD_User_ID"/>
+ <Parameter name="AD_Client_ID"/>
+ <Parameter name="AD_Org_ID"/>
+ <Parameter name="AD_Module_ID"/>
+ </SqlMethod>
</SqlClass>
diff -r 1b773d75b484 -r aa44e0a959be
src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree.java
--- a/src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree.java
Mon Nov 15 17:59:06 2010 +0100
+++ b/src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree.java
Tue Nov 16 21:10:59 2010 +0000
@@ -19,16 +19,28 @@
package org.openbravo.erpCommon.modules;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
+import java.util.List;
import java.util.Map;
import javax.servlet.ServletException;
+import org.apache.log4j.Logger;
+import org.hibernate.criterion.Expression;
import org.openbravo.base.HttpBaseServlet;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBCriteria;
+import org.openbravo.dal.service.OBDal;
import org.openbravo.data.FieldProvider;
import org.openbravo.erpCommon.utility.FieldProviderFactory;
import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.model.ad.module.ADOrgModule;
+import org.openbravo.model.ad.module.Module;
+import org.openbravo.model.ad.system.Client;
+import org.openbravo.model.ad.utility.DataSet;
+import org.openbravo.model.common.enterprise.Organization;
import org.openbravo.xmlEngine.XmlDocument;
/**
@@ -37,6 +49,7 @@
* It implements GenericTree, detailed description is in that API doc.
*/
public class ModuleReferenceDataOrgTree extends ModuleTree {
+ private final static Logger log4j =
Logger.getLogger(ModuleReferenceDataOrgTree.class);
/**
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
