pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port of branch 7.0 up to 3e7d3c7

Browse Source
This commit is contained in:
Denis Ledoux
2015-04-27 12:19:43 +02:00
parent 9323f2b4c7 3e7d3c7ee4
commit d6ae7fb7db
16 changed files with 73 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/event/event_view.xml
+1 -1
View File
@@ -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...">