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

merge: better year/month OR separations 

bzr revid: fp@tinyerp.com-20111111151506-75zyu4a7ogb6bgm2
This commit is contained in:
Fabien Pinckaers 2011-11-11 16:15:06 +01:00
parent 2583db204a 0ce0b6e89c
commit 5987d6858f
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/project/report/project_report_view.xml
View File

@ -60,15 +60,17 @@
<field name="arch" type="xml">
<search string="Tasks Analysis">
<group>
<filter icon="terp-go-year" string=" Year "
<filter icon="terp-go-year" string="Year"
name="year"
domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;=',time.strftime('%%Y-01-01'))]"
help="Current Year"/>
<filter icon="terp-go-month" string=" Month "
<separator orientation="vertical"/>
<filter icon="terp-go-month" string="Month"
name="month"
domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Current Month"/>
<filter icon="terp-go-week"
string=" Month-1 "
string="Month-1"
domain="[('date_start','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
help="Previous Month"/>
<separator orientation="vertical"/>
@ -146,7 +148,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_task_project_user_search"/>
<field name="context">{'search_default_month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="context">{'search_default_year':1,'search_default_month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
</record>

5
addons/project_issue/report/project_issue_report_view.xml
View File

@ -54,9 +54,10 @@
<search string="Search">
<group>
<filter string="Year" icon="terp-go-year" help="Current Year"
name="year"
domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
/>
<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'))]"
/>
@ -139,7 +140,7 @@
<field name="res_model">project.issue.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="context">{'search_default_This Month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="context">{'search_default_year':1,'search_default_This Month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="view_id" ref="view_project_issue_report_tree"/>
<field name="search_view_id" ref="view_project_issue_report_filter"/>
<field name="help">This report on the project issues allows you to analyse the quality of your support or after-sales services. You can track the issues per age. You can analyse the time required to open or close an issue, the number of email to exchange and the time spent on average by issues.</field>

7
addons/project_timesheet/report/task_report_view.xml
View File

@ -31,11 +31,12 @@
<field name="arch" type="xml">
<search string="Tasks by User">
<group>
<filter icon="terp-go-year" string=" Year "
<filter icon="terp-go-year" string="Year"
name="year"
domain="[('name','&lt;=', time.strftime('%%Y-%%m-%%d')),('name','&gt;=',time.strftime('%%Y-01-01'))]"
help="Task Hours in current year"/>
<filter icon="terp-go-month" string=" Month "
<separator orientation="vertical"/>
<filter icon="terp-go-month" string="Month"
name="month"
domain="[('name','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('name','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Task Hours in current month"/>
@ -76,7 +77,7 @@
<field name="res_model">report.timesheet.task.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{'search_default_month':1, 'search_default_group_user_id':1}</field>
<field name="context">{'search_default_year':1,'search_default_month':1, 'search_default_group_user_id':1}</field>
</record>
<menuitem id="menu_timesheet_task_user" parent="hr_timesheet.menu_hr_reporting_timesheet"
action="action_report_timesheet_task_user" sequence="1"/>