Merge lp:~openerp-dev/openobject-addons/trunk-timeuomprojecttasks-jco into lp:openobject-addons

[Josse Colpaert (OpenERP)]

When changing the uom of project tasks to days it will not put the time format, but the default float format in the timesheets of a task. Then it takes into account the UoM for calculating the timesheets taking into account the product used.

[qdp (OpenERP) (qdp)]

It needs some fixing/explanation:

1) line 15: you removed widget="float_time", but it seems that 'hours' is still the default uom for project management, and if you do things like:
52 + if hours:
53 + return res
then it means that you should leave the float_time widget, no?

2) please add some comments + docstrings in the fields_view_get inheritance to explain what's done there

3) it seems that the same function is duplicated 3 times. Can you make a generic function that will be use 3 times with the model as extra_parameter instead? Factorizing the code is good :-)

that's all i can think of, so far.

review: Needs Fixing

[qdp (OpenERP) (qdp)]

> It needs some fixing/explanation:
>
> 1) line 15: you removed widget="float_time", but it seems that 'hours' is
> still the default uom for project management, and if you do things like:
> 52 + if hours:
> 53 + return res
> then it means that you should leave the float_time widget, no?
>
> 2) please add some comments + docstrings in the fields_view_get inheritance to
> explain what's done there
>
> 3) it seems that the same function is duplicated 3 times. Can you make a
> generic function that will be use 3 times with the model as extra_parameter
> instead? Factorizing the code is good :-)
>
> that's all i can think of, so far.

Unmerged revisions

8546. By Josse Colpaert (OpenERP) on 2013-02-11

[IMP] Read-only UOM field in timesheet activities and amount in float instead of time

8545. By Josse Colpaert (OpenERP) on 2013-02-11

[IMP] Shows work time as time or float depending on project UOM and adds uoms in timesheet activities view

=== modified file 'hr_timesheet/hr_timesheet_view.xml'
--- hr_timesheet/hr_timesheet_view.xml	2013-03-18 11:39:48 +0000
+++ hr_timesheet/hr_timesheet_view.xml	2013-04-12 16:15:36 +0000
@@ -6,14 +6,14 @@
             <field name="name">hr.analytic.timesheet.tree</field>
             <field name="model">hr.analytic.timesheet</field>
             <field name="arch" type="xml">
-                <tree editable="top" string="Timesheet Activities">                  
+                <tree editable="top" string="Timesheet Activities">
                     <field name="date" on_change="on_change_date(date)"/>
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1" options='{"no_open": True}'
                         context="{'default_groups_ref': [base.group_user']}"/>
                     <field name="name"/>
                     <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1, 'default_type': 'contract'}"/>
-                    <field name="unit_amount" string="Duration" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
-                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" invisible="1"/>
+                    <field name="unit_amount" string="Duration" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time"/>
+                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" readonly="1"/>
                     <field name="journal_id" invisible="1"/>
                     <field name="amount" sum="Total cost" invisible="1"/>
                     <field name="general_account_id" invisible="1"/>
@@ -45,7 +45,7 @@
                                 <label string="Duration" for="unit_amount"/>
                                 <div>
                                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
-                                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
+                                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline" readonly="1"/>
                                 </div>
                             </group>
                             <group string="Accounting">

=== modified file 'project/project.py'
--- project/project.py	2013-04-05 15:19:14 +0000
+++ project/project.py	2013-04-12 16:15:36 +0000
@@ -551,6 +551,40 @@
             vals.update(alias_model_id=model_ids[0])
         return super(project, self).write(cr, uid, ids, vals, context=context)
 
