Merge lp:~olivier-laurent/c2c-addons/trunk-bug1069799 into lp:c2c-addons/6.1

[Olivier Laurent (Acsone)]

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hi,

Sounds good.

Thanks
Guewen

review: Approve

=== modified file 'hr_timesheet_task/hr_analytic_timesheet_view.xml'
--- hr_timesheet_task/hr_analytic_timesheet_view.xml	2012-09-04 17:15:02 +0000
+++ hr_timesheet_task/hr_analytic_timesheet_view.xml	2012-10-22 14:07:32 +0000
@@ -70,7 +70,7 @@
                         domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Current Month"/>
                     <filter icon="terp-go-week" string="    Week    " separator="1" name="week"
-                        domain="[('date','&lt;=', (datetime.date.today() + relativedelta(weeks=0,day=7, weekday=-1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(weeks=1, weekday=0)).strftime('%%Y-%%m-%%d'))]"
+                        domain="[('date','&gt;=',(datetime.date.today()+relativedelta(days=-6,weekday=0)).strftime('%%Y-%%m-%%d')),('date','&lt;=',(datetime.date.today()+relativedelta(weekday=6)).strftime('%%Y-%%m-%%d'))]"
                         help="Current week"/>
                 </xpath>
 
 
=== modified file 'hr_timesheet_task/hr_timesheet_sheet_view.xml'
--- hr_timesheet_task/hr_timesheet_sheet_view.xml	2012-05-02 13:27:15 +0000
+++ hr_timesheet_task/hr_timesheet_sheet_view.xml	2012-10-22 14:07:32 +0000
@@ -16,7 +16,7 @@
                         domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Current Month"/>
                     <filter icon="terp-go-week" string="    Week    " separator="1" name="week"
-                        domain="[('date_from','&lt;=', (datetime.date.today() + relativedelta(weeks=0,day=7, weekday=-1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(weeks=1, weekday=0)).strftime('%%Y-%%m-%%d'))]"
+                        domain="[('date_from','&gt;=',(datetime.date.today()+relativedelta(days=-6,weekday=0)).strftime('%%Y-%%m-%%d')),('date_from','&lt;=',(datetime.date.today()+relativedelta(weekday=6)).strftime('%%Y-%%m-%%d'))]"
                         help="Current week"/>
                 </xpath>