diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-03-13 15:17:18 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-03-13 15:17:18 +0100 |
| commit | b255703166c7c648ecbcd311be55daa8acd7f31e (patch) | |
| tree | f30f85cddc68231d0e930d6d5ec8837d148b13f7 /addons/analytic_user_function | |
| parent | ea4198254126cc5f88b2752052fc181fde436564 (diff) | |
| parent | 9568673e0f44c3c44d01dd90446bd1cf15f706a4 (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20130313141718-dw76m7fvy0co3rfi
Diffstat (limited to 'addons/analytic_user_function')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function.py | 4 | ||||
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function_view.xml | 4 |
2 files changed, 4 insertions, 4 deletions
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> |