diff -r 2eba7d34bea9 -r 2bf04c456587 modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java	Wed Sep 17 11:23:17 2014 +0200
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java	Wed Sep 17 14:26:26 2014 +0200
@@ -391,12 +391,12 @@
       // See issue https://issues.openbravo.com/view.php?id=22971
       return "";
     }
+    if (value instanceof Timestamp) {
+      return xmlDateTimeFormat.format(value);
+    }
     if (value instanceof Date) {
       return xmlDateFormat.format(value);
     }
-    if (value instanceof Timestamp) {
-      return xmlDateTimeFormat.format(value);
-    }
     return value;
   }