summaryrefslogtreecommitdiff
path: root/addons/web_calendar/static/src/js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-05-24 13:19:19 +0200
committerChristophe Simonis <chs@odoo.com>2016-05-24 13:19:19 +0200
commitfac4cc7006e5d72a5f6ee261e8a7422c78f5e6fb (patch)
treefacc8cb60bcd0f1d0536f6f004d05aefcf444fc7 /addons/web_calendar/static/src/js
parentfacb6644839c2120296e0845b8f780cb9998e34e (diff)
parentf8e6bb73b3aed541fd96e28ec0382ea9964a1db7 (diff)
[MERGE] forward port of branch saas-9 up to f8e6bb7
Diffstat (limited to 'addons/web_calendar/static/src/js')
-rw-r--r--addons/web_calendar/static/src/js/web_calendar.js8
1 files changed, 3 insertions, 5 deletions
diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index b42bdd5c2d9..b756be1b7a4 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -841,13 +841,11 @@ var CalendarView = View.extend({
*/
get_range_domain: function(domain, start, end) {
var format = time.date_to_str;
-
var extend_domain = [[this.date_start, '<=', format(end)]];
-
if (this.date_stop) {
- extend_domain.push(
- [this.date_stop, '>=', format(start)]
- );
+ extend_domain.push([this.date_stop, '>=', format(start)]);
+ } else if (!this.date_delay) {
+ extend_domain.push([this.date_start, '>=', format(start)]);
}
return new CompoundDomain(domain, extend_domain);
},