Change upcoming filter to current & upcoming on event search

This commit is contained in:
Youssef Elouahby 2020-05-20 00:06:57 +00:00
parent 73f53fdec3
commit c95a54bd6c
2 changed files with 38 additions and 1 deletions

View File

@ -25,9 +25,10 @@
'license': 'AGPL-3', 'license': 'AGPL-3',
'application': True, 'application': True,
'installable': True, 'installable': True,
'depends': ['product', 'account', 'golem_base', 'golem_season'], 'depends': ['product', 'account', 'golem_base', 'golem_season', 'event'],
'data': ['security/ir.model.access.csv', 'data': ['security/ir.model.access.csv',
'data/golem_activity_data.xml', 'data/golem_activity_data.xml',
'views/golem_activity_views.xml', 'views/golem_activity_views.xml',
'views/event_views.xml',
'report/golem_activity_report_templates.xml'] 'report/golem_activity_report_templates.xml']
} }

View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
Copyright 2020 Youssef EL OUAHBY <youssef@yaltik.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<odoo>
<data>
<record id="golem_activity_inherit_view_event_search" model="ir.ui.view">
<field name="name">Golem Activity Event Tracks</field>
<field name="inherit_id" ref="event.view_event_search"/>
<field name="model">event.event</field>
<field name="arch" type="xml">
<filter name="upcoming" position="replace">
<filter string="Current and Upcoming" name="upcoming"
domain="['&amp;', ('state', '!=', 'cancel'), '|',
('date_begin','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0))),
('date_end','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]"
help="Upcoming events from today" />
</filter>
</field>
</record>
</data>
</odoo>