details: /erp/devel/pi/rev/60bba5a75909
changeset: 7897:60bba5a75909
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Jul 20 18:24:14 2010 +0200
summary: Fixes issue 0013602: Inhomogeneous behavior of searchers
It has been made all fields case insesitive
details: /erp/devel/pi/rev/e5ef80a147fb
changeset: 7898:e5ef80a147fb
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Jul 20 18:25:35 2010 +0200
summary: Merging heads
diffstat:
build.xml | 24 +++++++-------
src-db/database/build.xml | 8 ++--
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 1 +
src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql | 2 +-
src/org/openbravo/reference/ui/UIReferenceUtility.java | 7 +---
5 files changed, 20 insertions(+), 22 deletions(-)
diffs (129 lines):
diff -r 44c9f0919ecc -r e5ef80a147fb build.xml
--- a/build.xml Mon Jul 19 09:31:43 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">
diff -r 44c9f0919ecc -r e5ef80a147fb src-db/database/build.xml
--- a/src-db/database/build.xml Mon Jul 19 09:31:43 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">
diff -r 44c9f0919ecc -r e5ef80a147fb
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql Mon Jul 19
09:31:43 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>
diff -r 44c9f0919ecc -r e5ef80a147fb
src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql Mon Jul 19
09:31:43 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 = ?
diff -r 44c9f0919ecc -r e5ef80a147fb
src/org/openbravo/reference/ui/UIReferenceUtility.java
--- a/src/org/openbravo/reference/ui/UIReferenceUtility.java Mon Jul 19
09:31:43 2010 +0200
+++ b/src/org/openbravo/reference/ui/UIReferenceUtility.java Tue Jul 20
18:25:35 2010 +0200
@@ -184,12 +184,9 @@
text.append("<= ");
text.append("TO_NUMBER(?)");
} else if (reference.equals("10") || reference.equals("14") ||
reference.equals("34")) {
- String aux = "";
- if (!columnname.equalsIgnoreCase("Value") &&
!columnname.equalsIgnoreCase("DocumentNo"))
- aux = "C_IGNORE_ACCENT";
- text.append(aux).append("(");
+ text.append("C_IGNORE_ACCENT").append("(");
text.append(tablename).append(".").append(columnname).append(") LIKE ");
- text.append(aux).append("(?)");
+ text.append("C_IGNORE_ACCENT").append("(?)");
} else if (reference.equals("35")) {
text
.append(
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
