Merge lp:~openerp-dev/openobject-addons/trunk-opw-575774-port-mma into lp:openobject-addons

[Mayur Maheshwari(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.

=>Code is forward port from 6.1

Thanks,
Mayur

=== modified file 'project_timesheet/report/task_report.py'
--- project_timesheet/report/task_report.py	2012-10-02 10:29:15 +0000
+++ project_timesheet/report/task_report.py	2012-11-29 11:29:21 +0000
@@ -56,7 +56,7 @@
         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,
@@ -65,12 +65,12 @@
             interval '1 day') ) as task_hrs
         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