updated condition
prakash
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
0
hspl_user_simulation/static/description/assets/images/heliconia-logo-light.png
Normal file → Executable file
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
0
hspl_user_simulation/static/description/assets/images/heliconia-logo.png
Normal file → Executable file
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
0
hspl_user_simulation/static/description/heliconia_odoo_user_simulation.gif
Normal file → Executable file
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
0
hspl_user_simulation/static/description/heliconia_odoo_user_simulation1.gif
Normal file → Executable file
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 1.3 MiB |
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
0
hspl_user_simulation/static/description/screenshots/hspl_user_simulation_1.png
Normal file → Executable file
|
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 67 KiB |
0
hspl_user_simulation/static/description/screenshots/hspl_user_simulation_2.png
Normal file → Executable file
|
Before Width: | Height: | Size: 246 KiB After Width: | Height: | Size: 246 KiB |
0
hspl_user_simulation/static/description/screenshots/hspl_user_simulation_3.png
Normal file → Executable file
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
0
hspl_user_simulation/static/description/screenshots/hspl_user_simulation_4.png
Normal file → Executable file
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 66 KiB |
|
|
@ -5,7 +5,7 @@ from odoo import fields, models, tools, api
|
|||
from datetime import datetime, time, timedelta
|
||||
from odoo.tools.float_utils import float_round
|
||||
|
||||
class ProjectTimelineReport(models.Model):
|
||||
class ProjectTimesheetReport(models.Model):
|
||||
|
||||
_name = "project.timesheet.report"
|
||||
_description = "Project Timesheet Report"
|
||||
|
|
@ -39,14 +39,14 @@ class ProjectTimelineReport(models.Model):
|
|||
if order and isinstance(order, str) and order=='timestamp DESC':
|
||||
#order = order.replace("timestamp ", "start_datetime ")
|
||||
order = "start_datetime desc, end_datetime asc"
|
||||
res = super(ProjectTimelineReport, self).search_read(domain, fields, offset, limit, order)
|
||||
res = super(ProjectTimesheetReport, self).search_read(domain, fields, offset, limit, order)
|
||||
return res
|
||||
|
||||
@api.model
|
||||
def export_data(self, fields):
|
||||
index = range(len(fields))
|
||||
fields_name = dict(zip(fields, index))
|
||||
res = super(ProjectTimelineReport, self).export_data(fields)
|
||||
res = super(ProjectTimesheetReport, self).export_data(fields)
|
||||
for index, val in enumerate(res['datas']):
|
||||
if fields_name.get('start_date') is not None:
|
||||
tdateindex = fields_name.get('start_date')
|
||||
|
|
|
|||