Merge branch 'development' into 'master'

Development

See merge request prakash.jain/cor-odoo!166
This commit is contained in:
prakash.jain 2021-04-05 07:37:52 -07:00
commit ef5b5191f9
1 changed files with 3 additions and 1 deletions

View File

@ -75,7 +75,9 @@ class ProjectTimelineReport(models.Model):
project_id,
sub_project,
unit_amount as duration,
CONCAT(to_char(start_datetime at time zone 'utc', 'HH24:MI'), '-', to_char(end_datetime at time zone 'utc', 'HH24:MI')) as timestamp,
CONCAT(to_char((start_datetime at time zone 'utc') at time zone 'Asia/Jerusalem', 'HH24:MI'), '-',
to_char((end_datetime at time zone 'utc') at time zone 'Asia/Jerusalem', 'HH24:MI')) as timestamp,
--CONCAT(to_char(start_datetime at time zone 'utc', 'HH24:MI'), '-', to_char(end_datetime at time zone 'utc', 'HH24:MI')) as timestamp,
task_id,
name as description
from account_analytic_line