audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] - use terminate term instead of resiliate

Browse Source
This commit is contained in:
sbejaoui
2020-03-10 11:30:06 +01:00
committed by Adasat
parent a31dd36d59
commit 9dd48e8d5d
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
product_contract/models/sale_order.py
View File

@@ -18,15 +18,15 @@ class SaleOrder(models.Model):
) )
@api.constrains('state') @api.constrains('state')
def check_contact_is_not_resiliated(self): def check_contact_is_not_terminated(self):
for rec in self: for rec in self:
if rec.state not in ( if rec.state not in (
'sale', 'sale',
'done', 'done',
'cancel', 'cancel',
) and rec.order_line.filtered('contract_id.is_resiliated'): ) and rec.order_line.filtered('contract_id.is_terminated'):
raise ValidationError( 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') @api.depends('order_line.contract_id', 'state')

6
product_contract/models/sale_order_line.py
View File

@@ -68,14 +68,14 @@ class SaleOrderLine(models.Model):
) )
@api.constrains('contract_id') @api.constrains('contract_id')
def check_contact_is_not_resiliated(self): def check_contact_is_not_terminated(self):
for rec in self: for rec in self:
if ( if (
rec.order_id.state not in ('sale', 'done', 'cancel') rec.order_id.state not in ('sale', 'done', 'cancel')
and rec.contract_id.is_resiliated and rec.contract_id.is_terminated
): ):
raise ValidationError( raise ValidationError(
_("You can't upsell or downsell a resiliated contract") _("You can't upsell or downsell a terminated contract")
) )
@api.multi @api.multi

10
product_contract/tests/test_sale_order.py
View File

@@ -343,17 +343,17 @@ class TestSaleOrder(TransactionCase):
self.sale.order_line.mapped('contract_id'), self.sale.order_line.mapped('contract_id'),
) )
def test_check_contact_is_not_resiliated(self): def test_check_contact_is_not_terminated(self):
self.contract.is_resiliated = True self.contract.is_terminated = True
with self.assertRaises(ValidationError): with self.assertRaises(ValidationError):
self.order_line1.contract_id = self.contract 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.order_line1.contract_id = self.contract
self.sale.action_confirm() self.sale.action_confirm()
self.contract.is_resiliated = True self.contract.is_terminated = True
self.sale.action_cancel() self.sale.action_cancel()
with self.assertRaises(ValidationError): with self.assertRaises(ValidationError):
self.sale.action_draft() self.sale.action_draft()
self.contract.is_resiliated = False self.contract.is_terminated = False
self.sale.action_draft() self.sale.action_draft()

2
product_contract/views/sale_order.xml
View File

@@ -41,7 +41,7 @@
domain="['|',('contract_template_id','=',contract_template_id), domain="['|',('contract_template_id','=',contract_template_id),
('contract_template_id','=',False), ('contract_template_id','=',False),
('partner_id','=',parent.partner_id), ('partner_id','=',parent.partner_id),
('is_resiliated','=',False), ('is_terminated','=',False),
]"/> ]"/>
<field name="contract_line_id" <field name="contract_line_id"
attrs="{'invisible': [('is_contract', '=', False)]}" attrs="{'invisible': [('is_contract', '=', False)]}"