Merge lp:~cedric-lebrouster/ocb-web/ocb-6.1-bug-1163912-calendar-view into lp:ocb-web/6.1

[Cedric Le Brouster(OpenFire)]

Fixes the bug 1163912 (Calendar views did not show events starting in previous month).

[Holger Brunn (Therp) (hbrunn)]

To stay compatible with calendars using date_delay, you should do your behavior if date_stop is defined and the original otherwise. So instead of deleting #8, wrap it into "if(!this.date_stop)"

review: Needs Fixing

Unmerged revisions

2522. By Cedric Le Brouster(OpenFire) on 2014-04-10

[FIX] Calendar month view does not show events starting in previous month. bug-1163912

=== modified file 'addons/web_calendar/static/src/js/calendar.js'
--- addons/web_calendar/static/src/js/calendar.js	2013-03-01 09:35:20 +0000
+++ addons/web_calendar/static/src/js/calendar.js	2014-04-10 13:09:33 +0000
@@ -438,8 +438,10 @@
     get_range_domain: function() {
         var format = openerp.web.date_to_str,
             domain = this.last_search[0].slice(0);
-        domain.unshift([this.date_start, '>=', format(this.range_start.clone().addDays(-6))]);
         domain.unshift([this.date_start, '<=', format(this.range_stop.clone().addDays(6))]);
+        if (this.date_stop) {
+            domain.unshift([this.date_stop, '>=', format(this.range_start.clone().addDays(-6))]);
+        }
         return domain;
     },
     do_show: function () {