[FIX] hr_work_entry: No work entry type

Problem
----------
- If the user creates a work entry without a work entry type, it will fetch "false" id work entry type. It raises a traceback
- Create a work entry without work entry type will change its state to conflict but if you add a work entry type the state will not change.
- If you edit a correct work entry by removing the work entry type, the state will stay in draft, it will not become in conflict

Fix
----------
- False work entry types are filtered in the favorite work entry type.
- The work_entry_type_field widget is improved to not display a colored case if no work entry type is specified in the field.
- The conflict behavior is fixed, a work entry without a work entry type should be in conflict.

task-5078885

closes odoo#227956

Related: odoo/enterprise#95149
Signed-off-by: Yannick Tivisse (yti) <[email protected]>

Author: lebm-odoo

addons/hr_work_entry/__manifest__.py

@@ -25,7 +25,10 @@
     ],
     'assets': {
         'web.assets_backend': [
-            'hr_work_entry/static/**/*',
+            'hr_work_entry/static/src/**/*',
+        ],
+        'web.assets_unit_tests': [
+            'hr_work_entry/static/tests/**/*',
         ],
     },
     'author': 'Odoo S.A.',

addons/hr_work_entry/models/hr_work_entry.py

@@ -282,8 +282,8 @@ def _error_checking(self, start=None, stop=None, skip=False, employee_ids=False)
             stop = stop or max(self.mapped('date'), default=False)
             if not skip and start and stop:
                 domain = (
-                    Domain('date', '<', stop)
-                    & Domain('date', '>', start)
+                    Domain('date', '<=', stop)
+                    & Domain('date', '>=', start)
                     & Domain('state', 'not in', ('validated', 'cancelled'))
                 )
                 if employee_ids:

addons/hr_work_entry/static/src/components/work_entry_type_field/work_entry_type_field.js

