odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Merge with trunk-cal-V8-jke. - Change field datetime into date or datetime according to that event type is in all day or not... 

bzr revid: jke@openerp.com-20140505162257-rsb0ez8n9u6engu9
This commit is contained in:
Kersten Jeremy 2014-05-05 18:22:57 +02:00
parent 540b753bf8 20545be3db
commit c9c4e3ab43
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/web_calendar/static/src/js/web_calendar.js
View File

@ -514,8 +514,8 @@ openerp.web_calendar = function(instance) {
date_stop = this.date_stop ? instance.web.auto_str_to_date(evt[this.date_stop]) : null;
}
else {
date_start = instance.web.auto_str_to_date(evt[this.date_start].split(' ')[0],'date');
date_stop = this.date_stop ? instance.web.auto_str_to_date(evt[this.date_stop].split(' ')[0],'date').addMinutes(-1) : null;
date_start = instance.web.auto_str_to_date(evt[this.date_start].split(' ')[0],'start');
date_stop = this.date_stop ? instance.web.auto_str_to_date(evt[this.date_stop].split(' ')[0],'start') : null; //.addSeconds(-1) : null;
}
if (this.info_fields) {
@ -649,9 +649,9 @@ openerp.web_calendar = function(instance) {
event_end = new Date(event.start);
}
if (this.all_day) {
event_end = (new Date(event_end.getTime())).addDays(1);
date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),12);
date_stop_day = new Date(event_end.getFullYear(),event_end.getMonth(),event_end.getDate(),12);
//event_end = (new Date(event_end.getTime())).addDays(1);
date_start_day = new Date(Date.UTC(event.start.getFullYear(),event.start.getMonth(),event.start.getDate()));
date_stop_day = new Date(Date.UTC(event_end.getFullYear(),event_end.getMonth(),event_end.getDate()));
}
else {
date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),7);