From 390784f7261165471a1bc99c25ad075d61ed3e0c Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Thu, 7 Oct 2021 10:59:27 -0700
Subject: [PATCH] [MIG] hr_attendance_work_entry: to Odoo 15.0

---
 hr_attendance_work_entry/__manifest__.py         | 16 +++++++++++-----
 .../tests/test_attendance_work_type.py           |  4 ++++
 hr_attendance_work_entry/views/web_assets.xml    | 14 --------------
 .../views/work_entry_views.xml                   |  3 ++-
 4 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 hr_attendance_work_entry/views/web_assets.xml

diff --git a/hr_attendance_work_entry/__manifest__.py b/hr_attendance_work_entry/__manifest__.py
index 2a6b0737..9d04921b 100755
--- a/hr_attendance_work_entry/__manifest__.py
+++ b/hr_attendance_work_entry/__manifest__.py
@@ -1,7 +1,7 @@
 {
     'name': 'Attendance Work Entry Type',
     'description': 'Set work types on attendance records.',
-    'version': '14.0.1.0.0',
+    'version': '15.0.1.0.0',
     'website': 'https://hibou.io/',
     'author': 'Hibou Corp. <hello@hibou.io>',
     'license': 'AGPL-3',
@@ -14,14 +14,20 @@
         'data/hr_attendance_work_entry_data.xml',
         'views/attendance_views.xml',
         'views/employee_views.xml',
-        'views/web_assets.xml',
         'views/work_entry_views.xml',
     ],
     'demo': [
         'data/hr_attendance_work_entry_demo.xml',
     ],
-    'qweb': [
-        'static/src/xml/hr_attendance.xml',
-    ],
+    'assets': {
+        'web.assets_qweb': [
+            'hr_attendance_work_entry/static/src/xml/hr_attendance.xml',
+        ],
+        'web.assets_backend': [
+            'hr_attendance_work_entry/static/src/js/kiosk_confirm.js',
+            'hr_attendance_work_entry/static/src/js/my_attendances.js',
+            'hr_attendance_work_entry/static/src/scss/hr_attendances.scss',
+        ],
+    },
     'pre_init_hook': 'attn_payroll_pre_init_hook',
 }
diff --git a/hr_attendance_work_entry/tests/test_attendance_work_type.py b/hr_attendance_work_entry/tests/test_attendance_work_type.py
index dc11d07c..54c13283 100644
--- a/hr_attendance_work_entry/tests/test_attendance_work_type.py
+++ b/hr_attendance_work_entry/tests/test_attendance_work_type.py
@@ -1,3 +1,4 @@
+from time import sleep
 from odoo.tests import common
 
 
@@ -39,6 +40,9 @@ class TestAttendanceWorkType(common.TransactionCase):
         self.assertEqual(attendance.work_type_id, break_type)
         self.assertEqual(self.employee.attendance_state, 'break')
 
+        # tests likely won't pass as the timestamps will be the same
+        sleep(1)
+
         # check back in immediately with default
         self.employee = self.employee.with_context(work_type_id=self.default_work_type.id)
         attendance = self.employee._attendance_action_change()
diff --git a/hr_attendance_work_entry/views/web_assets.xml b/hr_attendance_work_entry/views/web_assets.xml
deleted file mode 100644
index d40f35c0..00000000
--- a/hr_attendance_work_entry/views/web_assets.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-
-    <template id="assets_backend" name="hr_attendance_work_entry_assets" inherit_id="web.assets_backend">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/hr_attendance_work_entry/static/src/js/kiosk_confirm.js"/>
-            <script type="text/javascript" src="/hr_attendance_work_entry/static/src/js/my_attendances.js"/>
-        </xpath>
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/hr_attendance_work_entry/static/src/scss/hr_attendances.scss"/>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/hr_attendance_work_entry/views/work_entry_views.xml b/hr_attendance_work_entry/views/work_entry_views.xml
index 8d32c19f..c8fc638e 100644
--- a/hr_attendance_work_entry/views/work_entry_views.xml
+++ b/hr_attendance_work_entry/views/work_entry_views.xml
@@ -30,7 +30,8 @@
     <menuitem
         id="hr_work_entry_type_menu"
         name="Work Entry Types"
-        parent="hr_attendance.menu_hr_attendance_manage_attendances"
+        parent="hr_attendance.menu_hr_attendance_root"
+        sequence="90"
         action="hr_work_entry.hr_work_entry_type_action"/>
 
 </odoo>
\ No newline at end of file