diff options
| author | Yannick Tivisse <yti@odoo.com> | 2019-02-18 13:05:05 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-02-18 15:28:15 +0000 |
| commit | ac1ec35af0fe9ef92f7f70fa5ffcb94a689d30fb (patch) | |
| tree | c2c67a59e20e8c4d262156a62064dd212fda4b92 /addons/hr_payroll | |
| parent | 8fa8ffdf275ac095fe665d33931ea1ad5d755b4b (diff) | |
[FIX] hr_payroll: Convert a method into a helper function
Diffstat (limited to 'addons/hr_payroll')
| -rw-r--r-- | addons/hr_payroll/models/resource.py | 6 | ||||
| -rw-r--r-- | addons/hr_payroll/views/hr_benefit_views.xml | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/addons/hr_payroll/models/resource.py b/addons/hr_payroll/models/resource.py index 25985687c11..b989eb4ab4a 100644 --- a/addons/hr_payroll/models/resource.py +++ b/addons/hr_payroll/models/resource.py @@ -2,7 +2,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from odoo import models, fields, api - +from odoo.addons.resource.models.resource_mixin import timezone_datetime class ResourceCalendar(models.Model): _inherit = 'resource.calendar' @@ -61,8 +61,8 @@ class ResourceMixin(models.AbstractModel): domain = [('benefit_type_id', 'in', benefit_type_ids)] # naive datetimes are made explicit in UTC - from_datetime = self._timezone_datetime(from_datetime) - to_datetime = self._timezone_datetime(to_datetime) + from_datetime = timezone_datetime(from_datetime) + to_datetime = timezone_datetime(to_datetime) day_total = self._get_day_total(from_datetime, to_datetime, calendar, resource) # actual hours per day diff --git a/addons/hr_payroll/views/hr_benefit_views.xml b/addons/hr_payroll/views/hr_benefit_views.xml index 6aa46656a4c..12fc3b40729 100644 --- a/addons/hr_payroll/views/hr_benefit_views.xml +++ b/addons/hr_payroll/views/hr_benefit_views.xml @@ -45,8 +45,7 @@ if records: <span class="fa fa-exclamation-triangle mr-2" aria-label="Conflict" title="error"/> </t> <t t-if="record.state == 'validated'"> - <span class="fa fa-check-circle-o" aria-label="Validated" title="validated"/> - <t t-esc="' '"/> + <span class="fa fa-check-circle-o mr-2" aria-label="Validated" title="validated"/> </t> <t t-foreach="widget.displayFields" t-as="name"> <t t-esc="format(record, name)"/> @@ -67,7 +66,7 @@ if records: <header> <field name="display_warning" invisible="1"/> <field name="leave_id" invisible="1"/> - <button string="Go To Conflicting Leave" name="action_leave" type="object" attrs="{'invisible': ['|', '|', '!',('display_warning', '=', True), '!', ('leave_id', '!=', False), ('benefit_type_id', '=', False)]}"/> + <button string="Go To Conflicting Leave" name="action_leave" type="object" attrs="{'invisible': ['|', '|', '!',('display_warning', '=', True), ('leave_id', '=', False), ('benefit_type_id', '=', False)]}"/> <field name="state" widget="statusbar" options="{'clickable': '1'}"/> </header> <sheet> |