Fix Issue in date
This commit is contained in:
parent
89b627d82a
commit
3401802cfb
|
|
@ -97,13 +97,12 @@ class Entity(models.Model):
|
|||
from_date = fields.Datetime(string='Delegation From Date')
|
||||
to_date = fields.Datetime(string='Delegation To Date')
|
||||
to_delegate = fields.Boolean(string='To Delegate?', compute="_compute_to_delegate")
|
||||
now_date = fields.Datetime(string='Now Date', default=fields.Datetime.now())
|
||||
|
||||
def _compute_to_delegate(self):
|
||||
for rec in self:
|
||||
rec.to_delegate = False
|
||||
if rec.from_date and rec.to_date:
|
||||
print(rec.from_date, "ffffffffffffffffffffffffff")
|
||||
print(fields.Datetime.now(), "nooooooooooooooooow")
|
||||
if rec.from_date < fields.Datetime.now() < rec.to_date:
|
||||
rec.to_delegate = True
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
<field name="delegate_employee_id" attrs="{'invisible':['|',('type','not in',['employee']),('to_delegate','=',False)]}"/>
|
||||
<field name="from_date" attrs="{'invisible':['|',('type','not in',['employee']),('to_delegate','=',False)]}" readonly="1" force_save="1"/>
|
||||
<field name="to_date" attrs="{'invisible':['|',('type','not in',['employee']),('to_delegate','=',False)]}" readonly="1" force_save="1"/>
|
||||
<field name="now_date"/>
|
||||
<field name="department_id" attrs="{'invisible': [('type','not in',['unit'])]}"/>
|
||||
<field name="partner_id"
|
||||
attrs="{'invisible': [('type','not in',['external'])]}"/>
|
||||
|
|
|
|||
|
|
@ -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=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)
|
||||
|
|
|
|||
Loading…
Reference in New Issue