[OpenbravoERP-commits] erp/devel/main: 2 new changesets

[hg]

details:   /erp/erp/devel/main/rev/0444a4cef3ea
changeset: 5068:0444a4cef3ea
user:      Antonio Moreno <antonio.moreno <at> openbravo.com>
date:      Wed Sep 23 13:06:51 2009 +0200
summary:   Fixed issue 10128. When applying industry templates, a full 
compile.complete will be done to make sure all modified windows are updated.

details:   /erp/erp/devel/main/rev/d9786d201903
changeset: 5069:d9786d201903
user:      Stefan Hühner <stefan.huehner <at> openbravo.com>
date:      Wed Sep 23 13:29:24 2009 +0200
summary:   Issue 10128: Fix build failure on oracle by removing extra as keyword

diffstat:

 src/org/openbravo/erpCommon/ad_process/ApplyModules.java      |   2 +-
 src/org/openbravo/erpCommon/ad_process/ApplyModules_data.xsql |  16 
+++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r e13fc21ebf9c -r d9786d201903 
src/org/openbravo/erpCommon/ad_process/ApplyModules.java
--- a/src/org/openbravo/erpCommon/ad_process/ApplyModules.java  Tue Sep 22 
18:39:13 2009 +0200
+++ b/src/org/openbravo/erpCommon/ad_process/ApplyModules.java  Wed Sep 23 
13:29:24 2009 +0200
@@ -209,7 +209,7 @@
 
       final String unnappliedModules = getUnnapliedModules();
 
-      if (ApplyModulesData.isUpdatingCore(this)) {
+      if (ApplyModulesData.isUpdatingCoreOrTemplate(this)) {
         tasks.add("update.database");
         tasks.add("core.lib");
         tasks.add("wad.lib");
diff -r e13fc21ebf9c -r d9786d201903 
src/org/openbravo/erpCommon/ad_process/ApplyModules_data.xsql
--- a/src/org/openbravo/erpCommon/ad_process/ApplyModules_data.xsql     Tue Sep 
22 18:39:13 2009 +0200
+++ b/src/org/openbravo/erpCommon/ad_process/ApplyModules_data.xsql     Wed Sep 
23 13:29:24 2009 +0200
@@ -37,13 +37,19 @@
       </Sql>
   </SqlMethod>
   
-  <SqlMethod name="isUpdatingCore" type="preparedStatement" return="boolean">
+  <SqlMethod name="isUpdatingCoreOrTemplate" type="preparedStatement" 
return="boolean">
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
-         SELECT count(*) as NAME
-           FROM AD_MODULE
-          WHERE STATUS='I'      
-            AND AD_MODULE_ID = '0'
+         SELECT count(*) as NAME FROM
+            ((SELECT 1  
+                FROM AD_MODULE
+                WHERE STATUS='I'      
+               AND (AD_MODULE_ID = '0' OR TYPE='T'))
+            UNION
+            (SELECT 1
+                FROM AD_MODULE_INSTALL
+                WHERE STATUS='I'      
+               AND (AD_MODULE_ID = '0' OR TYPE='T'))) q
           ]]>
       </Sql>
   </SqlMethod>

------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits