diff --git a/sf_plan_management/models/base.py b/sf_plan_management/models/base.py index 57df9566..ca6e4693 100644 --- a/sf_plan_management/models/base.py +++ b/sf_plan_management/models/base.py @@ -36,7 +36,7 @@ class ProcedureEquipmentResourceSetting(models.Model): @api.depends('work_center_name_id') def _onchange_work_center_name_id(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') def _onchange_equipment_name_id(self): diff --git a/sf_plan_management/models/calendar_base.py b/sf_plan_management/models/calendar_base.py index 6304d2e1..99e5f070 100644 --- a/sf_plan_management/models/calendar_base.py +++ b/sf_plan_management/models/calendar_base.py @@ -184,6 +184,7 @@ class WorkLogSetting(models.Model): 'name_id': self.id, 'calendar_code': self.code, 'date_time': single_date}) + @staticmethod def daterange(start_date, end_date): """ @@ -193,6 +194,12 @@ class WorkLogSetting(models.Model): for n in range(int((end_date - start_date).days)): 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): _name = 'sf.working.shift' diff --git a/sf_plan_management/views/menu_view.xml b/sf_plan_management/views/menu_view.xml index 793f381d..e50f6fa9 100644 --- a/sf_plan_management/views/menu_view.xml +++ b/sf_plan_management/views/menu_view.xml @@ -40,10 +40,10 @@ sequence="15" /> - + + + + + + \ No newline at end of file diff --git a/sf_plan_management/views/plan_base_view.xml b/sf_plan_management/views/plan_base_view.xml index 16e25874..a10ccf89 100644 --- a/sf_plan_management/views/plan_base_view.xml +++ b/sf_plan_management/views/plan_base_view.xml @@ -16,7 +16,11 @@ - +