details: /erp/devel/pi/rev/6b7c616d7412
changeset: 7119:6b7c616d7412
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 22 17:04:38 2010 +0200
summary: fixed bug 12967: The hour in a column defined as datetime is not
saved properly
details: /erp/devel/pi/rev/dc5494f72eac
changeset: 7120:dc5494f72eac
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 22 17:47:21 2010 +0200
summary: fixed bug 13085: ant diagnostics should check for tomcat >=6
diffstat:
src-util/diagnostic/config/diagnostics.properties | 4 ++--
src-wad/src/org/openbravo/wad/Wad.java | 11 +++++++----
2 files changed, 9 insertions(+), 6 deletions(-)
diffs (46 lines):
diff -r ec07533734ac -r dc5494f72eac
src-util/diagnostic/config/diagnostics.properties
--- a/src-util/diagnostic/config/diagnostics.properties Thu Apr 22 15:27:21
2010 +0200
+++ b/src-util/diagnostic/config/diagnostics.properties Thu Apr 22 17:47:21
2010 +0200
@@ -11,7 +11,7 @@
# * under the License.
# * The Original Code is Openbravo ERP.
# * The Initial Developer of the Original Code is Openbravo SLU
-# * All portions are Copyright (C) 2008 Openbravo SLU
+# * All portions are Copyright (C) 2008-2010 Openbravo SLU
# * All Rights Reserved.
# * Contributor(s): ______________________________________.
# ************************************************************************
@@ -27,4 +27,4 @@
db.pg.version=8.3.3
db.pg.windows.version=8.3.5
-tomcat.version=5.5
+tomcat.version=6
diff -r ec07533734ac -r dc5494f72eac src-wad/src/org/openbravo/wad/Wad.java
--- a/src-wad/src/org/openbravo/wad/Wad.java Thu Apr 22 15:27:21 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/Wad.java Thu Apr 22 17:47:21 2010 +0200
@@ -2737,8 +2737,10 @@
fieldsDataUpdate[i].name = ((i > 0) ? ", " : "") +
fieldsDataUpdate[i].name;
if (fieldsDataUpdate[i].reference.equals("24"))
fieldsDataUpdate[i].xmlFormat = "TO_TIMESTAMP(?,'HH24:MI:SS')";
- else if (fieldsDataUpdate[i].reference.equals("16")) { // datetime
- fieldsDataUpdate[i].xmlFormat = "TO_DATE(?, ?)";
+ else if (fieldsDataUpdate[i].reference.equals("16")) {
+ // datetime, use time stamp: it works for ORA date and for PG. In
pg, to_date(text, text)
+ // does not save time
+ fieldsDataUpdate[i].xmlFormat = "TO_TIMESTAMP(?, ?)";
} else
fieldsDataUpdate[i].xmlFormat = WadUtility.sqlCasting(pool,
fieldsDataUpdate[i].reference,
fieldsDataUpdate[i].referencevalue)
@@ -2792,8 +2794,9 @@
if (fieldsDataValue[i].reference.equals("24")) {
fieldsDataValue[i].name = ((i > 0) ? ", " : "") + "TO_TIMESTAMP(?,
'HH24:MI:SS')";
} else if (fieldsDataValue[i].reference.equals("16")) {
- // datetime
- fieldsDataValue[i].name = ((i > 0) ? ", " : "") + "TO_DATE(?, ?)";
+ // datetime, use time stamp: it works for ORA date and for PG. In
pg, to_date(text,
+ // text) does not save time
+ fieldsDataValue[i].name = ((i > 0) ? ", " : "") + "TO_TIMESTAMP(?,
?)";
} else {
fieldsDataValue[i].name = ((i > 0) ? ", " : "")
+ WadUtility.sqlCasting(pool, fieldsDataValue[i].reference,
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
