Skip to content

[IMP] empty #4839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master-hr-onboarding
Choose a base branch
from
Draft

[IMP] empty #4839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8637a9
[IMP] empty
arpi-odoo Nov 3, 2025
a165720
[FIX] hr: hide new contract button if there is no contract dates
HashemKhaled Nov 3, 2025
3a7160b
[FIX] hr: allow version deletion for employees with multiple versions
HashemKhaled Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion addons/hr/models/hr_employee.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,8 @@ def _compute_legal_name(self):
@api.depends('current_version_id')
@api.depends_context('version_id')
def _compute_version_id(self):
context_version = self.env['hr.version'].browse(self.env.context.get('version_id', False))
context_version_id = self.env.context.get('version_id', False)
context_version = self.env['hr.version'].browse(context_version_id).exists() if context_version_id else self.env['hr.version']

for employee in self:
if context_version.employee_id == self:
Expand Down
17 changes: 17 additions & 0 deletions addons/hr/tests/test_hr_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,3 +676,20 @@ def test_hr_version_fields_tracking(self):
fields_without_tracking,
f"The following hr.version fields should have tracking=True: {fields_without_tracking}",
)

def test_delete_hr_version(self):
employee = self.env['hr.employee'].create(
{
'name': 'John Doe',
'date_version': '2024-01-01',
}
)

version1 = employee.version_id
version2 = employee.create_version({
'date_version': '2025-01-01',
})

version1.unlink()
with self.assertRaises(ValidationError):
version2.unlink()
2 changes: 1 addition & 1 deletion addons/hr/views/hr_employee_views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
<span invisible="not contract_date_start">to</span>
<field name="contract_date_end" string="End Date" placeholder="Indefinite"
class="o_hr_narrow_field ms-3" invisible="not contract_date_start"/>
<widget name="button_new_contract"/>
<widget name="button_new_contract" invisible="not contract_date_start"/>
</div>
<label for="wage"/>
<div class="o_row" name="wage">
Expand Down