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

[IMP]Events : Improve the search view

Browse Source 
bzr revid: dbr@tinyerp.com-20110919095341-2yupmuw6nsz690bq
This commit is contained in:
DBR (OpenERP)
2011-09-19 15:23:41 +05:30
parent bed48f5183
commit 7482f1166b
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/event/event_view.xml
+2 -2
View File
@@ -229,7 +229,7 @@
<field name="arch" type="xml">
<search string="Events">
<group>
<filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
<filter icon="terp-check" string="New" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
<separator orientation="vertical"/>
<field name="name"/>
@@ -475,7 +475,7 @@
<field name="arch" type="xml">
<search string="Event Registration">
<group>
<filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'open'))]" help="Registrations in unconfirmed or confirmed state"/>
<filter icon="terp-check" string="New" name="draft" domain="[('state','in',('draft', 'open'))]" help="Registrations in unconfirmed or confirmed state"/>
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
<separator orientation="vertical"/>
<field name="partner_id" />
addons/event/report/report_event_registration_view.xml
+17 -14
View File
@@ -53,21 +53,24 @@
<field name="arch" type="xml">
<search string="Event on Registration">
<group>
<filter icon="terp-go-year" string="Last 365 Days" name="365day"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Events with beginning date in last 365 days"/>
<filter icon="terp-go-month" string="Last 30 Days"
name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Events with beginning date in last 30 days"/>
<filter icon="terp-go-week"
string="Last 7 Days"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Events with beginning date in last 7 days"/>
<filter string=" Year " icon="terp-go-year"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
help="Events created in current year"/>
<filter string=" Month " icon="terp-go-month" name="this_month"
domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Events created in current month"/>
<filter icon="terp-go-month" string=" Month-1 "
domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
help="Events created in last month"/>
<separator orientation="vertical"/>
<filter icon="terp-check"
string="Current Events" name="draft"
domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
<filter icon="terp-document-new"
string="New"
domain="[('state','=','draft')]"
help="Events which are in draft state"/>
<filter icon="terp-check"
string="Confirm"
domain="[('state','=','confirm')]"
help="Events which are in confirm state"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test"
string="Confirmed Registrations"