Merge lp:~openerp-dev/openobject-addons/6.1-opw-580059-ksa into lp:openobject-addons/6.1

Proposed by Kirti Savalia(OpenERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 7020
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-580059-ksa
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
project_timesheet/ (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-580059-ksa
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email:

Description of the change


Install the module project_timesheet then task is linked to a billed project.

Steps to reproduce:
1)Create a new entry in task work for a task A. For example 2h
3)Update the entry you have just created and change the time spend field to 4h


To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :


This bug was qualified as Not Reproducible on Trunk. If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Naresh Soni

Unmerged revisions

7020. By Kirti Savalia(OpenERP) <email address hidden>

[FIX]:task is linked to a billed project got the error

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'project_timesheet/'
2--- project_timesheet/ 2012-01-31 13:36:57 +0000
3+++ project_timesheet/ 2012-10-09 08:20:24 +0000
4@@ -160,7 +160,7 @@
5 # Compute based on pricetype
6 amount_unit = timesheet_obj.on_change_unit_amount(cr, uid,,
7 prod_id=prod_id, company_id=False,
8- unit_amount=vals_line['unit_amount'], unit=False, journal_id=vals_line['journal_id'], context=context)
9+ unit_amount=vals_line['unit_amount'], unit=False, journal_id=vals_line.get('journal_id',False), context=context)
11 if amount_unit and 'amount' in amount_unit.get('value',{}):
12 vals_line['amount'] = amount_unit['value']['amount']