subh_pal_org
/
cor
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into 'master' 

Updated Timesheet report filter

See merge request prakash.jain/cor-odoo!150
This commit is contained in:
prakash.jain 2021-03-09 04:49:25 -08:00
parent 9d74237ed0 9647e89cc7
commit 0560941a73
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project_report/report/project_timesheet_report.py
View File

@ -12,7 +12,7 @@ class ProjectTimelineReport(models.Model):
_order = 'start_date desc, project_id desc'
_auto = False
start_date = fields.Date(string='Start Date', readonly=True)
start_date = fields.Date(string='Start Time', readonly=True)
employee_id = fields.Many2one('hr.employee', string='Employee', readonly=True)
project_id = fields.Many2one('project.project', string='Project', readonly=True)
#sub_project = fields.Many2one('project.project', string='Sub Project', readonly=True)

3
project_report/report/project_timesheet_report_views.xml
View File

@ -29,10 +29,11 @@
<field name="employee_id"/>
<field name="start_date"/>
<field name="task_id"/>
<filter name="month" string="Start Time" date="start_date"/>
<group expand="1" string="Group By">
<filter string="Project" name="project" context="{'group_by':'project_id'}"/>
<filter string="Employee" name="employee" context="{'group_by':'employee_id'}"/>
<filter string="Start Date" name="sdate" domain="[]" context="{'group_by':'start_date:month'}"/>
<filter string="Start Time" name="sdate" domain="[]" context="{'group_by':'start_date:month'}"/>
<filter string="Task" name="task" context="{'group_by':'task_id'}"/>
</group>
</search>