From c35b81737f107a000076978afcd7b835363c1100 Mon Sep 17 00:00:00 2001 From: eman Date: Sat, 4 Jan 2025 02:32:41 +0200 Subject: [PATCH] Fix Issue in date --- odex25_transactions/exp_transaction_leave/models/leave.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/odex25_transactions/exp_transaction_leave/models/leave.py b/odex25_transactions/exp_transaction_leave/models/leave.py index 7bd1e82a5..d26769fc1 100644 --- a/odex25_transactions/exp_transaction_leave/models/leave.py +++ b/odex25_transactions/exp_transaction_leave/models/leave.py @@ -15,7 +15,7 @@ class Leave(models.Model): state = fields.Selection(selection=[('draft', 'Draft'), ('request', 'Request'), ('refuse', 'Refuse'), ('approve', 'Approved'), ('expired', 'Expired')], string='State', default='draft') - from_date = fields.Datetime(string='From Date', default=fields.Datetime.now()) + from_date = fields.Datetime(string='From Date', default=lambda self: fields.Datetime.now()) to_date = fields.Datetime(string='To Date') employee_id = fields.Many2one(comodel_name='cm.entity', string='Employee', default=lambda self: self.default_employee_id(), readonly=True) @@ -28,11 +28,12 @@ class Leave(models.Model): for rec in self: rec.to_delegate = False if rec.from_date and rec.to_date: - if rec.from_date <= fields.Datetime.now() < rec.to_date: + if rec.from_date < fields.Datetime.now() < rec.to_date: rec.to_delegate = True else: rec.to_delegate = False - rec.state = 'expired' + if rec.state == 'approve': + rec.state = 'expired' @api.model def search(self, args, offset=0, limit=None, order=None, count=False): unit_id = self.env['cm.entity'].search([('user_id','=',self.env.uid)],limit=1).parent_id