Merging heads
authorAdrián Romero <adrianromero@openbravo.com>
Tue, 20 Jul 2010 18:25:35 +0200
changeset 7898 e5ef80a147fb
parent 7897 60bba5a75909 (current diff)
parent 7896 eaa30574256d (diff)
child 7899 94fcf9a433af
Merging heads
--- a/build.xml	Tue Jul 20 18:24:14 2010 +0200
+++ b/build.xml	Tue Jul 20 18:25:35 2010 +0200
@@ -190,6 +190,10 @@
   </condition>
  
   <path id="project.class.path">
+    <dirset dir="${base.modules}">
+      <include name="*/build/classes/" />
+    </dirset>
+    <pathelement path="${basedir}/../../src-util/modulescript/build/classes/" />
     <pathelement path="${build}" />
     <pathelement path="${base.src}" />
     <fileset dir="${base.lib}">
@@ -213,14 +217,14 @@
     <fileset dir="${base.modules}">
       <include name="*/lib/**" />
     </fileset>
+  </path>
+
+  <!-- This classpath is needed only for the compile.apply.module task-->
+  <path id="apply.module.compile.classpath">
     <dirset dir="${base.modules}">
       <include name="*/build/classes/" />
     </dirset>
     <pathelement path="${basedir}/../../src-util/modulescript/build/classes/" />
-  </path>
-
-  <!-- This classpath is needed only for the compile.apply.module task-->
-  <path id="apply.module.compile.classpath">
     <pathelement path="${build.apply.module}" />
     <pathelement path="${base.src}" />
     <fileset dir="${base.lib}">
@@ -244,14 +248,14 @@
     <fileset dir="${base.modules}">
       <include name="*/lib/**" />
     </fileset>
+  </path>
+  
+  <!-- This classpath is needed only for the apply.module task-->
+  <path id="apply.module.runtime.classpath">
     <dirset dir="${base.modules}">
       <include name="*/build/classes/" />
     </dirset>
     <pathelement path="${basedir}/../../src-util/modulescript/build/classes/" />
-  </path>
-  
-  <!-- This classpath is needed only for the apply.module task-->
-  <path id="apply.module.runtime.classpath">
     <pathelement path="${build.apply.module}" />
     <pathelement path="${build}" />
     <pathelement path="${base.src}" />
@@ -276,10 +280,6 @@
     <fileset dir="${base.modules}">
       <include name="*/lib/**" />
     </fileset>
-    <dirset dir="${base.modules}">
-      <include name="*/build/classes/" />
-    </dirset>
-    <pathelement path="${basedir}/../../src-util/modulescript/build/classes/" />
   </path>
   
   <macrodef name="updatesystemstatus">
--- a/src-db/database/build.xml	Tue Jul 20 18:24:14 2010 +0200
+++ b/src-db/database/build.xml	Tue Jul 20 18:25:35 2010 +0200
@@ -34,6 +34,10 @@
   </condition>
 
   <path id="runtime-classpath">
+    <dirset dir="${base.modules}">
+      <include name="*/build/classes/" />
+    </dirset>
+    <pathelement path="${basedir}/../../src-util/modulescript/build/classes/" />
     <fileset dir="./lib">
       <include name="**/*.jar" />
       <exclude name="**/dbsourcemanagerlight.jar" />
@@ -42,10 +46,6 @@
     <fileset dir="${base.lib}">
       <include name="**/*.jar" />
     </fileset>
-    <dirset dir="${base.modules}">
-      <include name="*/build/classes/" />
-    </dirset>
-    <pathelement path="${basedir}/../../src-util/modulescript/build/classes/" />
   </path>
 
   <taskdef name="createscript" classname="org.openbravo.ddlutils.task.CreateXML2SQL">
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql	Tue Jul 20 18:24:14 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql	Tue Jul 20 18:25:35 2010 +0200
@@ -638,6 +638,7 @@
       FROM C_ACCTSCHEMA_PROCESS, AD_ACCTPROCESS
       WHERE C_ACCTSCHEMA_PROCESS.AD_ACCTPROCESS_ID = AD_ACCTPROCESS.AD_ACCTPROCESS_ID
       AND C_ACCTSCHEMA_PROCESS.C_ACCTSCHEMA_ID = ?
+      ORDER BY SEQNO
       </Sql>
       <Parameter name="cAcctschemaId"/>
    </SqlMethod>
--- a/src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql	Tue Jul 20 18:24:14 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql	Tue Jul 20 18:25:35 2010 +0200
@@ -182,7 +182,7 @@
     <SqlMethodComment></SqlMethodComment>
     <Sql>
       <![CDATA[
-        SELECT DP.ISMANUAL, DP.ISDIRECTPOSTING
+        SELECT COALESCE(DP.ISMANUAL,'N') AS ISMANUAL, COALESCE(DP.ISDIRECTPOSTING,'N') AS ISDIRECTPOSTING
         FROM C_SETTLEMENT S LEFT JOIN C_DEBT_PAYMENT DP
           ON DP.C_SETTLEMENT_GENERATE_ID = S.C_SETTLEMENT_ID
         WHERE S.C_SETTLEMENT_ID = ?