Merge lp:~laetitia-gangloff/hr-timesheet/migrationV7 into lp:~hr-core-editors/hr-timesheet/7.0

[Laetitia Gangloff (Acsone)]

I tried to migrate the module timesheet_task to work with the V7.

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

Thanks for the merge proposal.

Please do not rename work_ids to aa_ids we keep the name for compatibility reason and to avoid to redefine some view. It will also be harder to migrate the module.

I think we have also done some work internally to migrate this add-on. If it is the case I will ask my colleague join his work with yours if you do not mind.

Regards

review: Needs Fixing

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

You commit make me realize that the goal of the module is not clear. We do want to replace work_ids to timesheet line. It was done intentionally. I will provide a MP with a better __openerp__.py with a better description.

Regards

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

Hello,

thank you for your answer.

It seems not possible to replace work_ids with another relation.

In the project module, work_ids field is a relation with project.task.work. In the view project.view_task_form2 some fields of project.task.work are used, but the model is project.task. With this relation, the view has no problem to find all components.
But, if I overload work_ids with another relation, then the view, can't be loaded. Even, if it is replaced by the new view. This is du to the ir_ui_view._check_render_view method that check that all components for the view are valid.

Regards

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

This mean we have to override view_task_form2 because it define tree view internally:

                            <field name="work_ids" groups="project.group_tasks_work_on_tasks">
                                <tree string="Task Work" editable="top">
                                    <field name="name"/>
                                    <field name="hours" widget="float_time" sum="Spent Hours"/>
                                    <field name="date"/>
                                    <field name="user_id"/>
                                </tree>
                            </field>

The best solution is probably to remove the tree definition of view in order to use the raw timesheet line view.

Regards

Nicolas

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

Hello,

actually, this module inherits view_task_form2 by replacing the part work_ids.

I quickly tried, to define a specific view for this internal tree, and to use work_ids, it worked. But I did that in the module project and I don't see how to do that in this module.

Thank you

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

@Nicolas, you have a look on this when coming back please ? Thanks.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Nicolas, can you give your view?

For my part, I approve from a nitpicking point of view, but I don't know if it is correct regarding the goal of the module.

review: Approve (nitpicking)

[Stéphane Bidoul (Acsone) (sbi)]

This MP is superseeded by
https://code.launchpad.net/~acsone-openerp/hr-timesheet/migration_hr_timesheet_taskV7/+merge/154433 which includes migration of hr_timesheet_task

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Hello, could you please, change the status of the branch linked to this MP as 'abandonned' to make it clearer?

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I put the status to 'Rejected' to reflect its replacement by https://code.launchpad.net/~acsone-openerp/hr-timesheet/migration_hr_timesheet_taskV7/+merge/154433

Unmerged revisions

=== modified file 'timesheet_task/__openerp__.py'
--- timesheet_task/__openerp__.py	2012-12-13 12:20:12 +0000
+++ timesheet_task/__openerp__.py	2013-02-13 17:55:25 +0000
@@ -32,7 +32,7 @@
  'update_xml': ['project_task_view.xml'],
  'demo_xml': [],
  'tests': [],
- 'installable': False,
+ 'installable': True,
  'images' : [],
  'auto_install': False,
  'license': 'AGPL-3',

=== modified file 'timesheet_task/project_task.py'
--- timesheet_task/project_task.py	2012-10-26 13:01:39 +0000
+++ timesheet_task/project_task.py	2013-02-13 17:55:25 +0000
@@ -29,7 +29,7 @@
 
 from osv import osv, fields
 
-TASK_WATCHERS = ['work_ids', 'remaining_hours', 'planned_hours']
+TASK_WATCHERS = ['aa_ids', 'remaining_hours', 'planned_hours']
 AA_WATCHERS = ['unit_amount', 'product_uom_id', 'account_id', 'to_invoice', 'task_id']
 
 class ProjectTask(osv.osv):
@@ -66,7 +66,8 @@
         return result
 
 
-    _columns = {'work_ids': fields.one2many('hr.analytic.timesheet', 'task_id', 'Work done'),
+    _columns = {'aa_ids': fields.one2many('hr.analytic.timesheet', 'task_id', 'Work done'),
+                
 
     'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent',
                                        help="Sum of spent hours of all tasks related to this project and its child projects.",
@@ -96,7 +97,7 @@
             project = project_obj.browse(cr, uid, vals['project_id'], context)
             account_id = project.analytic_account_id.id
             for task in self.browse(cr, uid, ids, context=context):
-                ts_obj.write(cr, uid, [w.id for w in task.work_ids], {'account_id': account_id}, context=context)
+                ts_obj.write(cr, uid, [w.id for w in task.aa_ids], {'account_id': account_id}, context=context)
         return res
 
 ProjectTask()

=== modified file 'timesheet_task/project_task_view.xml'
--- timesheet_task/project_task_view.xml	2012-06-06 13:14:12 +0000
+++ timesheet_task/project_task_view.xml	2013-02-13 17:55:25 +0000
@@ -1,16 +1,13 @@
 <openerp>
     <data>
-        #---------------------------------------------------------------------------------------------------------
-        #   Adapt task views
-        #---------------------------------------------------------------------------------------------------------
         <record id="view_task_form2" model="ir.ui.view">
             <field name="name">project.task.form</field>
             <field name="model">project.task</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='work_ids']" position="replace">
-                    <field colspan="4" name="work_ids" nolabel="1" attrs="{'invisible':[('state','in',['draft'])],'readonly':[('state','=','done')]}">
+                <xpath expr="/form/sheet/notebook/page/field[@name='work_ids']" position="replace">
+					<field colspan="4" name="aa_ids" nolabel="1" attrs="{'invisible':[('state','in',['draft'])],'readonly':[('state','=','done')]}">
                         <tree string="Task Work" editable="top">
                             <field name="user_id" on_change="on_change_user_id(user_id)" required="1" invisible="1"/>
                             <field name="name"/>