pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] hr_holiday: correct call to get_working_hours + typo

Browse Source
This commit is contained in:
Yannick Tivisse
2016-07-13 12:53:34 +02:00
parent dc77ed4f90
commit ee9b64a428
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/models/hr_holidays.py
+5 -5
View File
@@ -163,10 +163,10 @@ class Holidays(models.Model):
('validate1', 'Second Approval'),
('validate', 'Approved')
], string='Status', readonly=True, track_visibility='onchange', copy=False, default='confirm',
help="The status is set to 'To Submit', when a holiday request is created.\
\nThe status is 'To Approve', when holiday request is confirmed by user.\
\nThe status is 'Refused', when holiday request is refused by manager.\
\nThe status is 'Approved', when holiday request is approved by manager.")
help="The status is set to 'To Submit', when a holiday request is created." +
"\nThe status is 'To Approve', when holiday request is confirmed by user." +
"\nThe status is 'Refused', when holiday request is refused by manager." +
"\nThe status is 'Approved', when holiday request is approved by manager.")
payslip_status = fields.Boolean('Reported in last payslips',
help='Green this button when the leave has been taken into account in the payslip.')
report_note = fields.Text('HR Comments')
@@ -284,7 +284,7 @@ class Holidays(models.Model):
uom_hour = resource.calendar_id.uom_id
uom_day = self.env.ref('product.product_uom_day')
if uom_hour and uom_day:
return self.env['product.uom']._compute_qty_obj(uom_hour, hours[0], uom_day)
return self.env['product.uom']._compute_qty_obj(uom_hour, hours, uom_day)
time_delta = to_dt - from_dt
return math.ceil(time_delta.days + float(time_delta.seconds) / 86400)