odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge: better year/month OR separations 

bzr revid: fp@tinyerp.com-20111111151839-3dai448l29o0gwov
This commit is contained in:
Fabien Pinckaers 2011-11-11 16:18:39 +01:00
parent 5987d6858f 20a06c35ca
commit c465e9c3f7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/marketing_campaign/report/campaign_analysis_view.xml
View File

@ -32,12 +32,17 @@
<field name="arch" type="xml">
<search string="Campaign Analysis">
<group>
<filter icon="terp-go-year"
string="This Year"
<filter icon="terp-go-year" name="year"
string="Year"
domain="[('year','=',time.strftime('%%Y'))]"/>
<separator orientation="vertical"/>
<filter icon="terp-go-month"
string="This Month"
string="Month" name="This Month"
domain="[('month','=',time.strftime('%%m'))]"/>
<filter icon="terp-go-month" string=" Month-1 "
domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"/>
<filter icon="terp-go-today"
string="Today"
domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
@ -81,7 +86,7 @@
<field name="res_model">campaign.analysis</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="context">{'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1, 'group_by_no_leaf':1}</field>
<field name="context">{'search_default_year': 1,"search_default_This Month":1,'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1, 'group_by_no_leaf':1}</field>
<field name="search_view_id" ref="view_campaign_analysis_search"/>
</record>