From 339b9706a2c3b363feb3988c1afcf52efd82df6e Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Thu, 11 Mar 2021 12:53:23 +0000 Subject: [PATCH] [IMP] hr_contract: Use running contract on contract history resume Use the running contract instead of a draft contract in the future closes odoo/odoo#67685 Related: odoo/enterprise#17004 Related: odoo/upgrade#2265 Signed-off-by: Yannick Tivisse (yti) --- addons/hr_contract/report/hr_contract_history.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/hr_contract/report/hr_contract_history.py b/addons/hr_contract/report/hr_contract_history.py index 3513019f7b4..09f4042628d 100644 --- a/addons/hr_contract/report/hr_contract_history.py +++ b/addons/hr_contract/report/hr_contract_history.py @@ -75,7 +75,13 @@ class ContractHistory(models.Model): AND contract.active = true WINDOW w_partition AS ( PARTITION BY contract.employee_id - ORDER BY contract.date_start DESC + ORDER BY + CASE + WHEN contract.state = 'open' THEN 0 + WHEN contract.state = 'draft' THEN 1 + WHEN contract.state = 'close' THEN 2 + ELSE 3 END, + contract.date_start DESC RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING ) )