From a9268af14052f1c98058de763d417e5569fa433f Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Wed, 7 Jun 2017 12:50:34 +0200 Subject: [PATCH] [IMP] project: Compute correclty the working days on reports --- addons/project/report/project_report.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py index 0970453875a..22dcca906e2 100644 --- a/addons/project/report/project_report.py +++ b/addons/project/report/project_report.py @@ -13,17 +13,16 @@ class ReportProjectTaskUser(models.Model): name = fields.Char(string='Task Title', readonly=True) user_id = fields.Many2one('res.users', string='Assigned To', readonly=True) date_start = fields.Datetime(string='Assignation Date', readonly=True) - no_of_days = fields.Integer(string='# Working Days', readonly=True) date_end = fields.Datetime(string='Ending Date', readonly=True) date_deadline = fields.Date(string='Deadline', readonly=True) date_last_stage_update = fields.Datetime(string='Last Stage Update', readonly=True) project_id = fields.Many2one('project.project', string='Project', readonly=True) - closing_days = fields.Float(string='# Days to Close', + working_days_close = fields.Float(string='# Working Days to Close', digits=(16,2), readonly=True, group_operator="avg", - help="Number of Days to close the task") - opening_days = fields.Float(string='# Days to Assign', + help="Number of Working Days to close the task") + working_days_open = fields.Float(string='# Working Days to Assign', digits=(16,2), readonly=True, group_operator="avg", - help="Number of Days to Open the task") + help="Number of Working Days to Open the task") delay_endings_days = fields.Float(string='# Days to Deadline', digits=(16,2), readonly=True) nbr = fields.Integer('# of Tasks', readonly=True) # TDE FIXME master: rename into nbr_tasks priority = fields.Selection([ @@ -49,7 +48,6 @@ class ReportProjectTaskUser(models.Model): t.date_end as date_end, t.date_last_stage_update as date_last_stage_update, t.date_deadline as date_deadline, - abs((extract('epoch' from (t.write_date-t.date_start)))/(3600*24)) as no_of_days, t.user_id, t.project_id, t.priority, @@ -58,8 +56,8 @@ class ReportProjectTaskUser(models.Model): t.partner_id, t.stage_id as stage_id, t.kanban_state as state, - (extract('epoch' from (t.write_date-t.create_date)))/(3600*24) as closing_days, - (extract('epoch' from (t.date_start-t.create_date)))/(3600*24) as opening_days, + t.working_days_close as working_days_close, + t.working_days_open as working_days_open, (extract('epoch' from (t.date_deadline-(now() at time zone 'UTC'))))/(3600*24) as delay_endings_days """ return select_str