From a53f6f428e585449855de8ba13b9b079d8fa7921 Mon Sep 17 00:00:00 2001 From: Virginia Bonservizi Date: Mon, 14 Nov 2022 19:04:08 +0000 Subject: [PATCH] [MIG] hr_timesheet_attendance_ux: Migration to 16.0 closes ingadhoc/hr#37 Signed-off-by: Augusto Weiss --- hr_timesheet_attendance_ux/README.rst | 6 +----- hr_timesheet_attendance_ux/__manifest__.py | 7 ++----- .../static/src/xml/attendance.xml | 10 ---------- .../views/hr_attendance_views.xml | 6 +++--- .../views/hr_timesheet_attendance_report_views.xml | 1 - 5 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 hr_timesheet_attendance_ux/static/src/xml/attendance.xml diff --git a/hr_timesheet_attendance_ux/README.rst b/hr_timesheet_attendance_ux/README.rst index fe192f0..d92cfd4 100644 --- a/hr_timesheet_attendance_ux/README.rst +++ b/hr_timesheet_attendance_ux/README.rst @@ -14,12 +14,8 @@ Attendance Timesheet UX ======================= -#. Add pivot and graph view to timesheets -#. Use timesheet menu as default one on the app (first one) -#. Add fields for total (timesheet, attendance, theorical, etc) -#. Add description and notes #. Add link from timesheets to timesheet vs attendance analysis -#. My Timesheets/All Timesheets odoo menus are set visible only in developer mode. +#. Timesheets/All Timesheets odoo menu is set visible only in developer mode. Installation ============ diff --git a/hr_timesheet_attendance_ux/__manifest__.py b/hr_timesheet_attendance_ux/__manifest__.py index 9ba40cf..4d9ec5a 100644 --- a/hr_timesheet_attendance_ux/__manifest__.py +++ b/hr_timesheet_attendance_ux/__manifest__.py @@ -19,7 +19,7 @@ ############################################################################## { "name": "Attendance Timesheet UX", - 'version': "15.0.1.0.0", + 'version': "16.0.1.0.0", 'category': 'Human Resources', 'sequence': 14, 'author': 'ADHOC SA', @@ -34,10 +34,7 @@ 'views/hr_attendance_views.xml', 'views/hr_timesheet_attendance_report_views.xml', ], - 'qweb': [ - "static/src/xml/attendance.xml", - ], - 'installable': False, + 'installable': True, 'auto_install': False, 'application': False, } diff --git a/hr_timesheet_attendance_ux/static/src/xml/attendance.xml b/hr_timesheet_attendance_ux/static/src/xml/attendance.xml deleted file mode 100644 index 78e04ee..0000000 --- a/hr_timesheet_attendance_ux/static/src/xml/attendance.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - fa fa-sign-out btn-warning o_hr_attendance_sign_in_out_icon - - - - diff --git a/hr_timesheet_attendance_ux/views/hr_attendance_views.xml b/hr_timesheet_attendance_ux/views/hr_attendance_views.xml index 9f85cb2..a899eae 100644 --- a/hr_timesheet_attendance_ux/views/hr_attendance_views.xml +++ b/hr_timesheet_attendance_ux/views/hr_attendance_views.xml @@ -18,21 +18,21 @@ hr.attendance - + my_attendances - {"search_default_my_attendances": 1, "search_default_today": 1} + {"search_default_my_attendances": 1} My Attendances hr.attendance tree,kanban,form - {"search_default_today":1,"search_default_my_attendances": 1} + {"search_default_my_attendances": 1} hr.timesheet.attendance.report pivot { - 'search_default_week': True, 'search_default_user_id': uid, 'pivot_column_groupby': [], 'pivot_measures': ['total_attendance', 'total_timesheet', 'total_difference'],