Merge lp:~openerp-dev/openerp-web/6.1-opw-579979-msh into lp:openerp-web/6.1

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of date/datetime parsing which goes failed when trailing 0 missed in value by parseExact.

If you have specified date/datetime format %dd/%mm/%yy %H:%M:%S and if you does not enter trailing 0 in value like 4/10/12 10:10:00 then it will interchange the month and date, it happens if you missed any trailing 0 in date or in time.

Reason :- Reason is that parse the date/datetime value using parseExact and if we missed trailing 0 then parseExact will fail and parse is called which will parse date/datetime in default format, so month and date is interchanged.

Thanks.

Unmerged revisions

2464. By Mohammed Shekha(Open ERP) on 2012-10-10

[FIX]Fixed the issue of date/datetime not parsed by parseExact if someone missed to enter trailing 0, like format is %dd/%mm/%yy and if he enters date 4/10/12 then parseExact will fail, and on fialing we have called parse method which parse the date/datetime in mm/dd/yy format, so due to this month and date is interchanged.

=== modified file 'addons/web/static/lib/datejs/parser.js'
--- addons/web/static/lib/datejs/parser.js	2011-08-22 14:39:24 +0000
+++ addons/web/static/lib/datejs/parser.js	2012-10-10 06:12:19 +0000
@@ -766,13 +766,13 @@
 
     // hour, minute, second, meridian, timezone
     g.h = _.cache(_.process(_.rtoken(/^(0[0-9]|1[0-2]|[1-9])/), t.hour));
-    g.hh = _.cache(_.process(_.rtoken(/^(0[0-9]|1[0-2])/), t.hour));
+    g.hh = _.cache(_.process(_.rtoken(/^(0[0-9]|1[0-2]|[1-9])/), t.hour));
     g.H = _.cache(_.process(_.rtoken(/^([0-1][0-9]|2[0-3]|[0-9])/), t.hour));
-    g.HH = _.cache(_.process(_.rtoken(/^([0-1][0-9]|2[0-3])/), t.hour));
+    g.HH = _.cache(_.process(_.rtoken(/^([0-1][0-9]|2[0-3]|[0-9])/), t.hour));
     g.m = _.cache(_.process(_.rtoken(/^([0-5][0-9]|[0-9])/), t.minute));
-    g.mm = _.cache(_.process(_.rtoken(/^[0-5][0-9]/), t.minute));
+    g.mm = _.cache(_.process(_.rtoken(/^[0-5][0-9]|[0-9]/), t.minute));
     g.s = _.cache(_.process(_.rtoken(/^([0-5][0-9]|[0-9])/), t.second));
-    g.ss = _.cache(_.process(_.rtoken(/^[0-5][0-9]/), t.second));
+    g.ss = _.cache(_.process(_.rtoken(/^[0-5][0-9]|[0-9]/), t.second));
     g.hms = _.cache(_.sequence([g.H, g.m, g.s], g.timePartDelimiter));
   
     // _.min(1, _.set([ g.H, g.m, g.s ], g._t));
@@ -788,7 +788,7 @@
     // days, months, years
     g.d = _.cache(_.process(_.each(_.rtoken(/^([0-2]\d|3[0-1]|\d)/), 
         _.optional(g.ctoken2("ordinalSuffix"))), t.day));
-    g.dd = _.cache(_.process(_.each(_.rtoken(/^([0-2]\d|3[0-1])/), 
+    g.dd = _.cache(_.process(_.each(_.rtoken(/^([0-2]\d|3[0-1]|\d)/), 
         _.optional(g.ctoken2("ordinalSuffix"))), t.day));
     g.ddd = g.dddd = _.cache(_.process(g.ctoken("sun mon tue wed thu fri sat"), 
         function (s) { 
@@ -798,7 +798,7 @@
         }
     ));
     g.M = _.cache(_.process(_.rtoken(/^(1[0-2]|0\d|\d)/), t.month));
-    g.MM = _.cache(_.process(_.rtoken(/^(1[0-2]|0\d)/), t.month));
+    g.MM = _.cache(_.process(_.rtoken(/^(1[0-2]|0\d|\d)/), t.month));
     g.MMM = g.MMMM = _.cache(_.process(
         g.ctoken("jan feb mar apr may jun jul aug sep oct nov dec"), t.month));
     g.y = _.cache(_.process(_.rtoken(/^(\d\d?)/), t.year));