Merge lp:~openerp-dev/openobject-addons/6.1-opw-575774-pso into lp:openobject-addons/6.1

[Priyesh (OpenERP)]

Hello,

To reproduce the issue:

Create a task at Project/Project/Tasks and start it.
Enter a task work line of the current date and save the task.
Open Human Resources/Reporting/Timesheet/Task Hours Per Month view, there's no error.
In the same task create a new task work line of the same month, but different year.
Open "Task Hours Per Month" view, error occurs.

I fixed this issue in this branch.

Kindly review it and provide your opinion on this.

Regards,
Priyesh

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-575774-port-mma/+merge/136911 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6841. By Priyesh (OpenERP) on 2012-06-13

[FIX] project_timesheet: KeyError: 'user_id' coming due to not creation unique id from postgres view(case:575774)

=== modified file 'project_timesheet/report/task_report.py'
--- project_timesheet/report/task_report.py	2011-07-01 23:41:24 +0000
+++ project_timesheet/report/task_report.py	2012-06-13 06:48:27 +0000
@@ -70,19 +70,19 @@
         tools.drop_view_if_exists(cr, 'report_timesheet_task_user')
         cr.execute(""" create or replace view report_timesheet_task_user as (
         select
-         ((r.id*12)+to_number(months.m_id,'99'))::integer as id,
+         ((r.id*12)+to_number(months.m_id,'999999'))::integer as id,
                months.name as name,
                r.id as user_id,
                to_char(to_date(months.name, 'YYYY/MM/DD'),'YYYY') as year,
                to_char(to_date(months.name, 'YYYY/MM/DD'),'MM') as month
         from res_users r,
                 (select to_char(p.date,'YYYY-MM-01') as name,
-            to_char(p.date,'MM') as m_id
+            to_char(p.date,'YYYYMM') as m_id
                 from project_task_work p
 
             union
                 select to_char(h.name,'YYYY-MM-01') as name,
-                to_char(h.name,'MM') as m_id
+                to_char(h.name,'YYYYMM') as m_id
                 from hr_timesheet_sheet_sheet_day h) as months
 
             group by