[MERGE] forward port of branch saas-5 up to e4cb520

[odoo/odoo.git] / addons / project / report / project_report.py

diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 515973d..1356a1e 100644 (file)
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -28,8 +28,9 @@ class report_project_task_user(osv.osv):
     _description = "Tasks by user and project"
     _auto = False
     _columns = {
-        'name': fields.char('Task Summary', size=128, readonly=True),
+        'name': fields.char('Task Summary', readonly=True),
         'user_id': fields.many2one('res.users', 'Assigned To', readonly=True),
+        'reviewer_id': fields.many2one('res.users', 'Reviewer', readonly=True),
         'date_start': fields.date('Assignation Date', readonly=True),
         'no_of_days': fields.integer('# of Days', size=128, readonly=True),
         'date_end': fields.date('Ending Date', readonly=True),
@@ -49,7 +50,7 @@ class report_project_task_user(osv.osv):
         'delay_endings_days': fields.float('Overpassed Deadline', digits=(16,2), readonly=True),
         'nbr': fields.integer('# of tasks', readonly=True),
         'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')],
-            string='Priority', readonly=True),
+            string='Priority', size=1, readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Contact', readonly=True),
         'stage_id': fields.many2one('project.task.type', 'Stage'),
@@ -63,13 +64,13 @@ class report_project_task_user(osv.osv):
               SELECT
                     (select 1 ) AS nbr,
                     t.id as id,
-                    date_trunc('day',t.date_start) as date_start,
-                    date_trunc('day',t.date_end) as date_end,
-                    date_trunc('day',t.date_last_stage_update) as date_last_stage_update,
-                    to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_deadline,
---                    sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
+                    date(t.date_start) as date_start,
+                    date(t.date_end) as date_end,
+                    date(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.reviewer_id,
                     progress as progress,
                     t.project_id,
                     t.effective_hours as hours_effective,
@@ -102,6 +103,7 @@ class report_project_task_user(osv.osv):
                     date_deadline,
                     date_last_stage_update,
                     t.user_id,
+                    t.reviewer_id,
                     t.project_id,
                     t.priority,
                     name,