summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2015-11-23 13:49:10 +0100
committerThibault Delavallée <tde@openerp.com>2015-11-23 14:47:11 +0100
commitd035fef6572f08dc3d5dfd51a90b952e1b7a8236 (patch)
tree983926d6249c63d8cc0e65ece82e4038d96957b3
parent1466a0063f631ea086c57ec6654b92e399b494d3 (diff)
[FIX] event: do not show canceled events by default
Upcoming filter show events that begin in the future. However it is not necessary to show canceled events. The filter has been udpated accordingly.
-rw-r--r--addons/event/views/event_views.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml
index 5661e395781..19434a8d58b 100644
--- a/addons/event/views/event_views.xml
+++ b/addons/event/views/event_views.xml
@@ -246,7 +246,8 @@
<separator/>
<filter string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
<separator/>
- <filter string="Upcoming" name="upcoming" domain="[('date_begin','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]" help="Upcoming events from today" />
+ <filter string="Upcoming" name="upcoming"
+ domain="['&amp;', ('state', '!=', 'cancel'), ('date_begin','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]" help="Upcoming events from today" />
<field name="event_type_id"/>
<field name="user_id"/>
<separator/>