summaryrefslogtreecommitdiff
path: root/addons/event/event_view.xml
diff options
context:
space:
mode:
authorDenis Ledoux <dle@odoo.com>2015-04-27 12:19:43 +0200
committerDenis Ledoux <dle@odoo.com>2015-04-27 12:19:43 +0200
commitd6ae7fb7dbd2ae4eec32e4cd5bc3649feef0784e (patch)
tree59ce4e3e7cc67695b8a84c030bf428076d7c809e /addons/event/event_view.xml
parent9323f2b4c75d61a4169efceabac08e09f03d6062 (diff)
parent3e7d3c7ee4f8838e0a9c347eca016e746175a634 (diff)
[MERGE] forward port of branch 7.0 up to 3e7d3c7
Diffstat (limited to 'addons/event/event_view.xml')
-rw-r--r--addons/event/event_view.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 07a36ea3a6b..1b5c3cbfe72 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -270,7 +270,7 @@
<separator/>
<filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
<separator/>
- <filter icon="terp-go-today" string="Upcoming" name="upcoming" domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Upcoming events from today" />
+ <filter icon="terp-go-today" string="Upcoming" name="upcoming" domain="[('date_begin','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]" help="Upcoming events from today" />
<field name="type"/>
<field name="user_id"/>
<group expand="0" string="Group By...">