0022481: DateTime in selector filter expression

diff --git a/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java b/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java
@@ -18,7 +18,9 @@
  */
 package org.openbravo.client.application;
 
+import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.Map;
 
@@ -28,6 +30,7 @@
 import org.openbravo.base.util.Check;
 import org.openbravo.base.util.OBClassLoader;
 import org.openbravo.dal.core.OBContext;
+import org.openbravo.service.json.JsonUtils;
 
 /**
  * JS - Java binding to use in JavaScript expressions.
@@ -43,6 +46,7 @@
   private HttpSession httpSession;
   private SimpleDateFormat dateFormat = null;
   private SimpleDateFormat dateTimeFormat = null;
+  private SimpleDateFormat jsdateTimeFormat = null;
 
   public OBBindings(OBContext obContext) {
     Check.isNotNull(obContext, "The OBContext parameter cannot be null");
@@ -68,6 +72,8 @@
 
     dateTimeFormat = new SimpleDateFormat(
         (String) httpSession.getAttribute("#AD_JAVADATETIMEFORMAT"));
+
+    jsdateTimeFormat = JsonUtils.createJSTimeFormat();
   }
 
   public OBContext getContext() {
@@ -181,11 +187,30 @@
       Date result = dateTimeFormat.parse(dateTime);
       return result;
     } catch (Exception e) {
-      log.error("Error parsing string date " + dateTime + " with format: " + dateTimeFormat, e);
+      try {
+        Date UTCTime = new Timestamp(jsdateTimeFormat.parse(dateTime).getTime());
+        Date localTime = convertToLocalTime(UTCTime);
+        return new Timestamp(localTime.getTime());
+      } catch (Exception e1) {
+        log.error("Error parsing string date " + dateTime + " with format: " + dateTimeFormat
+            + " or format: " + jsdateTimeFormat, e1);
+      }
+
     }
     return null;
   }
 
+  private static Date convertToLocalTime(Date UTCTime) {
+    Calendar localTime = Calendar.getInstance();
+    localTime.setTime(UTCTime);
+
+    int gmtMillisecondOffset = (localTime.get(Calendar.ZONE_OFFSET) + localTime
+        .get(Calendar.DST_OFFSET));
+    localTime.add(Calendar.MILLISECOND, gmtMillisecondOffset);
+
+    return localTime.getTime();
+  }
+
   public String formatDate(Date d, String format) {
     Check.isNotNull(format, "Format is a required parameter");
     SimpleDateFormat df = new SimpleDateFormat(format);

diff --git a/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java b/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java
@@ -19,6 +19,7 @@
 package org.openbravo.client.application;
 
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.Map;
 
@@ -28,6 +29,7 @@
 import org.openbravo.base.util.Check;
 import org.openbravo.base.util.OBClassLoader;
 import org.openbravo.dal.core.OBContext;
+import org.openbravo.service.json.JsonUtils;
 
 /**
  * JS - Java binding to use in JavaScript expressions.
@@ -43,6 +45,7 @@
   private HttpSession httpSession;
   private SimpleDateFormat dateFormat = null;
   private SimpleDateFormat dateTimeFormat = null;
+  private SimpleDateFormat jsDateTimeFormat = null;
 
   public OBBindings(OBContext obContext) {
     Check.isNotNull(obContext, "The OBContext parameter cannot be null");
@@ -68,6 +71,8 @@
 
     dateTimeFormat = new SimpleDateFormat(
         (String) httpSession.getAttribute("#AD_JAVADATETIMEFORMAT"));
+
+    jsDateTimeFormat = JsonUtils.createJSTimeFormat();
   }
 
   public OBContext getContext() {
@@ -178,14 +183,30 @@
 
   public Date parseDateTime(String dateTime) {
     try {
-      Date result = dateTimeFormat.parse(dateTime);
+      Date result = convertToLocalTime(jsDateTimeFormat.parse(dateTime));
       return result;
     } catch (Exception e) {
-      log.error("Error parsing string date " + dateTime + " with format: " + dateTimeFormat, e);
+      try {
+        Date result = convertToLocalTime(dateTimeFormat.parse(dateTime));
+        return result;
+      } catch (Exception ex) {
+        log.error("Error parsing string date " + dateTime + " with format: " + dateTimeFormat, e);
+      }
     }
     return null;
   }
 
+  private static Date convertToLocalTime(Date UTCTime) {
+    Calendar localTime = Calendar.getInstance();
+    localTime.setTime(UTCTime);
+
+    int gmtMillisecondOffset = (localTime.get(Calendar.ZONE_OFFSET) + localTime
+        .get(Calendar.DST_OFFSET));
+    localTime.add(Calendar.MILLISECOND, gmtMillisecondOffset);
+
+    return localTime.getTime();
+  }
+
   public String formatDate(Date d, String format) {
     Check.isNotNull(format, "Format is a required parameter");
     SimpleDateFormat df = new SimpleDateFormat(format);