@@ -19,6 +19,9 @@ export class WorkEntryType extends Component {
 }
 
 function extractData(record) {
+    if (!record) {
+        return null;
+    }
     let name;
     if ("display_name" in record) {
         name = record.display_name;

addons/hr_work_entry/static/src/components/work_entry_type_field/work_entry_type_field.xml

@@ -2,7 +2,7 @@
 <templates id="template" xml:space="preserve">
     <t t-name="hr_work_entry.Many2OneWorkEntryTypeField">
         <div class="d-flex align-items-center gap-1">
-            <t t-if="value !== false">
+            <t t-if="m2oProps.value !== false">
                 <WorkEntryType data="state.data"/>
             </t>
             <Many2One t-props="m2oProps" cssClass="'w-100'">

addons/hr_work_entry/static/src/views/work_entry_calendar/work_entry_calendar_model.js

@@ -44,7 +44,7 @@ export class WorkEntryCalendarModel extends CalendarModel {
         if (userFavoritesWorkEntriesIds.length) {
             this.userFavoritesWorkEntries = await this.orm.read(
                 "hr.work.entry.type",
-                userFavoritesWorkEntriesIds.map((r) => r.work_entry_type_id[0]),
+                userFavoritesWorkEntriesIds.map((r) => r.work_entry_type_id?.[0]).filter(Boolean),
                 ["display_name", "display_code", "color"]
             );
             this.userFavoritesWorkEntries = this.userFavoritesWorkEntries.sort((a, b) =>

addons/hr_work_entry/static/tests/hr_work_entry_test_helpers.js

@@ -0,0 +1,16 @@
+import { defineModels } from "@web/../tests/web_test_helpers";
+import { hrModels } from "@hr/../tests/hr_test_helpers";
+import { HrEmployee } from "@hr_work_entry/../tests/mock_server/mock_models/hr_employee";
+import { HrWorkEntryType } from "@hr_work_entry/../tests/mock_server/mock_models/hr_work_entry_type";
+import { HrWorkEntry } from "@hr_work_entry/../tests/mock_server/mock_models/hr_work_entry";
+
+export function defineHrWorkEntryModels() {
+    return defineModels(hrWorkEntryModels);
+}
+
+export const hrWorkEntryModels = {
+    ...hrModels,
+    HrEmployee,
+    HrWorkEntry,
+    HrWorkEntryType,
+};

addons/hr_work_entry/static/tests/mock_server/mock_models/hr_employee.js

@@ -0,0 +1,12 @@
+import { models } from "@web/../tests/web_test_helpers";
+
+export class HrEmployee extends models.ServerModel {
+    _name = "hr.employee";
+
+    _records = [
+        { id: 100, name: "Richard" },
+        { id: 200, name: "Alice" },
+    ];
+
+    async generate_work_entries(employeeIds, startDate, endDate) {}
+}

addons/hr_work_entry/static/tests/mock_server/mock_models/hr_work_entry.js

@@ -0,0 +1,30 @@
+import { models } from "@web/../tests/web_test_helpers";
+
+export class HrWorkEntry extends models.ServerModel {
+    _name = "hr.work.entry";
+
+    _views = {
+        "form,multi_create_form": `
+            <form>
+                <field name="employee_id" invisible="1"/>
+            </form>
+        `,
+        calendar: `
+            <calendar
+                date_start="date"
+                date_stop="date" 
+                mode="month"
+                scales="month"
+                month_overflow="0"
+                quick_create="0"
+                color="color"
+                event_limit="9"
+                show_date_picker="0"
+                multi_create_view="multi_create_form"
+                js_class="work_entries_calendar">
+            </calendar>
+        `,
+    };
+
+    action_split(workEntryIds, vals) {}
+}

addons/hr_work_entry/static/tests/mock_server/mock_models/hr_work_entry_type.js

@@ -0,0 +1,26 @@
+import { models } from "@web/../tests/web_test_helpers";
+
+export class HrWorkEntryType extends models.ServerModel {
+    _name = "hr.work.entry.type";
+
+    _records = [
+        {
+            id: 1,
+            name: "Test Work Entry Type",
+            color: 1,
+            display_code: "WT1",
+        },
+        {
+            id: 2,
+            name: "WET no color",
+            color: false,
+            display_code: "WT2",
+        },
+        {
+            id: 3,
+            name: "WET no display code",
+            color: 1,
+            display_code: false,
+        },
+    ];
+}

addons/hr_work_entry/static/tests/work_entry_calendar_view.test.js

@@ -0,0 +1,56 @@
+import { beforeEach, describe, expect, test } from "@odoo/hoot";
+import { animationFrame, mockDate } from "@odoo/hoot-mock";
+import { findComponent, makeMockServer, mountView } from "@web/../tests/web_test_helpers";
+import { defineHrWorkEntryModels } from "@hr_work_entry/../tests/hr_work_entry_test_helpers";
+import { WorkEntryCalendarController } from "@hr_work_entry/views/work_entry_calendar/work_entry_calendar_controller";
+const { DateTime } = luxon;
+
+describe.current.tags("desktop");
+defineHrWorkEntryModels();
+
+beforeEach(() => {
+    mockDate("2025-01-01 12:00:00", +0);
+});
+
+function getCalendarController(view) {
+    return findComponent(view, (c) => c instanceof WorkEntryCalendarController);
+}
+
+test("Test work entry calendar without work entry type", async () => {
+    const { env } = await makeMockServer();
+    env["hr.work.entry"].create([
+        {
+            name: "Test Work Entry 0",
+            employee_id: 100,
+            work_entry_type_id: false,
+            date: "2025-01-01",
+            duration: 120,
+        },
+    ]);
+    const calendar = await mountView({
+        type: "calendar",
+        resModel: "hr.work.entry",
+    });
+    expect(".o_calendar_renderer").toBeDisplayed({
+        message:
+            "Calendar view should be displayed even with work entries with false work entry type",
+    });
+    const controller = getCalendarController(calendar);
+    const data = {
+        name: "Test New Work Entry",
+        employee_id: 100,
+        work_entry_type_id: false,
+    };
+    await controller.model.multiCreateRecords(
+        {
+            record: {
+                getChanges: () => data,
+            },
+        },
+        [DateTime.fromISO("2025-01-02")]
+    );
+    await animationFrame();
+    expect(".fc-event").toHaveCount(2, {
+        message: "2 work entries should be displayed in the calendar view",
+    });
+});