+
+            # Override view according to the company definition
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        users_obj = self.pool.get('res.users')
+        if context is None: context = {}
+        # read uom as admin to avoid access rights issues, e.g. for portal/share users,
+        # this should be safe (no context passed to avoid side-effects)
+        obj_tm = users_obj.browse(cr, SUPERUSER_ID, uid, context=context).company_id.project_time_mode_id
+        hour_ids = self.pool.get('product.uom').search(cr, uid, ['|', '|', ('name','=','Hour(s)'), ('name','=','Hour'), ('name','=','Hours')])
+        tm = obj_tm and obj_tm.name or 'Hours'
+        hours = obj_tm and (obj_tm.id in hour_ids) or (tm == 'Hours')
+        res = super(project, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
+
+        if hours:
+            return res
+        eview = etree.fromstring(res['arch'])
+
+        def _check_rec(eview):
+            if eview.attrib.get('widget','') == 'float_time':
+                eview.set('widget','float')
+            for child in eview:
+                _check_rec(child)
+            return True
+
+        _check_rec(eview)
+
+        res['arch'] = etree.tostring(eview)
+
+        hour_tran = _('Hours')
+        for f in res['fields']:
+            if hour_tran in res['fields'][f]['string']:
+                res['fields'][f]['string'] = res['fields'][f]['string'].replace(hour_tran,tm)
+        return res
+
 class task(base_stage, osv.osv):
     _name = "project.task"
     _description = "Task"
@@ -862,13 +896,13 @@
         # read uom as admin to avoid access rights issues, e.g. for portal/share users,
         # this should be safe (no context passed to avoid side-effects)
         obj_tm = users_obj.browse(cr, SUPERUSER_ID, uid, context=context).company_id.project_time_mode_id
+        hour_ids = self.pool.get('product.uom').search(cr, uid, ['|', '|', ('name','=','Hour(s)'), ('name','=','Hour'), ('name','=','Hours')])
         tm = obj_tm and obj_tm.name or 'Hours'
-
+        hours = obj_tm and (obj_tm.id in hour_ids) or (tm == 'Hours')
         res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
 
-        if tm in ['Hours','Hour']:
+        if hours:
             return res
-
         eview = etree.fromstring(res['arch'])
 
         def _check_rec(eview):
@@ -882,9 +916,10 @@
 
         res['arch'] = etree.tostring(eview)
 
+        hour_tran = _('Hours')
         for f in res['fields']:
-            if 'Hours' in res['fields'][f]['string']:
-                res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',tm)
+            if hour_tran in res['fields'][f]['string']:
+                res['fields'][f]['string'] = res['fields'][f]['string'].replace(hour_tran,tm)
         return res
 
     def get_empty_list_help(self, cr, uid, help, context=None):
@@ -1259,6 +1294,39 @@
         return super(project_work,self).unlink(cr, uid, ids,*args, **kwargs)
 
 
+        # Override view according to the company definition
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        users_obj = self.pool.get('res.users')
+        if context is None: context = {}
+        # read uom as admin to avoid access rights issues, e.g. for portal/share users,
+        # this should be safe (no context passed to avoid side-effects)
+        obj_tm = users_obj.browse(cr, SUPERUSER_ID, uid, context=context).company_id.project_time_mode_id
+        hour_ids = self.pool.get('product.uom').search(cr, uid, ['|', '|', ('name','=','Hour(s)'), ('name','=','Hour'), ('name','=','Hours')])
+        tm = obj_tm and obj_tm.name or 'Hours'
+        hours = obj_tm and (obj_tm.id in hour_ids) or (tm == 'Hours')
+        res = super(project_work, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
+
+        if hours:
+            return res
+        eview = etree.fromstring(res['arch'])
+
+        def _check_rec(eview):
+            if eview.attrib.get('widget','') == 'float_time':
+                eview.set('widget','float')
+            for child in eview:
+                _check_rec(child)
+            return True
+
+        _check_rec(eview)
+
+        res['arch'] = etree.tostring(eview)
+
+        hour_tran = _('Hours')
+        for f in res['fields']:
+            if hour_tran in res['fields'][f]['string']:
+                res['fields'][f]['string'] = res['fields'][f]['string'].replace(hour_tran,tm)
+        return res
+
 class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2013-04-05 11:07:37 +0000
+++ project/project_view.xml	2013-04-12 16:15:36 +0000
@@ -355,6 +355,20 @@
             </field>
         </record>
 
+
+        <record id="view_task_work_tree_embed" model="ir.ui.view">
+            <field name="name">project.task.work.tree</field>
+            <field name="model">project.task.work</field>
+            <field name="arch" type="xml">
+                <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>
+        </record>
+
         <!-- Task -->
 
         <record id="view_task_form2" model="ir.ui.view">
@@ -407,14 +421,7 @@
                     <notebook>
                         <page string="Description">
                             <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..."/>
-                            <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>
+                            <field name="work_ids" groups="project.group_tasks_work_on_tasks" context="{'tree_view_ref':'view_task_work_tree_embed'}"/>
                             <group>
                              <group class="oe_subtotal_footer oe_right" name="project_hours" groups="project.group_time_work_estimation_tasks">
                                 <field name="effective_hours" widget="float_time"/>