diff --git a/odoo/external-src/hr b/odoo/external-src/hr index f51c8a27579..981acd66a7c 160000 --- a/odoo/external-src/hr +++ b/odoo/external-src/hr @@ -1 +1 @@ -Subproject commit f51c8a27579537c337e5187427c2e97dd1b46a4d +Subproject commit 981acd66a7c0800536fbc605c3470e12e9af44dc diff --git a/odoo/pending-merges.yaml b/odoo/pending-merges.yaml index 6613b5c152c..6cdf5a807c0 100644 --- a/odoo/pending-merges.yaml +++ b/odoo/pending-merges.yaml @@ -8,7 +8,7 @@ camptocamp: git@github.com:camptocamp/server-tools.git merges: - oca 10.0 - # add module account_invoice_bank_selection + # Migration of server_environment to 10.0 - oca refs/pull/595/head target: &default_target camptocamp merge-branch-1900-master ./external-src/sale-workflow: @@ -28,14 +28,6 @@ camptocamp: git@github.com:camptocamp/hr.git merges: - oca 10.0 - # hr_contract_reference - - oca refs/pull/316/head - # hr_employee_birth_name - - oca refs/pull/318/head - # hr_experience - - oca refs/pull/306/head # hr_employee_seniority # - oca refs/pull/319/head - # hr_employee_social_media - - oca refs/pull/317/head target: *default_target