diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py index 4d701341a72..b90f9dd1a89 100644 --- a/addons/hr_contract/hr_contract.py +++ b/addons/hr_contract/hr_contract.py @@ -80,20 +80,20 @@ class hr_contract(osv.osv): _name = 'hr.contract' _description = 'Contract' _columns = { - 'name' : fields.char('Contract Reference', size=30, required=True), - 'employee_id' : fields.many2one('hr.employee', "Employee", required=True), - 'department_id' : fields.related('employee_id','department_id', string="Department", readonly=True), - 'type_id' : fields.many2one('hr.contract.type', "Contract Type"), - 'job_id' : fields.many2one('hr.job', 'Job Title'), - 'date_start' : fields.date('Start Date', required=True), - 'date_end' : fields.date('End Date'), - 'working_hours_per_day_id' : fields.many2one('resource.calendar','Working hours per day'), - 'wage_type_id' : fields.many2one('hr.contract.wage.type', 'Wage Type', required=True), - 'wage' : fields.float('Wage', digits=(16,2), required=True), + 'name': fields.char('Contract Reference', size=30, required=True), + 'employee_id': fields.many2one('hr.employee', "Employee", required=True), + 'department_id': fields.related('employee_id','department_id', string="Department", readonly=True), + 'type_id': fields.many2one('hr.contract.type', "Contract Type"), + 'job_id': fields.many2one('hr.job', 'Job Title'), + 'date_start': fields.date('Start Date', required=True), + 'date_end': fields.date('End Date'), + 'working_hours': fields.many2one('resource.calendar','Working hours'), + 'wage_type_id': fields.many2one('hr.contract.wage.type', 'Wage Type', required=True), + 'wage': fields.float('Wage', digits=(16,2), required=True), 'advantages': fields.text('Advantages'), 'advantages_net': fields.float('Net Advantages Value', digits=(16,2)), 'advantages_gross': fields.float('Gross Advantages Value', digits=(16,2)), - 'notes' : fields.text('Notes'), + 'notes': fields.text('Notes'), } _defaults = { 'date_start' : lambda *a : time.strftime("%Y-%m-%d"), diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index 13e61c21ac4..e198cc35de5 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -57,9 +57,9 @@ hr.contract.wage.type.period form - @@ -76,7 +76,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -204,7 +204,7 @@ - + diff --git a/addons/project/project.py b/addons/project/project.py index 7a412bfecfe..e9c11cc605c 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -299,7 +299,7 @@ class task(osv.osv): 'remaining_hours': fields.float('Remaining Hours', digits=(16,4), help="Total remaining time, can be re-estimated periodically by the assignee of the task."), 'total_hours': fields.function(_hours_get, method=True, string='Total Hours', multi='hours', store=True, help="Computed as: Time Spent + Remaining Time."), 'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', store=True, help="Computed as: Time Spent / Total Time."), - 'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', store=True, help="Computed as: Total Time - Estimated Time. It gives the difference of the time estimated by the project manager and the real time to close the task."), + 'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', store=True, help="Computed as difference of the time estimated by the project manager and the real time to close the task."), 'user_id': fields.many2one('res.users', 'Assigned to'), 'delegated_user_id': fields.related('child_ids','user_id',type='many2one', relation='res.users', string='Delegated To'),