diff --git a/beesdoo_shift/__manifest__.py b/beesdoo_shift/__manifest__.py index 1497cdb..3205305 100644 --- a/beesdoo_shift/__manifest__.py +++ b/beesdoo_shift/__manifest__.py @@ -36,7 +36,6 @@ "wizard/extension.xml", "wizard/holiday.xml", "wizard/temporary_exemption.xml", - "wizard/generate_missing_attendance_sheets.xml", ], 'demo': [ "demo/cooperators.xml", diff --git a/beesdoo_shift/models/cooperative_status.py b/beesdoo_shift/models/cooperative_status.py index 25ff584..ddffe5d 100644 --- a/beesdoo_shift/models/cooperative_status.py +++ b/beesdoo_shift/models/cooperative_status.py @@ -114,7 +114,6 @@ class CooperativeStatus(models.Model): elif rec.working_mode == 'exempt': rec.status = 'ok' - _sql_constraints = [ ('cooperator_uniq', 'unique (cooperator_id)', _('You can only set one cooperator status per cooperator')), ] diff --git a/beesdoo_shift/models/planning.py b/beesdoo_shift/models/planning.py index 45b3635..f730184 100644 --- a/beesdoo_shift/models/planning.py +++ b/beesdoo_shift/models/planning.py @@ -82,7 +82,7 @@ class TaskTemplate(models.Model): planning_id = fields.Many2one('beesdoo.shift.planning', required=True) day_nb_id = fields.Many2one('beesdoo.shift.daynumber', string='Day', required=True) task_type_id = fields.Many2one('beesdoo.shift.type', string="Type") - attendance_sheet_id = fields.Many2one('beesdoo.shift.sheet', string="Attendance Sheet") + # attendance_sheet_id = fields.Many2one('beesdoo.shift.sheet', string="Attendance Sheet") FIXME removed because beesdoo.shift.sheet is from another module. start_time = fields.Float(required=True) end_time = fields.Float(required=True) super_coop_id = fields.Many2one('res.users', string="Super Cooperative", domain=[('partner_id.super', '=', True)]) diff --git a/beesdoo_shift/security/group.xml b/beesdoo_shift/security/group.xml index 4540e32..8876384 100644 --- a/beesdoo_shift/security/group.xml +++ b/beesdoo_shift/security/group.xml @@ -2,7 +2,7 @@ Shift and Worker Read Access - + Shifts and Attendance Sheets Management diff --git a/beesdoo_shift/views/task_template.xml b/beesdoo_shift/views/task_template.xml index 613aad1..bfd3b20 100644 --- a/beesdoo_shift/views/task_template.xml +++ b/beesdoo_shift/views/task_template.xml @@ -160,7 +160,7 @@ + groups="beesdoo_shift.group_shift_attendance" /> diff --git a/beesdoo_shift_atttendance/__manifest__.py b/beesdoo_shift_atttendance/__manifest__.py index 09d5cf7..971c357 100644 --- a/beesdoo_shift_atttendance/__manifest__.py +++ b/beesdoo_shift_atttendance/__manifest__.py @@ -30,6 +30,7 @@ "security/ir.model.access.csv", "views/res_config_settings_view.xml", "wizard/validate_attendance_sheet.xml", + "wizard/generate_missing_attendance_sheets.xml", "views/attendance_sheet.xml", ], 'demo': [] diff --git a/beesdoo_shift_atttendance/wizard/__init__.py b/beesdoo_shift_atttendance/wizard/__init__.py index 1a045d3..46a772b 100644 --- a/beesdoo_shift_atttendance/wizard/__init__.py +++ b/beesdoo_shift_atttendance/wizard/__init__.py @@ -1 +1,2 @@ from . import validate_attendance_sheet +from . import generate_missing_attendance_sheets diff --git a/beesdoo_shift/wizard/generate_missing_attendance_sheets.py b/beesdoo_shift_atttendance/wizard/generate_missing_attendance_sheets.py similarity index 100% rename from beesdoo_shift/wizard/generate_missing_attendance_sheets.py rename to beesdoo_shift_atttendance/wizard/generate_missing_attendance_sheets.py diff --git a/beesdoo_shift/wizard/generate_missing_attendance_sheets.xml b/beesdoo_shift_atttendance/wizard/generate_missing_attendance_sheets.xml similarity index 100% rename from beesdoo_shift/wizard/generate_missing_attendance_sheets.xml rename to beesdoo_shift_atttendance/wizard/generate_missing_attendance_sheets.xml