bzr revid: fp@tinyerp.com-20080908003841-pkhr3vrp0063hfvy
This commit is contained in:
Fabien Pinckaers 2008-09-08 02:38:41 +02:00
parent 08a5760e41
commit 49908cfc85
4 changed files with 3 additions and 5 deletions

View File

@ -33,8 +33,6 @@
"category":"Profile",
"depends":[
"hr",
"hr_timesheet",
"hr_timesheet_invoice",
"crm",
"project",
"board_project",

View File

@ -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."),

View File

@ -8,7 +8,7 @@
<field name="arch" type="xml">
<form string="Install Extra Module">
<separator string="Services Management" colspan="4"/>
<field name="hr_timesheet"/>
<field name="project_timesheet"/>
<field name="hr_timesheet_invoice"/>
<field name="project_gtd"/>
<field name="scrum"/>

View File

@ -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),