Merge lp:~openerp-dev/openobject-addons/6.1-opw-573846-skh into lp:openobject-addons/6.1

[Somesh Khare]

Hello Sir,

[Fix]: Key error: Journal_id Error occurred when updating the task work, In Webclient 'user_id' did not passed in vals.

Steps to reproduce the issue:
 1) Create a new Task and Start it.
 2) Enter "Task Work" details save it
 3) Save the Task
 4) re- open the task and edit already entered task work line, edit the time spent and give blank spaces in the "Work Summary"
 Until now, everything is fine.
 5) Press the Save button of the task

This branch fixes this issue, Kindly review the branch and please share your views on it.

Thanks,
Somesh Khare

[Vinay Rana (OpenERP) (vra-openerp)]

The provided fix will solve the issue.

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Already Fixed on Trunk (means that it was already fixed and merged in Trunk). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6769. By Somesh Khare on 2012-04-26

[FIX] project_timesheet.py: Key Error Journal_id Error in webclient (Case: ref 573846)

=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py	2012-01-31 13:36:57 +0000
+++ project_timesheet/project_timesheet.py	2012-04-26 12:54:08 +0000
@@ -140,13 +140,13 @@
             vals_line = {}
             if 'name' in vals:
                 vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/')
+            vals_line['user_id'] = task.user_id.id
             if 'user_id' in vals:
                 vals_line['user_id'] = vals['user_id']
-                result = self.get_user_related_details(cr, uid, vals['user_id'])
-                for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'):
-                    if result.get(fld, False):
-                        vals_line[fld] = result[fld]
-                        
+            result = self.get_user_related_details(cr, uid, vals_line['user_id'])
+            for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'):
+                if result.get(fld, False):
+                    vals_line[fld] = result[fld]
             if 'date' in vals:
                 vals_line['date'] = vals['date'][:10]
             if 'hours' in vals: