From fa605544d901add349ac2e50ca213d3e782e1a45 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Mon, 3 Feb 2020 11:07:27 +0100 Subject: [PATCH] [IMP] - resiliate comment required based on resiliation reason --- contract/models/contract_resiliate_reason.py | 3 +++ contract/views/contract_resiliate_reason.xml | 2 ++ contract/wizards/contract_contract_resiliate.py | 5 ++++- contract/wizards/contract_contract_resiliate.xml | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/contract/models/contract_resiliate_reason.py b/contract/models/contract_resiliate_reason.py index f33a0b2f6..50bd3c105 100644 --- a/contract/models/contract_resiliate_reason.py +++ b/contract/models/contract_resiliate_reason.py @@ -10,3 +10,6 @@ class ContractResiliateReason(models.Model): _description = 'Contract Resiliation Reason' name = fields.Char(required=True) + resiliate_comment_required = fields.Boolean( + string="Require a resiliation comment", default=True + ) diff --git a/contract/views/contract_resiliate_reason.xml b/contract/views/contract_resiliate_reason.xml index d20d121eb..1f379e105 100644 --- a/contract/views/contract_resiliate_reason.xml +++ b/contract/views/contract_resiliate_reason.xml @@ -11,6 +11,7 @@ + @@ -23,6 +24,7 @@ + diff --git a/contract/wizards/contract_contract_resiliate.py b/contract/wizards/contract_contract_resiliate.py index 4b3f19529..5f12d79e7 100644 --- a/contract/wizards/contract_contract_resiliate.py +++ b/contract/wizards/contract_contract_resiliate.py @@ -21,8 +21,11 @@ class ContractContractResiliate(models.TransientModel): required=True, ondelete="cascade", ) - resiliate_comment = fields.Text(string="Resiliate Comment", required=True) + resiliate_comment = fields.Text(string="Resiliate Comment") resiliate_date = fields.Date(string="Resiliate Date", required=True) + resiliate_comment_required = fields.Boolean( + related="resiliate_reason_id.resiliate_comment_required" + ) @api.multi def resiliate_contract(self): diff --git a/contract/wizards/contract_contract_resiliate.xml b/contract/wizards/contract_contract_resiliate.xml index 9372c8378..b642b38b6 100644 --- a/contract/wizards/contract_contract_resiliate.xml +++ b/contract/wizards/contract_contract_resiliate.xml @@ -10,9 +10,10 @@
+ - +