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

[FIX] hr_holidays, lunch: fix post-always edit

Browse Source 
This PR adapts the form views since the merge of #100570.

task-3002537

closes odoo/odoo#102467

X-original-commit: de72d27ea121c1944d7a3d3e5996ce08473d3b09
Signed-off-by: Kevin Baptiste <kba@odoo.com>
This commit is contained in:
Kevin Baptiste
2022-10-06 19:04:31 +02:00
parent f39e08e69b
commit 8a71cdf22b
5 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/static/src/views/calendar/calendar_renderer.scss
+7
View File
@@ -37,6 +37,13 @@
);
}
}
&.o_event_striked {
background: linear-gradient(
transparent 0 45%,
$color 45% 55%,
transparent 55% 100%);
}
}
}
}
addons/hr_holidays/views/hr_leave_accrual_views.xml
+2 -2
View File
@@ -39,7 +39,7 @@
<label for="first_month_day_display" string="on the"/><field name="first_month_day_display" required="1"/> of <field name="first_month"/> and on the <field name="second_month_day_display" required="1"/> of <field name="second_month"/>
</div>
<div class="o_row" attrs="{'invisible': [('frequency', '!=', 'yearly')]}">
<label for="yearly_day_display" string="on the"/><field name="yearly_day_display" required="1"/> of <field name="yearly_month"/>
<label for="yearly_day_display" string="on the"/><field name="yearly_day_display" required="1"/> of <field name="yearly_month" class="w-25"/>
</div>
</div>
<label for="maximum_leave"/>
@@ -51,7 +51,7 @@
<field name="added_value_type" nolabel="1" readonly="1" force_save="1"/>
</div>
</div>
<field name="action_with_unused_accruals"/>
<field name="action_with_unused_accruals" style="width: 40%"/>
<field name="postpone_max_days" attrs="{'invisible': [('action_with_unused_accruals', '!=', 'postponed')]}"/>
</group>
</sheet>
addons/hr_holidays/views/hr_leave_allocation_views.xml
+2 -2
View File
@@ -120,9 +120,9 @@
attrs="{'readonly': [('allocation_type', '=', 'accrual'), ('state', 'not in', ('draft', 'confirm'))]}"/>
</div>
<div name="duration_display">
<field name="number_of_days_display" class="oe_inline" nolabel="1"
<field name="number_of_days_display" nolabel="1" style="width: 5rem;"
attrs="{'readonly': ['|', '|', ('type_request_unit', '=', 'hour'), ('state', 'not in', ('draft', 'confirm')), ('allocation_type', '=', 'accrual')], 'invisible': [('type_request_unit', '=', 'hour')]}"/>
<field name="number_of_hours_display" class="oe_inline" nolabel="1"
<field name="number_of_hours_display" nolabel="1" style="width: 5rem;"
attrs="{'readonly': ['|', '|', ('type_request_unit', '!=', 'hour'), ('state', 'not in', ('draft', 'confirm')), ('allocation_type', '=', 'accrual')], 'invisible': [('type_request_unit', '!=', 'hour')]}"/>
<span class="ml8" attrs="{'invisible': [('type_request_unit', '=', 'hour')]}">Days</span>
<span class="ml8" attrs="{'invisible': [('type_request_unit', '!=', 'hour')]}">Hours</span>
addons/hr_holidays/views/hr_leave_views.xml
+6 -8
View File
@@ -336,14 +336,12 @@
<label for="number_of_days_display" string="Duration" attrs="{'invisible': [('request_unit_half', '=', True), ('leave_type_request_unit', '!=', 'hour')]}"/>
<div name="duration_display">
<div class="o_row">
<div attrs="{'invisible': ['|', ('request_unit_half', '=', True), ('request_unit_hours', '=', True)]}" class="o_row">
<field name="number_of_days_display" nolabel="1" class="oe_inline"/>
<span>Days</span>
</div>
<div attrs="{'invisible': [('leave_type_request_unit', '!=', 'hour')]}" class="o_row">
<field name="number_of_hours_text" nolabel="1" class="oe_inline"/>
</div>
<div attrs="{'invisible': ['|', ('request_unit_half', '=', True), ('request_unit_hours', '=', True)]}" class="o_row">
<field name="number_of_days_display" nolabel="1" style="width: 5rem !important;" class="flex-shrink-1 flex-grow-0"/>
<span>Days</span>
</div>
<div attrs="{'invisible': [('leave_type_request_unit', '!=', 'hour')]}" class="o_row">
<field name="number_of_hours_text" nolabel="1"/>
</div>
</div>
<field name="name" attrs="{'readonly': [('state', 'not in', ('draft', 'confirm'))]}" widget="text"/>
addons/lunch/views/lunch_supplier_views.xml
+7 -10
View File
@@ -46,13 +46,10 @@
</group>
<group>
<group string="Availability">
<label for="tz" groups="base.group_no_one"/>
<div class="o_col">
<div class="o_row">
<field name="tz" groups="base.group_no_one"/>
</div>
<widget name="week_days"/>
</div>
<field name="tz" groups="base.group_no_one"/>
<label for="sun" class="d-none"/>
<field name="sun" invisible="1"/>
<widget name="week_days"/>
<field name="recurrency_end_date" groups="base.group_no_one"/>
</group>
<group string="Orders">
@@ -67,7 +64,7 @@
<group>
<field name="active" invisible="1"/>
<field name="topping_label_1"/>
<field name="topping_quantity_1"/>
<field name="topping_quantity_1" class="w-50"/>
</group>
<div>
<field name="topping_ids_1" nolabel="1">
@@ -81,7 +78,7 @@
</div>
<group>
<field name="topping_label_2"/>
<field name="topping_quantity_2"/>
<field name="topping_quantity_2" class="w-50"/>
</group>
<div>
<field name="topping_ids_2" nolabel="1">
@@ -95,7 +92,7 @@
</div>
<group>
<field name="topping_label_3"/>
<field name="topping_quantity_3"/>
<field name="topping_quantity_3" class="w-50"/>
</group>
<div>
<field name="topping_ids_3" nolabel="1">