[FIX] misc fixes on contracts, timesheets

bzr revid: fp@openerp.com-20130312123321-mly0k9lrh3im78bg
2013-03-12 13:33:21 +01:00
parent 3890039735
commit c7d709e579
14 changed files with 66 additions and 32 deletions
@@ -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