devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2060 from expsa/transaction_tasks_1_1 

Fix Issue in date
This commit is contained in:
enagahh 2025-01-04 02:33:29 +02:00 committed by GitHub
parent 90ca76680c c35b81737f
commit 0593aece13
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
odex25_transactions/exp_transaction_leave/models/leave.py
View File

@ -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