Camptocamp Addons

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

  1. trunk-bug1069799
  2. Merge into 6.1
Proposed by Olivier Laurent (Acsone)
Status: Merged
Merge reported by: Guewen Baconnier @ Camptocamp
Merged at revision: not available
Proposed branch: lp:~olivier-laurent/c2c-addons/trunk-bug1069799
Merge into: lp:c2c-addons/6.1
Diff against target: 24 lines (+2/-2)
2 files modified
hr_timesheet_task/hr_analytic_timesheet_view.xml (+1/-1)
hr_timesheet_task/hr_timesheet_sheet_view.xml (+1/-1)
To merge this branch: bzr merge lp:~olivier-laurent/c2c-addons/trunk-bug1069799
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp Approve
Review via email: mp+130818@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Hi,

Sounds good.

Thanks
Guewen

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_timesheet_task/hr_analytic_timesheet_view.xml'
2--- hr_timesheet_task/hr_analytic_timesheet_view.xml 2012-09-04 17:15:02 +0000
3+++ hr_timesheet_task/hr_analytic_timesheet_view.xml 2012-10-22 14:07:32 +0000
4@@ -70,7 +70,7 @@
5 domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
6 help="Current Month"/>
7 <filter icon="terp-go-week" string=" Week " separator="1" name="week"
8- 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'))]"
9+ 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'))]"
10 help="Current week"/>
11 </xpath>
12
13
14=== modified file 'hr_timesheet_task/hr_timesheet_sheet_view.xml'
15--- hr_timesheet_task/hr_timesheet_sheet_view.xml 2012-05-02 13:27:15 +0000
16+++ hr_timesheet_task/hr_timesheet_sheet_view.xml 2012-10-22 14:07:32 +0000
17@@ -16,7 +16,7 @@
18 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'))]"
19 help="Current Month"/>
20 <filter icon="terp-go-week" string=" Week " separator="1" name="week"
21- 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'))]"
22+ 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'))]"
23 help="Current week"/>
24 </xpath>
25

Subscribers

People subscribed via source and target branches