Merge lp:~sbi/c2c-addons/6.1-timesheet_task_fix into lp:c2c-addons/6.1

[Stéphane Bidoul (Acsone)]

In timesheet_task, the on_change event mixes the project id and analytic account id. Indeed, the account_id field in hr.analytic.timesheet is an analytic account, not a project.

[lp:~sbi/c2c-addons/6.1-timesheet_task_fix]

106. By Stéphane Bidoul (Acsone) on 2012-09-04

remove reference to non-existent fields unit_amount and hours_to_inv

107. By Stéphane Bidoul (Acsone) on 2012-09-16

Merge from upstream

=== modified file 'hr_timesheet_task/hr_analytic_timesheet_view.xml'
--- hr_timesheet_task/hr_analytic_timesheet_view.xml	2012-05-02 13:27:15 +0000
+++ hr_timesheet_task/hr_analytic_timesheet_view.xml	2012-09-16 15:18:21 +0000
@@ -13,9 +13,6 @@
                     <field name="task_id" context="{ 'account_id' : account_id}"
                         domain="[('state','=','open')]"/>
                 </xpath>
-                <xpath expr="/form/notebook/group/field[@name='unit_amount']" position="after">
-                    <field name="hours_to_inv"/>
-                </xpath>
             </field>
         </record>
         <record id="hr_timesheet.hr_timesheet_line_tree" model="ir.ui.view">

=== modified file 'timesheet_task/project_task.py'
--- timesheet_task/project_task.py	2012-05-02 13:27:15 +0000
+++ timesheet_task/project_task.py	2012-09-16 15:18:21 +0000
@@ -106,12 +106,12 @@
                                                                      journal_id,
                                                                      context)
         if 'value' in res and task_id:
-            proj_obj = self.pool.get('project.task')
-            aa = proj_obj.browse(cr, uid, task_id).project_id
-            if aa:
-                res['value']['account_id'] = aa.id
-            if aa.to_invoice and not to_invoice:
-                res['value']['to_invoice'] = aa.to_invoice.id
+            task_obj = self.pool.get('project.task')
+            p = task_obj.browse(cr, uid, task_id).project_id
+            if p:
+                res['value']['account_id'] = p.analytic_account_id.id
+                if p.to_invoice and not to_invoice:
+                    res['value']['to_invoice'] = p.to_invoice.id
         return res
 
 HrAnalyticTimesheet()