odoo/odoo#162602

Created by fw-bot

label

odoo-dev:saas-17.2-saas-17.1-hr-fix_same_user_creation-mepe-JGdn-fw

head

87cfc6ea2aa8e29603563f5ada66126ed3df6682

target

saas-17.2

merged

1 month ago by Fun HR, Mélanie Peyrat (mepe)

forward-port of

odoo/odoo#159860 DETACHED (conflicts: ('73b83c93d806258fc0ec0c77a11e9e9f3f3d0ab6', 'Auto-merging addons/hr/models/hr_employee.py\nCONFLICT (content): Merge conflict in addons/hr/models/hr_employee.py\n', '14:01:01.948727 git.c:463 trace: built-in: git cherry-pick 73b83c93d806258fc0ec0c77a11e9e9f3f3d0ab6\nerror: could not apply 73b83c93d806... [FIX] hr : fix double employee linked to the same user (same company)\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['73b83c93d806258fc0ec0c77a11e9e9f3f3d0ab6']) ('73b83c93d806258fc0ec0c77a11e9e9f3f3d0ab6', 'Auto-merging addons/hr/models/hr_employee.py\nCONFLICT (content): Merge conflict in addons/hr/models/hr_employee.py\n', '14:01:01.948727 git.c:463 trace: built-in: git cherry-pick 73b83c93d806258fc0ec0c77a11e9e9f3f3d0ab6\nerror: could not apply 73b83c93d806... [FIX] hr : fix double employee linked to the same user (same company)\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['73b83c93d806258fc0ec0c77a11e9e9f3f3d0ab6']))

[FW] Saas 17.1 hr fix same user creation mepe

Description of the issue/feature this PR addresses:

Current behavior before PR:

Desired behavior after PR is merged:




---
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: odoo/odoo#159860