Merge lp:~openerp-dev/openerp-web/7.0-opw-594748-fka into lp:openerp-web/7.0

[Foram Katharotiya (OpenERP)]

Hello,

 Fixed The issue of AttributeError: 'NoneType' object has no attribute 'split' in calander view of all modules where date_stop field was not passed.

Thanks,
FKA

[Csaba TOTH (tsabi)]

This patch was merged in rev 4003
Please mark as merged!

Unmerged revisions

3995. By Foram Katharotiya (OpenERP) on 2013-07-05

[FIX] AttributeError: 'NoneType' object has no attribute 'split' in calander viewof all module where date_stop field wasn't declared

=== 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 10:48: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]
         ];
+        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;
     },