From c7d709e5791ec57ec64f119116dee88a2984f15e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 12 Mar 2013 13:33:21 +0100
Subject: [FIX] misc fixes on contracts, timesheets

bzr revid: fp@openerp.com-20130312123321-mly0k9lrh3im78bg
---
 addons/analytic_user_function/analytic_user_function.py       | 4 ++--
 addons/analytic_user_function/analytic_user_function_view.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/analytic_user_function')

diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index ec2aa1688d6..0573292c1f6 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -42,12 +42,12 @@ class analytic_user_funct_grid(osv.osv):
             return {}
 
         value = {}
+        if product_id:
+           prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
         emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
         if emp.product_id and not product_id:
             value['product_id'] = emp.product_id.id
             prod = emp.product_id
-        if product_id:
-            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
         if prod:
             value['price'] = prod.list_price
             value['uom_id'] = prod.uom_id.id
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 490b3026d7f..69e1add13bb 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -11,7 +11,7 @@
                     <field name="user_id" on_change="onchange_user_product_id(user_id, product_id)"/>
                     <field name="product_id" on_change="onchange_user_product_id(user_id, product_id)" domain="[('type','=','service')]"/>
                     <field name="price"/>
-                    <field name="uom_id"/>
+                    <field name="uom_id" groups="product.group_uom"/>
                 </tree>
             </field>
         </record>
@@ -25,7 +25,7 @@
                         <field name="user_id" on_change="onchange_user_product_id(user_id, product_id)"/>
                         <field name="product_id" domain="[('type','=','service')]" on_change="onchange_user_product_id(user_id, product_id)"/>
                         <field name="price"/>
-                        <field name="uom_id"/>
+                        <field name="uom_id" groups="product.group_uom"/>
                     </group>
                 </form>
             </field>
-- 
cgit v1.2.3