[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) <yti@odoo.com>
2021-03-16 10:34:55 +00:00
parent d0c4bde220
commit 339b9706a2
1 changed files with 7 additions and 1 deletions
@@ -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
                )
            )