diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2009-12-15 18:09:19 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2009-12-15 18:09:19 +0100 |
| commit | b2d9b7c28cb7a68b4a509231c558b074ac0a02ea (patch) | |
| tree | 43a12c259a4f429957692c439665b015173e7344 /addons/report_task | |
| parent | 3b1bf0f75d17940f574855f0db0754c331192721 (diff) | |
| parent | 3ef3c46ea02d4a7eeba20172d9b1c5ca635f0e1a (diff) | |
merge
bzr revid: fp@tinyerp.com-20091215170919-ccgfs4gjlg4ih0xo
Diffstat (limited to 'addons/report_task')
| -rw-r--r-- | addons/report_task/report_task.py | 4 | ||||
| -rw-r--r-- | addons/report_task/report_task_view.xml | 21 | ||||
| -rw-r--r-- | addons/report_task/security/ir.model.access.csv | 6 |
3 files changed, 27 insertions, 4 deletions
diff --git a/addons/report_task/report_task.py b/addons/report_task/report_task.py index 35ff87fdeee..aa39769e61f 100644 --- a/addons/report_task/report_task.py +++ b/addons/report_task/report_task.py @@ -128,10 +128,12 @@ class report_timesheet_task_user(osv.osv): return result _columns = { - 'name': fields.date('Month',readonly=True), + 'name': fields.char('Year',size=64,required=False, readonly=True), 'user_id': fields.many2one('res.users', 'User',readonly=True), 'timesheet_hrs': fields.function(get_hrs_timesheet, method=True, string="Timesheet Hours"), 'task_hrs': fields.function(_get_task_hours, method=True, string="Task Hours"), + 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), + ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True), } diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml index 8bc033721a3..c0704b031c8 100644 --- a/addons/report_task/report_task_view.xml +++ b/addons/report_task/report_task_view.xml @@ -48,6 +48,25 @@ </field> </record> + <record id="view_task_project_search" model="ir.ui.view"> + <field name="name">report.project.task.search</field> + <field name="model">report.project.task</field> + <field name="type">search</field> + <field name="arch" type="xml"> + <search string="Tasks by User"> + <group col="8" colspan="4"> + <filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/> + <filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/> + <separator orientation="vertical"/> + <field name="name" select="1"/> + <field name="month" select="1"/> + <field name="user_id" select="1"/> + <field name="project_id" select="1"/> + </group> + </search> + </field> + </record> + <record id="action_project_task" model="ir.actions.act_window"> <field name="name">Tasks by User</field> <field name="res_model">report.task.user.pipeline.open</field> @@ -56,7 +75,7 @@ <field name="domain">[]</field> </record> <menuitem id="next_id_57" name="Reporting" parent="project.menu_main" sequence="50"/> - <menuitem id="next_id_58" name="All Months" parent="next_id_57"/><menuitem action="action_project_task" id="menu_project_task_user_tree" parent="next_id_58"/> + <menuitem action="action_project_task" id="menu_project_task_user_tree" parent="next_id_57"/> <!-- Closed Task in Random Acitivities dashboard --> diff --git a/addons/report_task/security/ir.model.access.csv b/addons/report_task/security/ir.model.access.csv index 90e293a50da..68361fbd928 100644 --- a/addons/report_task/security/ir.model.access.csv +++ b/addons/report_task/security/ir.model.access.csv @@ -1,2 +1,4 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_report_task_user_pipeline_open,report.task.user.pipeline.open,model_report_task_user_pipeline_open,project.group_project_manager,1,0,0,0 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_report_task_user_pipeline_open","report.task.user.pipeline.open","model_report_task_user_pipeline_open","project.group_project_manager",1,0,0,0 +"access_report_timesheet_task_user","report.timesheet.task.user","model_report_timesheet_task_user","project.group_project_manager",1,0,0,0 +"access_report_closed_task","report.closed.task","model_report_closed_task","project.group_project_manager",1,0,0,0 |