Fix Issue in date
This commit is contained in:
parent
c35b81737f
commit
e666f2b478
|
|
@ -97,7 +97,6 @@ class Entity(models.Model):
|
||||||
from_date = fields.Datetime(string='Delegation From Date')
|
from_date = fields.Datetime(string='Delegation From Date')
|
||||||
to_date = fields.Datetime(string='Delegation To Date')
|
to_date = fields.Datetime(string='Delegation To Date')
|
||||||
to_delegate = fields.Boolean(string='To Delegate?', compute="_compute_to_delegate")
|
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):
|
def _compute_to_delegate(self):
|
||||||
for rec in self:
|
for rec in self:
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@
|
||||||
<field name="delegate_employee_id" attrs="{'invisible':['|',('type','not in',['employee']),('to_delegate','=',False)]}"/>
|
<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="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="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="department_id" attrs="{'invisible': [('type','not in',['unit'])]}"/>
|
||||||
<field name="partner_id"
|
<field name="partner_id"
|
||||||
attrs="{'invisible': [('type','not in',['external'])]}"/>
|
attrs="{'invisible': [('type','not in',['external'])]}"/>
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ class Leave(models.Model):
|
||||||
for rec in self:
|
for rec in self:
|
||||||
rec.to_delegate = False
|
rec.to_delegate = False
|
||||||
if rec.from_date and rec.to_date:
|
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
|
rec.to_delegate = True
|
||||||
else:
|
else:
|
||||||
rec.to_delegate = False
|
rec.to_delegate = False
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@
|
||||||
<group col ="4">
|
<group col ="4">
|
||||||
<field name="from_date" attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
|
<field name="from_date" attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
|
||||||
<field name="to_date" attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
|
<field name="to_date" attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
|
||||||
<field name="to_delegate"/>
|
<field name="to_delegate" invisible="1"/>
|
||||||
</group>
|
</group>
|
||||||
<notebook>
|
<notebook>
|
||||||
<page string="Alternative Employees">
|
<page string="Alternative Employees">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue