diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index acf23e94cf0..25b4a13c541 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -41,6 +41,25 @@ + + + hr.analytic.timesheet.search + hr.analytic.timesheet + search + + + + + + + + + + + + + + @@ -50,6 +69,7 @@ form tree,form [('user_id','=',uid)] + @@ -60,7 +80,8 @@ form tree,form [('user_id','=',uid),('date', '=',time.strftime('%Y-%m-%d'))] - + + @@ -71,6 +92,7 @@ hr.analytic.timesheet form tree,form + form tree,form [('date', '=', time.strftime('%Y-%m-%d'))] - + + diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index cc6ba2f690d..03479e40519 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -192,7 +192,9 @@ class purchase_order(osv.osv): store={ 'purchase.order.line': (_get_order, None, 10), }, multi="sums"), - 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position') + 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'), + 'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'), + 'create_uid': fields.many2one('res.users', 'Responsible'), } _defaults = { 'date_order': lambda *a: time.strftime('%Y-%m-%d'), diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 99c9bd26d3e..1c65b1d6d94 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -114,7 +114,7 @@ search - + @@ -122,6 +122,11 @@ + + + + +