Merge lp:~cedric-lebrouster/openerp-web/7.0-bug-1163912-calendar-view into lp:openerp-web/7.0

[Cedric Le Brouster(OpenFire)]

Correction of the fix 3989 for the bug 1163912 (didn't work for calendars using date_delay instead of date_stop).

Unmerged revisions

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

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

=== modified file 'addons/web_calendar/static/src/js/calendar.js'
--- addons/web_calendar/static/src/js/calendar.js	2014-02-14 11:42:58 +0000
+++ addons/web_calendar/static/src/js/calendar.js	2014-04-10 10:02:31 +0000
@@ -396,19 +396,12 @@
         });
     },
     get_range_domain: function() {
-        var format = instance.web.date_to_str;
-        var A = format(this.range_start.clone().addDays(-6));
-        var B = format(this.range_stop.clone().addDays(6));
-        var domain = [
-            '&', [this.date_start, '>=', A], [this.date_start, '<=', B]
-        ];
+        var format = instance.web.date_to_str,
+            domain = this.last_search[0].slice(0);
+        domain.unshift([this.date_start, '<=', format(this.range_stop.clone().addDays(6))]);
         if (this.date_stop) {
-            domain.push(
-            '&', [this.date_stop, '>=', A], [this.date_stop, '<=', B],
-            '&', [this.date_start, '<', A], [this.date_stop, '>', B]);
-            domain.unshift("|", "|");
+            domain.unshift([this.date_stop, '>=', format(this.range_start.clone().addDays(-6))]);
         }
-        domain.concat(this.last_search[0].slice(0))
         return domain;
     },
     do_show: function () {