diff options
| author | sgo@tinyerp.com <> | 2013-03-14 18:30:46 +0530 |
|---|---|---|
| committer | sgo@tinyerp.com <> | 2013-03-14 18:30:46 +0530 |
| commit | 32cb2a3509b8f1ec4d2d280d655f1793ad6f5f1d (patch) | |
| tree | 6f3591a0b340fb6bceb6ac65b9c5989799dde740 /addons/analytic_user_function | |
| parent | a21b4b9b56c8e3c0b2e6a71417765d9566b2356a (diff) | |
| parent | 829961c05d8a0c977f8bfd4dad18264b71118cfa (diff) | |
[MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130312051713-cph3m3pjozii3jwn
bzr revid: sgo@tinyerp.com-20130314130046-3bi97qv1628co8i3
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> |