details: http://code.openbravo.com/erp/devel/main/rev/bd1ef78ba236 changeset: 3552:bd1ef78ba236 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Tue Apr 14 15:17:50 2009 +0200 summary: Fixed issue 8564
details: http://code.openbravo.com/erp/devel/main/rev/f121c0cb660b changeset: 3553:f121c0cb660b user: openbravo <at> ip-10-226-67-64.compute-1.internal date: Tue Apr 14 15:37:55 2009 +0000 summary: Antonio Moreno's bug fixing number 8564 diffstat: src-db/database/build.xml | 2 + src-db/database/sourcedata/AD_COLUMN.xml | 4 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 33 ++++++++++++++++ src/org/openbravo/erpCommon/modules/ImportModule.java | 7 +++ src/org/openbravo/erpCommon/modules/ImportModule_data.xsql | 35 +++++++++++++++++ 5 files changed, 79 insertions(+), 2 deletions(-) diffs (143 lines): diff -r baa73777edba -r f121c0cb660b src-db/database/build.xml --- a/src-db/database/build.xml Tue Apr 14 13:06:49 2009 +0000 +++ b/src-db/database/build.xml Tue Apr 14 15:37:55 2009 +0000 @@ -131,6 +131,7 @@ <target name="update.database.mod"> <alterdatabasedatamod driver="${bbdd.driver}" url="${bbdd.owner.url}" user="${bbdd.user}" password="${bbdd.password}" excludeobjects="com.openbravo.db.OpenbravoExcludeFilter" model="model" filter="com.openbravo.db.OpenbravoMetadataFilter" input="sourcedata" object="${bbdd.object}" failonerror="false" verbosity="DEBUG" basedir="${base.modules}/" baseConfig="${base.config}" dirFilter="*/src-db/database/model" datadir="${base.modules}/" dataFilter="*/src-db/database/sourcedata" module="${module}" userId="0" propertiesFile="${base.config}/Openbravo.properties" force="${force}" /> <antcall target="database.postupdate.${bbdd.rdbms}" /> + <antcall target="update.dbupdate.timestamp" /> </target> <target name="clean.database.ORACLE"> <sql driver="${bbdd.driver}" url="${bbdd.url}" userid="${bbdd.systemUser}" password="${bbdd.systemPassword}" onerror="continue"> @@ -441,3 +442,4 @@ </sql> </target> </project> + diff -r baa73777edba -r f121c0cb660b src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Apr 14 13:06:49 2009 +0000 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Apr 14 15:37:55 2009 +0000 @@ -27701,8 +27701,8 @@ <!--2011--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--2011--> <NAME><![CDATA[Search Key]]></NAME> <!--2011--> <DESCRIPTION><![CDATA[A fast method for finding a particular record.]]></DESCRIPTION> -<!--2011--> <HELP><![CDATA[A search key allows for a fast method of finding a particular record. If you leave the search key empty, the system automatically creates a numeric number originating from a document sequence defined in the "Document Sequence" window. The sequence naming convention follows a rule "DocumentNo_TableName", where TableName is the actual name of the database table (e.g. C_Order). - +<!--2011--> <HELP><![CDATA[A search key allows for a fast method of finding a particular record. If you leave the search key empty, the system automatically creates a numeric number originating from a document sequence defined in the "Document Sequence" window. The sequence naming convention follows a rule "DocumentNo_TableName", where TableName is the actual name of the database table (e.g. C_Order). + Usually, company's internal identifiers for various records (products, customers, etc) are stored here.]]></HELP> <!--2011--> <COLUMNNAME><![CDATA[Value]]></COLUMNNAME> <!--2011--> <AD_TABLE_ID><![CDATA[208]]></AD_TABLE_ID> diff -r baa73777edba -r f121c0cb660b src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Apr 14 13:06:49 2009 +0000 +++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Apr 14 15:37:55 2009 +0000 @@ -25077,6 +25077,39 @@ <!--8931B7E0C0774C9798207CE5A9F9B2DD--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--8931B7E0C0774C9798207CE5A9F9B2DD--></AD_TEXTINTERFACES> +<!--8AD8DD2E290511DE929E001EEC1F37D2--><AD_TEXTINTERFACES> +<!--8AD8DD2E290511DE929E001EEC1F37D2--> <AD_TEXTINTERFACES_ID><![CDATA[8AD8DD2E290511DE929E001EEC1F37D2]]></AD_TEXTINTERFACES_ID> +<!--8AD8DD2E290511DE929E001EEC1F37D2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--8AD8DD2E290511DE929E001EEC1F37D2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--8AD8DD2E290511DE929E001EEC1F37D2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--8AD8DD2E290511DE929E001EEC1F37D2--> <TEXT><![CDATA[PREVIOUS]]></TEXT> +<!--8AD8DD2E290511DE929E001EEC1F37D2--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html]]></FILENAME> +<!--8AD8DD2E290511DE929E001EEC1F37D2--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--8AD8DD2E290511DE929E001EEC1F37D2--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--8AD8DD2E290511DE929E001EEC1F37D2--></AD_TEXTINTERFACES> + +<!--8AE0622E290511DE9EF6001EEC1F37D2--><AD_TEXTINTERFACES> +<!--8AE0622E290511DE9EF6001EEC1F37D2--> <AD_TEXTINTERFACES_ID><![CDATA[8AE0622E290511DE9EF6001EEC1F37D2]]></AD_TEXTINTERFACES_ID> +<!--8AE0622E290511DE9EF6001EEC1F37D2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--8AE0622E290511DE9EF6001EEC1F37D2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--8AE0622E290511DE9EF6001EEC1F37D2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--8AE0622E290511DE9EF6001EEC1F37D2--> <TEXT><![CDATA[SALDO ANTERIOR]]></TEXT> +<!--8AE0622E290511DE9EF6001EEC1F37D2--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html]]></FILENAME> +<!--8AE0622E290511DE9EF6001EEC1F37D2--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--8AE0622E290511DE9EF6001EEC1F37D2--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--8AE0622E290511DE9EF6001EEC1F37D2--></AD_TEXTINTERFACES> + +<!--8AE24346290511DEACA2001EEC1F37D2--><AD_TEXTINTERFACES> +<!--8AE24346290511DEACA2001EEC1F37D2--> <AD_TEXTINTERFACES_ID><![CDATA[8AE24346290511DEACA2001EEC1F37D2]]></AD_TEXTINTERFACES_ID> +<!--8AE24346290511DEACA2001EEC1F37D2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--8AE24346290511DEACA2001EEC1F37D2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--8AE24346290511DEACA2001EEC1F37D2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--8AE24346290511DEACA2001EEC1F37D2--> <TEXT><![CDATA[SUMA Y SIGUE]]></TEXT> +<!--8AE24346290511DEACA2001EEC1F37D2--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html]]></FILENAME> +<!--8AE24346290511DEACA2001EEC1F37D2--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--8AE24346290511DEACA2001EEC1F37D2--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--8AE24346290511DEACA2001EEC1F37D2--></AD_TEXTINTERFACES> + <!--8AF50B04D98B452CB02DCE3B554A1F59--><AD_TEXTINTERFACES> <!--8AF50B04D98B452CB02DCE3B554A1F59--> <AD_TEXTINTERFACES_ID><![CDATA[8AF50B04D98B452CB02DCE3B554A1F59]]></AD_TEXTINTERFACES_ID> <!--8AF50B04D98B452CB02DCE3B554A1F59--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r baa73777edba -r f121c0cb660b src/org/openbravo/erpCommon/modules/ImportModule.java --- a/src/org/openbravo/erpCommon/modules/ImportModule.java Tue Apr 14 13:06:49 2009 +0000 +++ b/src/org/openbravo/erpCommon/modules/ImportModule.java Tue Apr 14 15:37:55 2009 +0000 @@ -788,6 +788,12 @@ for (final DynaBean module : dbPrefix) { platform.updateinsert(conn, db, module); } + for (final DynaBean module : dModulesToInstall) { + String modID = (String) module.get("AD_MODULE_ID"); + ImportModuleData.updateModuleDate(pool, modID); + ImportModuleData.updateModulePrefixDate(pool, modID); + ImportModuleData.updateModuleDependencyDate(pool, modID); + } conn.close(); } @@ -1130,3 +1136,4 @@ } } } + diff -r baa73777edba -r f121c0cb660b src/org/openbravo/erpCommon/modules/ImportModule_data.xsql --- a/src/org/openbravo/erpCommon/modules/ImportModule_data.xsql Tue Apr 14 13:06:49 2009 +0000 +++ b/src/org/openbravo/erpCommon/modules/ImportModule_data.xsql Tue Apr 14 15:37:55 2009 +0000 @@ -149,6 +149,40 @@ <Parameter name="moduleId"/> </SqlMethod> + <SqlMethod name="updateModuleDate" type="preparedStatement" return="rowcount"> + <SqlMethodComment></SqlMethodComment> + <Sql> + UPDATE AD_MODULE + SET UPDATED = (SELECT LAST_DBUPDATE FROM AD_SYSTEM_INFO) + WHERE AD_MODULE_ID = ? + AND UPDATED > (SELECT LAST_DBUPDATE FROM AD_SYSTEM_INFO) + </Sql> + <Parameter name="moduleId"/> + </SqlMethod> + + <SqlMethod name="updateModulePrefixDate" type="preparedStatement" return="rowcount"> + <SqlMethodComment></SqlMethodComment> + <Sql> + UPDATE AD_MODULE_DBPREFIX + SET UPDATED = (SELECT LAST_DBUPDATE FROM AD_SYSTEM_INFO) + WHERE AD_MODULE_ID = ? + AND UPDATED > (SELECT LAST_DBUPDATE FROM AD_SYSTEM_INFO) + </Sql> + <Parameter name="moduleId"/> + </SqlMethod> + + <SqlMethod name="updateModuleDependencyDate" type="preparedStatement" return="rowcount"> + <SqlMethodComment></SqlMethodComment> + <Sql> + UPDATE AD_MODULE_DEPENDENCY + SET UPDATED = (SELECT LAST_DBUPDATE FROM AD_SYSTEM_INFO) + WHERE AD_MODULE_ID = ? + AND UPDATED > (SELECT LAST_DBUPDATE FROM AD_SYSTEM_INFO) + </Sql> + <Parameter name="moduleId"/> + </SqlMethod> + + <SqlMethod name="getParentNode" type="preparedStatement" return="string"> <Sql> SELECT AD_MODULE_ID @@ -159,3 +193,4 @@ <Parameter name="moduleId"/> </SqlMethod> </SqlClass> + ------------------------------------------------------------------------------ This SF.net email is sponsored by: High Quality Requirements in a Collaborative Environment. Download a free trial of Rational Requirements Composer Now! http://p.sf.net/sfu/www-ibm-com _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits