Merge lp:~openerp-dev/openobject-addons/6.1-opw-575493-rha into lp:openobject-addons/6.1

[Rifakat Husen (OpenERP)]

Hello,

Fixed journal_id keyerror while a user tries to edit the task work entry from task.
Did a code refactor in order to get the value of journal_id. (Courtesy to Amit Parikh <email address hidden>)

Thanks for your review,
Rifakat Haradwala

[Leonardo Pistone (lepistone)]

Hi,
can we please merge this one? There is a support ticket on that issue as well.

Thanks!

[Naresh(OpenERP) (nch-openerp)]

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

[Amit Dodiya (OpenERP) (ado-openerp)]

Hello,

I have updated the merge proposal for following issue
Issue : Analytic line entry amount is not updated while changing the users in task work entry

Steps:
1). Install project_timesheet module
2). Create two users with different with different cost price for invoicing on tasks.
3). Now create one task and fill task work entry with one user so the analytic line for invoicing is created
4). After that change the user in above created entry the amount will not get updated according to the user's cost.

Regards,
Amit

review: Needs Resubmitting

[Holger Brunn (Therp) (hbrunn)]

in line 18 of the diff, you say

if 'hours' or 'user_id' in vals:

this is nasty as it always will be true, which will create a lot of bogus error messages to the user. the line should read

if 'hours' in vals or 'user_id' in vals

review: Needs Fixing

Unmerged revisions

7099. By Amit Dodiya<email address hidden> on 2012-12-10

[FIX]: project_timesheet :(1) analytic line is not updated while changing the users in task work entry (2) edit task work gives traceback

=== 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-12-10 13:03:42 +0000
@@ -140,23 +140,21 @@
             vals_line = {}
             if 'name' in vals:
                 vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/')
-            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]
-                        
             if 'date' in vals:
                 vals_line['date'] = vals['date'][:10]
-            if 'hours' in vals:
+            if 'hours' or 'user_id' in vals:
+                vals_line['user_id'] = vals.get('user_id', task.user_id.id)
                 default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
-                vals_line['unit_amount'] = vals['hours']
+                vals_line['unit_amount'] = vals.get('hours', task.hours)
+                result = self.get_user_related_details(cr, uid, vals.get('user_id', task.user_id.id))
+                for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'):
+                    if result.get(fld):
+                        vals_line[fld] = result[fld]
+
+                if result.get('product_uom_id',False) and (not result['product_uom_id'] == default_uom):
+                    vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals.get('hours', task.hours), result['product_uom_id'])
+
                 prod_id = vals_line.get('product_id', line_id.product_id.id) # False may be set
-
-                if result.get('product_uom_id',False) and (not result['product_uom_id'] == default_uom):
-                    vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
-                    
                 # Compute based on pricetype
                 amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, line_id.id,
                     prod_id=prod_id, company_id=False,