[IMP] hr_holidays : improve dashboard's display
The warning message when you have a half-day off confirmed while the duration of this leave's type is daily is moved towards the bottom of the sheet to avoid overlap between this message and the ribbon. And to improve the readibility of the dialog view, the scroll bar is removed when it's not needed. closes odoo/odoo#159454 Task: 3820211 Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
This commit is contained in:
@@ -271,7 +271,7 @@
|
||||
<field name="tz_mismatch" invisible="1"/>
|
||||
<field name="holiday_type" invisible="1" readonly="state not in ['confirm', 'draft']"/>
|
||||
<field name="leave_type_request_unit" invisible="1"/>
|
||||
<div class="o_hr_leave_content row my-n4">
|
||||
<div class="o_hr_leave_content">
|
||||
<div class="o_hr_leave_column col_left col-md-6 col-12">
|
||||
<div name="title" class="o_hr_leave_title" invisible="1">
|
||||
<field name="employee_id" readonly="1" force_save="1" invisible="1"/>
|
||||
@@ -279,9 +279,6 @@
|
||||
<field name="display_name" invisible="not holiday_status_id"/>
|
||||
</div>
|
||||
<field name="leave_type_increases_duration" invisible="True"/>
|
||||
<div name="duration_warning" invisible="not leave_type_increases_duration" class="alert alert-warning mb-0" role="alert">
|
||||
<span >You can only take this time off in whole days, so if your schedule has half days, it won't be used efficiently.</span>
|
||||
</div><br />
|
||||
<group name="col_left">
|
||||
<field name="employee_company_id" invisible="1"/>
|
||||
<field name="holiday_status_id" force_save="1"
|
||||
@@ -310,7 +307,7 @@
|
||||
<label for="request_date_from" invisible="request_unit_half or request_unit_hours" string="Dates" />
|
||||
<div class="o_row" invisible="not request_unit_half and not request_unit_hours">
|
||||
<field name="request_date_from" class="oe_inline" string="Date" readonly="state not in ('draft', 'confirm')" />
|
||||
<field name="request_date_from_period" invisible="not request_unit_half" required="request_unit_half"/>
|
||||
<field name="request_date_from_period" invisible="not request_unit_half" required="request_unit_half" readonly="state not in ('draft', 'confirm')"/>
|
||||
</div>
|
||||
<!-- full days: show date start/end with daterange -->
|
||||
<div class="o_row" invisible="request_unit_half or request_unit_hours">
|
||||
@@ -355,6 +352,9 @@
|
||||
</group>
|
||||
</div>
|
||||
</div>
|
||||
<div name="duration_warning" invisible="not leave_type_increases_duration" class="alert alert-warning mb-0" role="alert">
|
||||
<span >You can only take this time off in whole days, so if your schedule has half days, it won't be used efficiently.</span>
|
||||
</div>
|
||||
</sheet>
|
||||
<div class="o_attachment_preview"/>
|
||||
<div class="oe_chatter">
|
||||
|
||||
Reference in New Issue
Block a user