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

merge: better year/month OR separations 

bzr revid: fp@tinyerp.com-20111111152234-04mikqjz330uxfgn
This commit is contained in:
Fabien Pinckaers 2011-11-11 16:22:34 +01:00
parent 4ede9b0113 8d5c382475
commit 2883f49f91
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/crm_claim/report/crm_claim_report_view.xml
View File

@ -54,15 +54,16 @@
<field name="arch" type="xml">
<search string="Search">
<group>
<filter string=" Year " icon="terp-go-year"
<filter string="Year" icon="terp-go-year" name="year"
domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
help="Claims created in current year"/>
<separator orientation="vertical" />
<filter string=" Month " icon="terp-go-month" name="This Month"
<filter string="Month" icon="terp-go-month" name="This Month"
domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Claims created in current month"/>
<filter icon="terp-go-month" string=" Month-1 "
<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'))]"
help="Claims created in last month"/>
@ -151,11 +152,11 @@
help="Date of claim"/>
<filter string="Month" icon="terp-go-month"
domain="[]" context="{'group_by':'month'}"
domain="[]" context="{'group_by':'month'}"
help="Month of claim"/>
<filter string="Year" icon="terp-go-year"
domain="[]" context="{'group_by':'name'}"
domain="[]" context="{'group_by':'name'}"
help="Year of claim"/>
</group>
</search>
@ -169,7 +170,7 @@
<field name="res_model">crm.claim.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="context">{"search_default_year":1,"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="view_id" ref="view_report_crm_claim_tree"/>
<field name="search_view_id" ref="view_report_crm_claim_filter"/>
<field name="help">Have a general overview of all claims processed in the system by sorting them with specific criteria.</field>

11
addons/crm_fundraising/report/crm_fundraising_report_view.xml
View File

@ -76,15 +76,16 @@
<field name="arch" type="xml">
<search string="Search">
<group>
<filter string=" Year " icon="terp-go-year"
<filter string="Year" icon="terp-go-year" name="year"
domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
help="Funds raised in current year"/>
<separator orientation="vertical" />
<filter string=" Month " icon="terp-go-month" name="This Month"
<filter string="Month" icon="terp-go-month" name="This Month"
domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Funds raised in current month"/>
<filter icon="terp-go-month" string=" Month-1 "
<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'))]"
help="Funds raised in last month"/>
<separator orientation="vertical" />
@ -151,7 +152,7 @@
domain="[]" context="{'group_by':'day'}"
help="Date of fundraising"/>
<filter string="Month" icon="terp-go-month"
domain="[]" context="{'group_by':'month'}"
domain="[]" context="{'group_by':'month'}"
help="Month of fundraising"/>
<filter string="Year" icon="terp-go-year"
domain="[]" context="{'group_by':'name'}" />
@ -167,7 +168,7 @@
<field name="res_model">crm.fundraising.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="context">{"search_default_year":1,"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="view_id" ref="view_report_crm_fundraising_tree"/>
<field name="search_view_id" ref="view_report_crm_fundraising_filter"/>
<field name="help">Have a general overview of all fund raising activities by sorting them with specific criteria such as the estimated revenue, average success probability and delay to close.</field>

12
addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
View File

@ -54,13 +54,15 @@
<field name="arch" type="xml">
<search string="Search">
<group>
<filter string=" Year " icon="terp-go-year"
<filter string="Year" icon="terp-go-year" name="year"
domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
help="Helpdesk requests occurred in current year"/>
<filter string=" Month " icon="terp-go-month" name="this_month"
<separator orientation="vertical" />
<filter string="Month" icon="terp-go-month" name="this_month"
domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Helpdesk requests occurred in current month"/>
<filter icon="terp-go-month" string=" Month-1 "
<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'))]"
help="Helpdesk requests occurred in last month"/>
<separator orientation="vertical" />
@ -111,7 +113,7 @@
<filter string="State" icon="terp-stock_effects-object-colorize"
domain="[]" context="{'group_by':'state'}" />
<separator orientation="vertical" />
<filter string="Company" icon="terp-go-home"
<filter string="Company" icon="terp-go-home"
domain="[]"
groups="base.group_multi_company"
context="{'group_by':'company_id'}" />
@ -134,7 +136,7 @@
<field name="res_model">crm.helpdesk.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{"search_default_User":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="context">{"search_default_year":1,"search_default_User":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="view_id" ref="view_report_crm_helpdesk_tree"/>
<field name="search_view_id" ref="view_report_crm_helpdesk_filter"/>
<field name="help">Have a general overview of all support requests by sorting them with specific criteria such as the processing time, number of requests answered, emails sent and costs.</field>