diff --git a/odex25_realstate/property_management/models/rental_contract.py b/odex25_realstate/property_management/models/rental_contract.py index af2801dbd..cee62c8f1 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,13 @@ 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() + if record.state=='renewed': + record.is_today_end_date = False + @api.onchange('rent_method') def onchange_rent_method(self): """ @@ -91,8 +99,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) 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 @@ +