Merge lp:~openerp-dev/openerp-web/trunk-bug-1197323-psa into lp:openerp-web

[Paramjit Singh Sahota(OpenERP)]

Hello,

Fixed the issue when we switch to any calendar view where date_stop was not declared than itz will show the traceback **AttributeError: 'NoneType' object has no attribute 'split'**.

Thankz You.

Unmerged revisions

3770. By Paramjit Singh Sahota(OpenERP) on 2013-07-05

[FIX] [trunk/7.0]OpenERP Server Error when clicking on 'Order Planning'

=== modified file 'addons/web_calendar/static/src/js/calendar.js'
--- addons/web_calendar/static/src/js/calendar.js	2013-06-28 09:07:06 +0000
+++ addons/web_calendar/static/src/js/calendar.js	2013-07-05 06:03:26 +0000
@@ -399,11 +399,15 @@
         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],
-            '&', [this.date_stop, '>=', A], [this.date_stop, '<=', B],
-            '&', [this.date_start, '<', A], [this.date_stop, '>', B]
+            '&', [this.date_start, '>=', A], [this.date_start, '<=', B]
         ];
+        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.concat(this.last_search[0].slice(0))
         return domain;
     },