Therp Backports (Deprecated)

Merge lp:~therp-nl/therp-backports/6.1_fix_949078_and_1023047 into lp:therp-backports

  1. 6.1_fix_949078_and_1023047
  2. Merge into openerp-addons-6.1
Proposed by Holger Brunn (Therp)
Status: Merged
Merged at revision: 6698
Proposed branch: lp:~therp-nl/therp-backports/6.1_fix_949078_and_1023047
Merge into: lp:therp-backports
Diff against target: 26 lines (+4/-2)
2 files modified
hr_timesheet_sheet/hr_timesheet_sheet.py (+1/-1)
project_timesheet/project_timesheet.py (+3/-1)
To merge this branch: bzr merge lp:~therp-nl/therp-backports/6.1_fix_949078_and_1023047
Reviewer Review Type Date Requested Status
Stefan Rijnhart (Opener) (community) Approve
Review via email: mp+142306@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Very good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
2--- hr_timesheet_sheet/hr_timesheet_sheet.py 2012-08-31 10:45:03 +0000
3+++ hr_timesheet_sheet/hr_timesheet_sheet.py 2013-01-08 12:57:24 +0000
4@@ -519,7 +519,7 @@
5 store={
6 'hr_timesheet_sheet.sheet': (_get_hr_timesheet_sheet, ['employee_id', 'date_from', 'date_to'], 10),
7 'account.analytic.line': (_get_account_analytic_line, ['user_id', 'date'], 10),
8- 'hr.analytic.timesheet': (lambda self,cr,uid,ids,context=None: ids, ['line_id'], 10),
9+ 'hr.analytic.timesheet': (lambda self,cr,uid,ids,context=None: ids, None, 10),
10 },
11 ),
12 }
13
14=== modified file 'project_timesheet/project_timesheet.py'
15--- project_timesheet/project_timesheet.py 2012-01-31 13:36:57 +0000
16+++ project_timesheet/project_timesheet.py 2013-01-08 12:57:24 +0000
17@@ -165,7 +165,9 @@
18 if amount_unit and 'amount' in amount_unit.get('value',{}):
19 vals_line['amount'] = amount_unit['value']['amount']
20
21- self.pool.get('hr.analytic.timesheet').write(cr, uid, [line_id.id], vals_line, context=context)
22+ #workaround for lp:1023047
23+ if vals_line:
24+ self.pool.get('hr.analytic.timesheet').write(cr, uid, [line_id.id], vals_line, context=context)
25
26 return super(project_work,self).write(cr, uid, ids, vals, context)
27

Subscribers

People subscribed via source and target branches

to all changes: