Timesheet Report order updated
This commit is contained in:
parent
9128e5abae
commit
af75e3e127
|
@ -9,10 +9,12 @@ class ProjectTimelineReport(models.Model):
|
|||
|
||||
_name = "project.timesheet.report"
|
||||
_description = "Project Timesheet Report"
|
||||
_order = 'start_date desc, duration, project_id desc'
|
||||
#_order = 'start_date desc, duration, project_id desc'
|
||||
_order = 'start_datetime desc, duration, project_id desc'
|
||||
_auto = False
|
||||
|
||||
start_date = fields.Date(string='Start Time', readonly=True)
|
||||
start_datetime = fields.Datetime("Start DateTime", required=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)
|
||||
|
@ -28,6 +30,13 @@ class ProjectTimelineReport(models.Model):
|
|||
for val in self:
|
||||
val.sub_project = val.project_id.sub_project.ids"""
|
||||
|
||||
@api.model
|
||||
def search_read(self, domain=None, fields=None, offset=0,limit=None, order=None):
|
||||
if order and isinstance(order, str):
|
||||
order = order.replace("timestamp ", "start_datetime ")
|
||||
res = super(ProjectTimelineReport, self).search_read(domain, fields, offset, limit, order)
|
||||
return res
|
||||
|
||||
@api.model
|
||||
def export_data(self, fields):
|
||||
index = range(len(fields))
|
||||
|
@ -72,6 +81,7 @@ class ProjectTimelineReport(models.Model):
|
|||
SELECT
|
||||
ROW_NUMBER() OVER() as id,
|
||||
aal.start_datetime::date as start_date,
|
||||
aal.start_datetime as start_datetime,
|
||||
aal.employee_id,
|
||||
aal.project_id,
|
||||
aal.sub_project,
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
<field name="duration"/>
|
||||
<field name="timestamp"/>
|
||||
<field name="description"/>
|
||||
<field name="start_datetime" invisible="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
Loading…
Reference in New Issue