工作日历设置模型新增查看日历按键,隐藏工作日历菜单
This commit is contained in:
@@ -36,7 +36,7 @@ class ProcedureEquipmentResourceSetting(models.Model):
|
|||||||
@api.depends('work_center_name_id')
|
@api.depends('work_center_name_id')
|
||||||
def _onchange_work_center_name_id(self):
|
def _onchange_work_center_name_id(self):
|
||||||
for record in self:
|
for record in self:
|
||||||
record.equipment_name_id = record.work_center_name_id.equipment_ids
|
record.equipment_name_id = record.work_center_name_id.equipment_id
|
||||||
|
|
||||||
@api.onchange('equipment_name_id')
|
@api.onchange('equipment_name_id')
|
||||||
def _onchange_equipment_name_id(self):
|
def _onchange_equipment_name_id(self):
|
||||||
|
|||||||
@@ -184,6 +184,7 @@ class WorkLogSetting(models.Model):
|
|||||||
'name_id': self.id,
|
'name_id': self.id,
|
||||||
'calendar_code': self.code,
|
'calendar_code': self.code,
|
||||||
'date_time': single_date})
|
'date_time': single_date})
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def daterange(start_date, end_date):
|
def daterange(start_date, end_date):
|
||||||
"""
|
"""
|
||||||
@@ -193,6 +194,12 @@ class WorkLogSetting(models.Model):
|
|||||||
for n in range(int((end_date - start_date).days)):
|
for n in range(int((end_date - start_date).days)):
|
||||||
yield start_date + timedelta(n)
|
yield start_date + timedelta(n)
|
||||||
|
|
||||||
|
def open_work_schedule_calendar(self):
|
||||||
|
action = self.env.ref('sf_plan_management.sf_work_schedule_calendar_act')
|
||||||
|
result = action.read()[0]
|
||||||
|
result['domain'] = [('name_id', '=', self.id)]
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
class WorkingShift(models.Model):
|
class WorkingShift(models.Model):
|
||||||
_name = 'sf.working.shift'
|
_name = 'sf.working.shift'
|
||||||
|
|||||||
@@ -40,10 +40,10 @@
|
|||||||
sequence="15"
|
sequence="15"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<menuitem id="menu_sf_work_schedule_calendar"
|
<!-- <menuitem id="menu_sf_work_schedule_calendar"-->
|
||||||
name="工作日历"
|
<!-- name="工作日历"-->
|
||||||
parent="menu_sf_basic_setting"
|
<!-- parent="menu_sf_basic_setting"-->
|
||||||
action="sf_work_schedule_calendar_act"
|
<!-- action="sf_work_schedule_calendar_act"-->
|
||||||
sequence="15"
|
<!-- sequence="15"-->
|
||||||
/>
|
<!-- />-->
|
||||||
</odoo>
|
</odoo>
|
||||||
@@ -16,7 +16,11 @@
|
|||||||
<field name="status"/>
|
<field name="status"/>
|
||||||
<field name="update_person"/>
|
<field name="update_person"/>
|
||||||
<field name="update_time"/>
|
<field name="update_time"/>
|
||||||
<!-- <button string="查看日历" type="object" name="sf_work_schedule_calendar_act"/>-->
|
<button string="查看日历"
|
||||||
|
type="object"
|
||||||
|
name="open_work_schedule_calendar"
|
||||||
|
class="oe_highlight"
|
||||||
|
/>
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|||||||
Reference in New Issue
Block a user