[FIX] web_calendar: Revert d9e6a7a as was fixed differently at rev e220136
authorMartin Trigaux <mat@openerp.com>
Fri, 11 Jul 2014 11:57:45 +0000 (13:57 +0200)
committerMartin Trigaux <mat@openerp.com>
Fri, 11 Jul 2014 11:58:26 +0000 (13:58 +0200)
Fixing calendar view errors, opw 609989

addons/web_calendar/static/src/js/web_calendar.js

index e75806b..ad49ff9 100644 (file)
@@ -657,13 +657,17 @@ openerp.web_calendar = function(instance) {
                     date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),7);
                     date_stop_day = new Date(event_end.getFullYear(),event_end.getMonth(),event_end.getDate(),19);
                 }
+                data[this.date_start] = instance.web.parse_value(date_start_day, this.fields[this.date_start]);
+                if (this.date_stop) {
+                    data[this.date_stop] = instance.web.parse_value(date_stop_day, this.fields[this.date_stop]);
+                }
                 diff_seconds = Math.round((date_stop_day.getTime() - date_start_day.getTime()) / 1000);
                                 
             }
             else {
-                data[this.date_start] = event.start;
+                data[this.date_start] = instance.web.parse_value(event.start, this.fields[this.date_start]);
                 if (this.date_stop) {
-                    data[this.date_stop] = event_end;
+                    data[this.date_stop] = instance.web.parse_value(event_end, this.fields[this.date_stop]);
                 }
                 diff_seconds = Math.round((event_end.getTime() - event.start.getTime()) / 1000);
             }