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

[FIX] hr(_*): update for grid views

Browse Source 
X-original-commit: ea6497a73f4e20d02d02376bf766080735d8ec52
Part-of: odoo/odoo#102508
This commit is contained in:
Damien Bouvy
2022-10-06 22:22:42 +02:00
parent 09c53d8eee
commit aadf7ca9f8
3 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_contract/views/hr_contract_views.xml
+3 -3
View File
@@ -208,7 +208,7 @@
<page string="Contract Details" name="other" groups="hr_contract.group_hr_contract_manager">
<group><group name="contract_details"/></group>
<group name="notes_group" string="Notes">
<field name="notes" nolabel="1"/>
<field name="notes" nolabel="1" colspan="2" placeholder="Type in notes about this contract..."/>
</group>
</page>
<page string="Salary Information" name="information" class="o_hr_contract_salary_information">
@@ -216,8 +216,8 @@
<group name="salary">
<label for="wage"/>
<div class="o_row" name="wage">
<field name="wage" nolabel="1"/>
<span>/ month</span>
<field name="wage" class="oe_inline" nolabel="1"/>
<div>/ month</div>
</div>
</group>
<group name="yearly_advantages"/>
addons/hr_holidays/views/hr_leave_type_views.xml
+4 -11
View File
@@ -60,8 +60,7 @@
<h1><field name="name"/></h1>
</div>
<group>
<group name="leave_validation" id="time_off_requests">
<h2>Time Off Requests</h2>
<group name="leave_validation" id="time_off_requests" string="Time Off Requests">
<field name="active" invisible="1"/>
<field name="leave_validation_type" string="Approval" widget="radio"/>
<field name="responsible_id" domain="[('share', '=', False)]"
@@ -73,22 +72,16 @@
<field name="time_type" required="1"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<group name="allocation_validation" id="allocation_requests">
<h2>Allocation Requests</h2>
<group name="allocation_validation" id="allocation_requests" string="Allocation Requests">
<field name="requires_allocation" widget="radio" options="{'horizontal':true}"/>
<field name="employee_requests" widget="radio" attrs="{'invisible': [('requires_allocation', '=', 'no')]}"/>
<field name="allocation_validation_type" string="Approval" widget="radio" attrs="{'invisible': ['|', ('requires_allocation', '=', 'no'), ('employee_requests', '=', 'no')]}"/>
</group>
</group>
<group>
<group id="payroll">
</group>
</group>
<group name="visual" id="visual" >
<group colspan="4">
<h2>Display Option</h2>
<group colspan="2" string="Display Option">
</group>
<group colspan="4">
<group colspan="2">
<field name="color" widget="color_picker" />
<field class="d-flex flex-wrap" name="icon_id" widget="hr_holidays_radio_image" options="{'horizontal': true}"/>
</group>
addons/hr_work_entry_holidays/views/hr_leave_views.xml
+6 -3
View File
@@ -6,9 +6,12 @@
<field name="model">hr.leave.type</field>
<field name="inherit_id" ref="hr_holidays.edit_holiday_status_form"/>
<field name="arch" type="xml">
<xpath expr="//group[@id='payroll']" position="inside">
<h2>Payroll</h2>
<field name="work_entry_type_id"/>
<xpath expr="//group[@name='visual']" position="before">
<group>
<group name="payroll" string="Payroll">
<field name="work_entry_type_id"/>
</group>
</group>
</xpath>
</field>
</record>