diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index a6e5e9ce3f3..6e84747e611 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -73,7 +73,7 @@ [('state','=','draft')] - + Open Analytic Accounts @@ -84,7 +84,7 @@ [('state','=','open')] - + Pending Analytic Accounts @@ -95,7 +95,7 @@ [('state','=','pending')] - + Simplified View Analytic Accounts @@ -106,7 +106,7 @@ [] - + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 00b01f46ed2..3ce0ae29976 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -25,7 +25,7 @@ hr_timesheet_sheet.sheet.account form -
+ @@ -149,17 +149,6 @@ - @@ -201,14 +190,13 @@ - + - + - - + diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 30b07fe8f74..62f7b7cd0a1 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -1,10 +1,8 @@ - - product.product.tree product.product diff --git a/addons/project/project.py b/addons/project/project.py index 3bb08ed8a89..9cca763f8dc 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -120,8 +120,8 @@ class project(osv.osv): 'tasks': fields.one2many('project.task', 'project_id', "Project tasks"), 'parent_id': fields.many2one('project.project', 'Parent Project'), 'child_id': fields.one2many('project.project', 'parent_id', 'Subproject'), - 'planned_hours': fields.function(_calc_planned, method=True, string='Planned hours'), - 'effective_hours': fields.function(_calc_effective, method=True, string='Hours spent'), + 'planned_hours': fields.function(_calc_planned, method=True, string='Planned hours', help="Sum of planned hours of all tasks related to this project."), + 'effective_hours': fields.function(_calc_effective, method=True, string='Hours spent', help="Sum of spent hours of all tasks related to this project."), 'progress_rate': fields.function(_progress_rate, method=True, string='Progress', type='float', help="Percent of tasks closed according to the total of tasks todo."), 'date_start': fields.date('Starting Date'), 'date_end': fields.date('Expected End'),