HR - Timesheet Management

Merge lp:~laetitia-gangloff/hr-timesheet/update_with_rev_9235 into lp:~hr-core-editors/hr-timesheet/7.0

  1. update_with_rev_9235
  2. Merge into 7.0
Proposed by Laetitia Gangloff (Acsone)
Status: Merged
Merged at revision: 48
Proposed branch: lp:~laetitia-gangloff/hr-timesheet/update_with_rev_9235
Merge into: lp:~hr-core-editors/hr-timesheet/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
hr_timesheet_task/static/src/js/timesheet.js (+1/-1)
To merge this branch: bzr merge lp:~laetitia-gangloff/hr-timesheet/update_with_rev_9235
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp code review, no test Approve
Stéphane Bidoul (Acsone) (community) Approve
Review via email: mp+172839@code.launchpad.net

Description of the change

Following the change of the file timesheet.js of the module hr_timesheet_sheet in the revision 9235 (http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/9235) on the 7.0, I updated the file timesheet.js of the module hr_timesheet_task to take account of the change.

To post a comment you must log in.
Revision history for this message
Stéphane Bidoul (Acsone) (sbi) wrote :

LGTM. Alignment with v7 timesheet.js. Please send the mp through the default review path.

review: Approve
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

LGTM

review: Approve (code review, no test)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_timesheet_task/static/src/js/timesheet.js'
2--- hr_timesheet_task/static/src/js/timesheet.js 2013-04-10 16:14:47 +0000
3+++ hr_timesheet_task/static/src/js/timesheet.js 2013-07-03 14:53:26 +0000
4@@ -223,7 +223,7 @@
5
6 _.each(self.accounts, function(account) {
7 var auth_keys = _.extend(_.clone(account.account_defaults), {
8- name: true, unit_amount: true, date: true, account_id: true, task_id: true,
9+ name: true, amount:true, unit_amount: true, date: true, account_id:true, task_id: true,
10 });
11 _.each(account.days, function(day) {
12 _.each(day.lines, function(line) {