From 04240c6c41bd4fb5b467e70ae7346a1b9b7fff68 Mon Sep 17 00:00:00 2001 From: zainab2097 <149927291+zainab2097@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:32:04 +0300 Subject: [PATCH 1/3] Update rental_contract.py --- .../property_management/models/rental_contract.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/odex25_realstate/property_management/models/rental_contract.py b/odex25_realstate/property_management/models/rental_contract.py index af2801dbd..7de50e681 100644 --- a/odex25_realstate/property_management/models/rental_contract.py +++ b/odex25_realstate/property_management/models/rental_contract.py @@ -5,6 +5,7 @@ import calendar import logging from datetime import datetime +from datetime import date from dateutil.relativedelta import relativedelta from odoo.tools import exception_to_unicode from odoo import models, fields, api, exceptions, tools, _ @@ -67,6 +68,11 @@ class RentalContract(models.Model): _inherit = ['mail.thread', 'mail.activity.mixin'] _order = "id desc" + @api.depends('contract_end_date') + def _compute_is_today_end_date(self): + for record in self: + record.is_today_end_date = record.date_to == date.today() + @api.onchange('rent_method') def onchange_rent_method(self): """ @@ -91,8 +97,10 @@ class RentalContract(models.Model): else: if not self.property_id: self.property_id = False + active = fields.Boolean(default=True) + is_today_end_date = fields.Boolean(string="Is Today End Date", compute="_compute_is_today_end_date",) name = fields.Char(string="Name") date = fields.Date(string="Contract Date") seq = fields.Char(string="Sequence", default="/", index=True) From 43af5e7997cb8d77b7f071d8dfa604c9af1091f4 Mon Sep 17 00:00:00 2001 From: zainab2097 <149927291+zainab2097@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:39:00 +0300 Subject: [PATCH 2/3] Update rental_contract_views.xml --- .../property_management/views/rental_contract_views.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/odex25_realstate/property_management/views/rental_contract_views.xml b/odex25_realstate/property_management/views/rental_contract_views.xml index 9b70a56e9..554c7d11a 100644 --- a/odex25_realstate/property_management/views/rental_contract_views.xml +++ b/odex25_realstate/property_management/views/rental_contract_views.xml @@ -62,6 +62,7 @@ statusbar_visible="draft,submit,confirm,review,close,cancel"/> +

@@ -94,6 +95,7 @@ + From d404662a79faaa1ac761a6fc882e62546ec5cbdc Mon Sep 17 00:00:00 2001 From: zainab2097 <149927291+zainab2097@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:40:43 +0300 Subject: [PATCH 3/3] Update rental_contract.py --- odex25_realstate/property_management/models/rental_contract.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/odex25_realstate/property_management/models/rental_contract.py b/odex25_realstate/property_management/models/rental_contract.py index 7de50e681..cee62c8f1 100644 --- a/odex25_realstate/property_management/models/rental_contract.py +++ b/odex25_realstate/property_management/models/rental_contract.py @@ -72,6 +72,8 @@ class RentalContract(models.Model): def _compute_is_today_end_date(self): for record in self: record.is_today_end_date = record.date_to == date.today() + if record.state=='renewed': + record.is_today_end_date = False @api.onchange('rent_method') def onchange_rent_method(self):