From fc5e9918a87b35c299ad52c12e7605b94a22a58f Mon Sep 17 00:00:00 2001
From: Rob Coekaerts <roco@odoo.com>
Date: Wed, 7 Sep 2022 15:17:24 +0000
Subject: [PATCH] [IMP] hr_contract: include cancelled contracts in contract
 history

In order to avoid empty contract histories when there are existing but
cancelled contracts, cancelled contracts are now also included in the
contract history.

task-2939158

closes odoo/odoo#99767

Signed-off-by: Kevin Baptiste <kba@odoo.com>
---
 addons/hr_contract/report/hr_contract_history.py | 9 ++++-----
 addons/hr_contract/views/hr_contract_views.xml   | 5 ++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/hr_contract/report/hr_contract_history.py b/addons/hr_contract/report/hr_contract_history.py
index aa1c18d5185..b2cbe622d3f 100644
--- a/addons/hr_contract/report/hr_contract_history.py
+++ b/addons/hr_contract/report/hr_contract_history.py
@@ -85,8 +85,7 @@ class ContractHistory(models.Model):
                                     WHEN state='draft' AND kanban_state='done' THEN 1
                                     ELSE 0 END) OVER w_partition AS is_under_contract
                 FROM   hr_contract AS contract
-                WHERE  contract.state <> 'cancel'
-                AND contract.active = true
+                WHERE  contract.active = true
                 WINDOW w_partition AS (
                     PARTITION BY contract.employee_id
                     ORDER BY
@@ -94,7 +93,8 @@ class ContractHistory(models.Model):
                             WHEN contract.state = 'open' THEN 0
                             WHEN contract.state = 'draft' THEN 1
                             WHEN contract.state = 'close' THEN 2
-                            ELSE 3 END,
+                            WHEN contract.state = 'cancel' THEN 3
+                            ELSE 4 END,
                         contract.date_start DESC
                     RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                 )
@@ -120,8 +120,7 @@ class ContractHistory(models.Model):
 
         mapped_employee_contracts = defaultdict(lambda: self.env['hr.contract'])
         for contract in sorted_contracts:
-            if contract.state != 'cancel':
-                mapped_employee_contracts[contract.employee_id] |= contract
+            mapped_employee_contracts[contract.employee_id] |= contract
 
         for history in self:
             history.contract_ids = mapped_employee_contracts[history.employee_id]
diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml
index 539660be1b8..2152727d90e 100644
--- a/addons/hr_contract/views/hr_contract_views.xml
+++ b/addons/hr_contract/views/hr_contract_views.xml
@@ -33,7 +33,10 @@
                                 <span class="o_stat_value text-danger">
                                    <field name="contracts_count"/>
                                 </span>
-                                <span class="o_stat_text text-danger">
+                                <span attrs="{'invisible' : [('contracts_count', '!=', 1)]}" class="o_stat_text text-danger" >
+                                    Contract
+                                </span>
+                                <span attrs="{'invisible' : [('contracts_count', '=', 1)]}" class="o_stat_text text-danger">
                                     Contracts
                                 </span>
                             </div>