From fed491914a3ab77a531d53c26e0afa2d1afc37ca Mon Sep 17 00:00:00 2001 From: Olga Marco Date: Fri, 15 Oct 2021 09:46:26 +0200 Subject: [PATCH] [IMP] agreement_legal: Improve management of end dates --- agreement_legal/models/agreement.py | 1 + agreement_legal/models/agreement_type.py | 1 + agreement_legal/views/agreement.xml | 3 ++- agreement_legal/views/agreement_type.xml | 4 ++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/agreement_legal/models/agreement.py b/agreement_legal/models/agreement.py index 828742a3e..3ac9f760f 100644 --- a/agreement_legal/models/agreement.py +++ b/agreement_legal/models/agreement.py @@ -96,6 +96,7 @@ class Agreement(models.Model): tracking=True, help="Date that the contract was terminated.", ) + no_end_date = fields.Boolean(related="agreement_type_id.no_end_date") reviewed_date = fields.Date(string="Reviewed Date", tracking=True) reviewed_user_id = fields.Many2one("res.users", string="Reviewed By", tracking=True) approved_date = fields.Date(string="Approved Date", tracking=True) diff --git a/agreement_legal/models/agreement_type.py b/agreement_legal/models/agreement_type.py index b1add48e5..f3adbc6dc 100644 --- a/agreement_legal/models/agreement_type.py +++ b/agreement_legal/models/agreement_type.py @@ -8,6 +8,7 @@ class AgreementType(models.Model): _inherit = "agreement.type" _description = "Agreement Types" + no_end_date = fields.Boolean(default=False) agreement_subtypes_ids = fields.One2many( "agreement.subtype", "agreement_type_id", string="Sub-Types" ) diff --git a/agreement_legal/views/agreement.xml b/agreement_legal/views/agreement.xml index 2260e13ce..057fdfbdd 100644 --- a/agreement_legal/views/agreement.xml +++ b/agreement_legal/views/agreement.xml @@ -225,7 +225,7 @@ /> @@ -235,6 +235,7 @@ /> + diff --git a/agreement_legal/views/agreement_type.xml b/agreement_legal/views/agreement_type.xml index 98ce69d6b..afbed3471 100644 --- a/agreement_legal/views/agreement_type.xml +++ b/agreement_legal/views/agreement_type.xml @@ -7,6 +7,7 @@ + @@ -17,6 +18,9 @@ agreement.type + + +