添加功能
This commit is contained in:
@@ -26,11 +26,14 @@ class YuthonShiftPlanning(models.Model):
|
|||||||
|
|
||||||
@api.depends('start_date', 'end_date')
|
@api.depends('start_date', 'end_date')
|
||||||
def _compute_is_effect(self):
|
def _compute_is_effect(self):
|
||||||
|
today = fields.Date.today()
|
||||||
for record in self:
|
for record in self:
|
||||||
if record.start_date and record.end_date:
|
if not record.start_date:
|
||||||
record.is_effect = record.start_date <= fields.Date.today() <= record.end_date
|
|
||||||
else:
|
|
||||||
record.is_effect = False
|
record.is_effect = False
|
||||||
|
elif not record.end_date:
|
||||||
|
record.is_effect = record.start_date <= today
|
||||||
|
else:
|
||||||
|
record.is_effect = record.start_date <= today <= record.end_date
|
||||||
|
|
||||||
def confirm(self,next_date=False):
|
def confirm(self,next_date=False):
|
||||||
selected_month = int(self.select_time)
|
selected_month = int(self.select_time)
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
<field name="illustrate"/>
|
<field name="illustrate"/>
|
||||||
<field name="number_of_shifts"/>
|
<field name="number_of_shifts"/>
|
||||||
<field name="is_effect"/>
|
<field name="is_effect" invisible="1"/>
|
||||||
<field name="select_time" required="1"/>
|
<field name="select_time" required="1"/>
|
||||||
</group>
|
</group>
|
||||||
<group col="2">
|
<group col="2">
|
||||||
|
|||||||
Reference in New Issue
Block a user