From 9dd48e8d5d3d394f0d6d9eb49ea858d2dc37e334 Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Tue, 10 Mar 2020 11:30:06 +0100
Subject: [PATCH] [IMP] - use terminate term instead of resiliate

---
 product_contract/models/sale_order.py      |  6 +++---
 product_contract/models/sale_order_line.py |  6 +++---
 product_contract/tests/test_sale_order.py  | 10 +++++-----
 product_contract/views/sale_order.xml      |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/product_contract/models/sale_order.py b/product_contract/models/sale_order.py
index cf2e45923..57467736c 100644
--- a/product_contract/models/sale_order.py
+++ b/product_contract/models/sale_order.py
@@ -18,15 +18,15 @@ class SaleOrder(models.Model):
     )
 
     @api.constrains('state')
-    def check_contact_is_not_resiliated(self):
+    def check_contact_is_not_terminated(self):
         for rec in self:
             if rec.state not in (
                 'sale',
                 'done',
                 'cancel',
-            ) and rec.order_line.filtered('contract_id.is_resiliated'):
+            ) and rec.order_line.filtered('contract_id.is_terminated'):
                 raise ValidationError(
-                    _("You can't upsell or downsell a resiliated contract")
+                    _("You can't upsell or downsell a terminated contract")
                 )
 
     @api.depends('order_line.contract_id', 'state')
diff --git a/product_contract/models/sale_order_line.py b/product_contract/models/sale_order_line.py
index c14ee0e7c..bcaf1cef8 100644
--- a/product_contract/models/sale_order_line.py
+++ b/product_contract/models/sale_order_line.py
@@ -68,14 +68,14 @@ class SaleOrderLine(models.Model):
     )
 
     @api.constrains('contract_id')
-    def check_contact_is_not_resiliated(self):
+    def check_contact_is_not_terminated(self):
         for rec in self:
             if (
                 rec.order_id.state not in ('sale', 'done', 'cancel')
-                and rec.contract_id.is_resiliated
+                and rec.contract_id.is_terminated
             ):
                 raise ValidationError(
-                    _("You can't upsell or downsell a resiliated contract")
+                    _("You can't upsell or downsell a terminated contract")
                 )
 
     @api.multi
diff --git a/product_contract/tests/test_sale_order.py b/product_contract/tests/test_sale_order.py
index 3dbb49513..f581aebce 100644
--- a/product_contract/tests/test_sale_order.py
+++ b/product_contract/tests/test_sale_order.py
@@ -343,17 +343,17 @@ class TestSaleOrder(TransactionCase):
             self.sale.order_line.mapped('contract_id'),
         )
 
-    def test_check_contact_is_not_resiliated(self):
-        self.contract.is_resiliated = True
+    def test_check_contact_is_not_terminated(self):
+        self.contract.is_terminated = True
         with self.assertRaises(ValidationError):
             self.order_line1.contract_id = self.contract
 
-    def test_check_contact_is_not_resiliated(self):
+    def test_check_contact_is_not_terminated(self):
         self.order_line1.contract_id = self.contract
         self.sale.action_confirm()
-        self.contract.is_resiliated = True
+        self.contract.is_terminated = True
         self.sale.action_cancel()
         with self.assertRaises(ValidationError):
             self.sale.action_draft()
-        self.contract.is_resiliated = False
+        self.contract.is_terminated = False
         self.sale.action_draft()
diff --git a/product_contract/views/sale_order.xml b/product_contract/views/sale_order.xml
index 6d4300216..d00f241a8 100644
--- a/product_contract/views/sale_order.xml
+++ b/product_contract/views/sale_order.xml
@@ -41,7 +41,7 @@
                        domain="['|',('contract_template_id','=',contract_template_id),
                        ('contract_template_id','=',False),
                        ('partner_id','=',parent.partner_id),
-                       ('is_resiliated','=',False),
+                       ('is_terminated','=',False),
                        ]"/>
                 <field name="contract_line_id"
                        attrs="{'invisible': [('is_contract', '=', False)]}"