Fix inconsitency issue in AD_Process.
authorGorka Ion Damián <gorkaion.damian@openbravo.com>
Mon, 11 Jan 2010 10:31:38 +0100
changeset 5838 fae0d6f0330a
parent 5837 667964520ba7
child 5839 fd6f3ff0d871
Fix inconsitency issue in AD_Process.
log4j.lcf
src/log4j.lcf
src/org/openbravo/erpCommon/modules/ApplyModule.java
src/org/openbravo/erpCommon/modules/ApplyModuleTask.java
src/org/openbravo/erpCommon/modules/ApplyModule_data.xsql
--- a/log4j.lcf	Mon Jan 11 13:55:27 2010 +0530
+++ b/log4j.lcf	Mon Jan 11 10:31:38 2010 +0100
@@ -9,3 +9,4 @@
 log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c - %m%n
 
 log4j.category.org.openbravo.wad=DEBUG
+log4j.category.org.openbravo.database=DEBUG
--- a/src/log4j.lcf	Mon Jan 11 13:55:27 2010 +0530
+++ b/src/log4j.lcf	Mon Jan 11 10:31:38 2010 +0100
@@ -33,6 +33,7 @@
 log4j.category.org.openbravo.translate.Translate=INFO
 log4j.category.org.openbravo.wad=INFO
 #log4j.category.org.openbravo.translate=INFO
+log4j.category.org.openbravo.database=DEBUG
 
 log4j.category.org=WARN
 
--- a/src/org/openbravo/erpCommon/modules/ApplyModule.java	Mon Jan 11 13:55:27 2010 +0530
+++ b/src/org/openbravo/erpCommon/modules/ApplyModule.java	Mon Jan 11 10:31:38 2010 +0100
@@ -86,6 +86,7 @@
       // **************** Translation modules ************************
       // Check whether modules to install are translations
       log4j.info("Looking for translation modules");
+      log4j.info("obDir: "+obDir);
       final ApplyModuleData[] data = ApplyModuleData.selectTranslationModules(pool);
 
       if (data != null && data.length > 0) {
--- a/src/org/openbravo/erpCommon/modules/ApplyModuleTask.java	Mon Jan 11 13:55:27 2010 +0530
+++ b/src/org/openbravo/erpCommon/modules/ApplyModuleTask.java	Mon Jan 11 10:31:38 2010 +0100
@@ -54,6 +54,7 @@
         obDir = getProject().getBaseDir().toString();
       if (propertiesFile == null || propertiesFile.equals(""))
         propertiesFile = obDir + "/config/Openbravo.properties";
+      System.out.println("properties file: " + propertiesFile);
       final ApplyModule am = new ApplyModule(new CPStandAlone(propertiesFile), obDir);
       am.execute();
     } catch (final Exception e) {
--- a/src/org/openbravo/erpCommon/modules/ApplyModule_data.xsql	Mon Jan 11 13:55:27 2010 +0530
+++ b/src/org/openbravo/erpCommon/modules/ApplyModule_data.xsql	Mon Jan 11 10:31:38 2010 +0100
@@ -24,9 +24,10 @@
     <SqlMethodComment></SqlMethodComment>
     <Sql>
     <![CDATA[
-      SELECT M.JAVAPACKAGE, M.NAME, M.AD_LANGUAGE, L.ISSYSTEMLANGUAGE, '' as DS_NAME, '' AS AD_MODULE_ID
+      SELECT M.JAVAPACKAGE, M.NAME || ' - ' || a.dbuser as name, M.AD_LANGUAGE, L.ISSYSTEMLANGUAGE, '' as DS_NAME, '' AS AD_MODULE_ID
         FROM AD_MODULE M LEFT JOIN AD_LANGUAGE L
-                           ON L.AD_LANGUAGE = M.AD_LANGUAGE
+        ON L.AD_LANGUAGE = M.AD_LANGUAGE,
+        (SELECT USER AS DBUSER FROM DUAL) a
        WHERE (STATUS = 'I' OR STATUS = 'P')
          AND ISTRANSLATIONMODULE = 'Y'
     ]]></Sql>