diff --git a/addons/profile_service/__terp__.py b/addons/profile_service/__terp__.py index 2353e2e6731..906b583fc66 100644 --- a/addons/profile_service/__terp__.py +++ b/addons/profile_service/__terp__.py @@ -33,8 +33,6 @@ "category":"Profile", "depends":[ "hr", - "hr_timesheet", - "hr_timesheet_invoice", "crm", "project", "board_project", diff --git a/addons/profile_service/profile_service.py b/addons/profile_service/profile_service.py index 95ac4cd6d99..55f3620ca9f 100644 --- a/addons/profile_service/profile_service.py +++ b/addons/profile_service/profile_service.py @@ -35,7 +35,7 @@ class config_install_extra_modules(osv.osv_memory): _rec_name = 'crm_configuration' _columns = { 'crm_configuration':fields.boolean('CRM & Calendars', help="This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."), - 'hr_timesheet':fields.boolean('Timesheets', help="Timesheets allows you to track time and costs spent on different projects, represented by analytic accounts."), + 'project_timesheet':fields.boolean('Timesheets', help="Timesheets allows you to track time and costs spent on different projects, represented by analytic accounts."), 'hr_timesheet_invoice':fields.boolean('Invoice on Timesheets', help="There are different invoicing methods in OpenERP: from sale orders, from shippings, ... Install this module if you plan to invoice your customers based on time spent on projects."), 'hr_holidays':fields.boolean('Holidays Management', help="Tracks the full holidays management process, from the employee's request to the global planning."), 'hr_expense':fields.boolean('Expenses Tracking', help="Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."), diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml index e3a4dbc26b1..e6edeecdeb0 100644 --- a/addons/profile_service/profile_service.xml +++ b/addons/profile_service/profile_service.xml @@ -8,7 +8,7 @@
- + diff --git a/addons/project/project.py b/addons/project/project.py index 3b3211f56c1..3e66310bcbb 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -244,7 +244,7 @@ class task(osv.osv): 'notes': fields.text('Notes'), 'start_sequence': fields.boolean('Wait for previous sequences'), - 'planned_hours': fields.float('Planned Hours', readonly=True, states={'draft':[('readonly',False)]}), + 'planned_hours': fields.float('Planned Hours', readonly=True, states={'draft':[('readonly',False)]}, required=True), 'effective_hours': fields.function(_hours_get, method=True, string='Hours Spent', multi='hours', store=True), 'remaining_hours': fields.float('Remaining Hours', digits=(16,2)), 'total_hours': fields.function(_hours_get, method=True, string='Total Hours', multi='hours', store=True),