wbhuman_resources 1.51.2__py2.py3-none-any.whl → 1.61.5__py2.py3-none-any.whl

wbhuman_resources/tasks.py

@@ -11,16 +11,19 @@ from django.template.loader import get_template
 from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
 from dynamic_preferences.registries import global_preferences_registry
+from wbcore.contrib.directory.models import Person
 from wbcore.contrib.notifications.dispatch import send_notification
 from wbcore.utils.date import current_month_date_end
 from wbcore.utils.html import convert_html2text
+from wbcore.workers import Queue
 
 from wbhuman_resources.models import KPI, DayOffCalendar, EmployeeHumanResource, Review
 
 from .models.preferences import get_previous_year_balance_expiration_date
+from .signals import add_employee_activity_to_daily_brief
 
 
-@shared_task
+@shared_task(queue=Queue.BACKGROUND.value)
 def create_future_public_holiday(today: date | None = None, forecast_year: int = 5):
     if not today:
         today = date.today()
@@ -29,31 +32,7 @@ def create_future_public_holiday(today: date | None = None, forecast_year: int =
             calendar.create_public_holidays(year)
 
 
-@shared_task
-def daily_birthday(today=None):
-    """
-    Cron task supposed to be ran every day. Check and notify employee about a colleague's birthday.
-    """
-    day = "today"
-    if not today:
-        # Notify employee the day before
-        today = datetime.today() + timedelta(days=1)
-        day = "tomorrow"
-    for birthday_employee in EmployeeHumanResource.active_internal_employees.filter(
-        Q(profile__birthday__day=today.day) & Q(profile__birthday__month=today.month)
-    ).all():
-        for employee in EmployeeHumanResource.active_internal_employees.exclude(id=birthday_employee.id):
-            send_notification(
-                code="wbhuman_resources.employeehumanresource.birthday",
-                title=_("{} {}'s birthday is {}!").format(
-                    birthday_employee.profile.first_name, birthday_employee.profile.last_name, day
-                ),
-                body=_("Wish her/him a happy birthday!"),
-                user=employee.profile.user_account,
-            )
-
-
-@shared_task
+@shared_task(queue=Queue.BACKGROUND.value)
 def assign_balance(today=None):
     """
     Yearly periodic cron tasks that increase for an employee
@@ -68,7 +47,7 @@ def assign_balance(today=None):
         employee.assign_vacation_allowance_from_range(start_period.date(), end_period.date())
 
 
-@shared_task
+@shared_task(queue=Queue.BACKGROUND.value)
 def check_and_warn_user_with_previous_year_available_balance(year=None):
     """
     When this task run, it will send a reminder Notification to user with still available balance for the previous year
@@ -91,7 +70,7 @@ def check_and_warn_user_with_previous_year_available_balance(year=None):
             )
 
 
-@shared_task
+@shared_task(queue=Queue.BACKGROUND.value)
 def send_mail_to_accounting():
     global_preferences = global_preferences_registry.manager()
     accounting_company_emails = list(
@@ -133,7 +112,7 @@ def send_mail_to_accounting():
     msg.send()
 
 
-@shared_task
+@shared_task(queue=Queue.BACKGROUND.value)
 def daily_automatic_application_deadline():
     for review in Review.objects.filter(
         Q(status=Review.Status.FILL_IN_REVIEW) & Q(review_deadline__lte=datetime.now().date())
@@ -172,8 +151,8 @@ def daily_automatic_application_deadline():
                 )
 
 
-@shared_task
-def periodic_updating_kpi_task(kpi_id=[], start=None, end=None):
+@shared_task(queue=Queue.BACKGROUND.value)
+def periodic_updating_kpi_task(kpi_id: list | None = None, start=None, end=None):
     intervals = {elt.name: KPI.Interval.get_frequence_correspondance(elt.name) for elt in KPI.Interval}
     for key, value in intervals.items():
         kpis = (
@@ -188,3 +167,30 @@ def periodic_updating_kpi_task(kpi_id=[], start=None, end=None):
                 end = kpi.period.upper
             for date_evaluation in pd.date_range(start=start, end=end, freq=value):
                 kpi.generate_evaluation(date_evaluation.date())
+
+
+@shared_task(queue=Queue.BACKGROUND.value)
+def daily_brief(today: date | None = None, **kwargs):
+    """Creates a summary of the daily brief for all internal employees
+    Args:
+        today (date | None, optional): Date of today. Defaults to None.
+    """
+
+    if not today:
+        today = date.today()
+    for employee in EmployeeHumanResource.active_internal_employees.filter(profile__user_account__isnull=False):
+        daily_brief = ""
+        for receiver, res in add_employee_activity_to_daily_brief.send(  # noqa: B007
+            sender=Person, instance=employee.profile, val_date=today, **kwargs
+        ):
+            if res:
+                title, html = res
+                daily_brief += f"<h2 text-align: center;>{title}</h2>\n<div style='margin-bottom: 1.5em; text-align: left;'>{html}</div>\n"
+
+        if daily_brief:
+            send_notification(
+                code="wbcrm.activity.daily_brief",
+                title=_("Your Daily Brief"),
+                body=daily_brief,
+                user=employee.profile.user_account,
+            )

wbhuman_resources/tests/test_permission.py

@@ -1,15 +1,13 @@
 import pytest
-from django.contrib.auth import get_user_model
 from dynamic_preferences.registries import global_preferences_registry
 from faker import Faker
 from rest_framework.test import APIRequestFactory
 from wbcore.contrib.authentication.factories import UserFactory
-from wbcore.permissions.shortcuts import is_internal_user
+from wbcore.contrib.permission.internal.registry import UserBackendRegistry
 
 from wbhuman_resources.factories.employee import EmployeeHumanResourceFactory
 from wbhuman_resources.models.employee import EmployeeHumanResource
 
-User = get_user_model()
 fake = Faker()
 
 
@@ -17,48 +15,54 @@ fake = Faker()
 class TestPermissionTasks:
     @pytest.fixture
     def request_user_external(self):
-        request = APIRequestFactory()
         user = UserFactory()
         EmployeeHumanResourceFactory.create(
             profile=user.profile, contract_type=EmployeeHumanResource.ContractType.EXTERNAL
         )
+        UserBackendRegistry().refresh_users()
+
+        user.refresh_from_db()
+        request = APIRequestFactory()
         request.user = user
         return request
 
     @pytest.fixture
     def request_user_active_internal(self):
-        request = APIRequestFactory()
         user = UserFactory()
         EmployeeHumanResourceFactory.create(
             profile=user.profile, contract_type=EmployeeHumanResource.ContractType.INTERNAL
         )
+        UserBackendRegistry().refresh_users()
+
+        user.refresh_from_db()
+        request = APIRequestFactory()
         request.user = user
         return request
 
     @pytest.fixture
     def request_user_inactive_internal(self):
-        request = APIRequestFactory()
-        user = UserFactory()
+        user = UserFactory.create()
         EmployeeHumanResourceFactory.create(
             profile=user.profile, contract_type=EmployeeHumanResource.ContractType.INTERNAL, is_active=False
         )
+        UserBackendRegistry().refresh_users()
+        user.refresh_from_db()
+        request = APIRequestFactory()
         request.user = user
         return request
 
     def test_permission_active_internal(self, request_user_active_internal):
-        assert is_internal_user(request_user_active_internal.user) is True
+        assert request_user_active_internal.user.is_internal is True
 
     def test_permission_inactive_internal(self, request_user_inactive_internal):
-        assert is_internal_user(request_user_inactive_internal.user) is False
+        assert request_user_inactive_internal.user.is_internal is False
 
     def test_permission_external(self, request_user_external):
-        assert is_internal_user(request_user_external.user) is False
+        assert request_user_external.user.is_internal is False
 
     def test_permission_external_but_considered_internal(self, request_user_external):
-        from wbcore.permissions.registry import user_registry
-
         user = request_user_external.user
         global_preferences_registry.manager()["wbhuman_resources__is_external_considered_as_internal"] = True
-        user = User.objects.get(id=user.id)  # reload to reset cached property
-        user_registry.reset_cache()
-        assert is_internal_user(user) is True
+        UserBackendRegistry().refresh_users()
+        user.refresh_from_db()
+        assert user.is_internal

wbhuman_resources/utils.py

@@ -6,8 +6,11 @@ from django.utils import timezone
 
 
 def get_number_of_hours_between_dates(
-    d1, d2, list_employee_dayoffs, list_public_holidays=False, hours_range=range(0, 23), granularity=12
+    d1, d2, list_employee_dayoffs, list_public_holidays=False, hours_range=None, granularity=12
 ):
+    if hours_range is None:
+        hours_range = range(0, 23)
+
     def convert_days_from_hours(hours, granularity, hours_per_day):
         return int(hours / granularity) * granularity / hours_per_day
 

wbhuman_resources/viewsets/absence.py

@@ -1,11 +1,10 @@
-import wbcore.serializers as wb_serializers
 from django.contrib.messages import info, warning
 from django.db.models import Case, CharField, F, Q, Sum, Value, When
 from django.db.models.functions import Concat, Extract
 from django.shortcuts import get_object_or_404
 from django.utils import timezone
 from django.utils.functional import cached_property
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext
 from rest_framework import filters
 from rest_framework.decorators import action
 from rest_framework.response import Response
@@ -33,6 +32,7 @@ from wbhuman_resources.serializers import (
     AbsenceRequestTypeModelSerializer,
     AbsenceRequestTypeRepresentationSerializer,
     EmployeeAbsenceDaysModelSerializer,
+    ReadOnlyAbsenceRequestModelSerializer,
 )
 from wbhuman_resources.viewsets.buttons import AbsenceRequestButtonConfig
 from wbhuman_resources.viewsets.display import (
@@ -55,12 +55,7 @@ from wbhuman_resources.viewsets.titles import (
     AbsenceTypeCountEmployeeTitleConfig,
 )
 
-from ..models.absence import can_validate_or_deny_request
-from ..serializers.absence import (
-    CurrentUserDefaultPeriodDateTimeRange,
-    get_lower_time_choices,
-    get_upper_time_choices,
-)
+from ..models.absence import can_edit_request, can_validate_or_deny_request
 from .mixins import EmployeeViewMixin
 
 
@@ -114,19 +109,16 @@ class AbsenceRequestModelViewSet(EmployeeViewMixin, viewsets.ModelViewSet):
             return can_validate_or_deny_request(obj, self.request.user)
         return False
 
-    def get_serializer_class(self):
-        if employee := getattr(self.request.user.profile, "human_resources", None):
-
-            class Serializer(AbsenceRequestModelSerializer):
-                period = wb_serializers.DateTimeRangeField(
-                    default_timezone=employee.calendar.timezone,
-                    default=CurrentUserDefaultPeriodDateTimeRange(),
-                    lower_time_choices=get_lower_time_choices,
-                    upper_time_choices=get_upper_time_choices,
-                )
+    @cached_property
+    def can_edit_request(self) -> bool:
+        if "pk" in self.kwargs and (obj := self.get_object()):
+            return can_edit_request(obj, self.request.user)
+        return True
 
-            return Serializer
-        return AbsenceRequestModelSerializer
+    def get_serializer_class(self):
+        if self.can_edit_request:
+            return AbsenceRequestModelSerializer
+        return ReadOnlyAbsenceRequestModelSerializer
 
     def add_messages(
         self,
@@ -143,7 +135,7 @@ class AbsenceRequestModelViewSet(EmployeeViewMixin, viewsets.ModelViewSet):
                 ).exclude(id=instance.id)
                 activities_title = qs.values_list("title", flat=True)
                 if len(activities_title) > 0:
-                    message = _("<p>During this absence, you already have these events:</p><ul>")
+                    message = gettext("<p>During this absence, you already have these events:</p><ul>")
                     for activity_title in activities_title:
                         message += f"<li>{activity_title}</li>"
                     message += "</ul>"
@@ -169,11 +161,11 @@ class AbsenceRequestModelViewSet(EmployeeViewMixin, viewsets.ModelViewSet):
                     available_hourly_balance_in_days = (
                         available_hourly_balance / instance.employee.calendar.get_daily_hours()
                     )
-                    message = _(
+                    message = gettext(
                         "After this request, you will have {} days ({} hours) left for the balance {}</b>"
                     ).format(available_hourly_balance_in_days, available_hourly_balance, current_balance.year)
                     if other_pending_hours > 0:
-                        message += _(
+                        message += gettext(
                             " (not including <b>{pending_hours}</b> hours from other pending/draft absence requests)"
                         ).format(pending_hours=other_pending_hours)
                     if available_hourly_balance < 0:
@@ -185,7 +177,7 @@ class AbsenceRequestModelViewSet(EmployeeViewMixin, viewsets.ModelViewSet):
                 )
                 if day_offs:
                     day_offs_messages = [
-                        _("{holiday} not counted ({title})").format(
+                        gettext("{holiday} not counted ({title})").format(
                             holiday=holiday.date.strftime("%d.%m.%Y"), title=holiday.title
                         )
                         for holiday in day_offs
@@ -236,7 +228,7 @@ class AbsenceRequestModelViewSet(EmployeeViewMixin, viewsets.ModelViewSet):
     def increaseday(self, request, pk=None):
         absence_request = get_object_or_404(AbsenceRequest, id=pk)
         if absence_request.type.is_extensible and (number_days := int(request.POST.get("number_days", 1))):
-            for i in range(number_days):
+            for _ in range(number_days):
                 if next_extensible_period := absence_request.next_extensible_period:
                     absence_request.period = next_extensible_period
             absence_request.save()
@@ -254,7 +246,7 @@ class AbsenceRequestTypeModelViewSet(viewsets.ModelViewSet):
 
 
 class AbsenceTypeCountEmployeeModelViewSet(viewsets.ModelViewSet):
-    READ_ONLY = True
+    ONLY_READ_ONLY_ENDPOINT = True
     queryset = AbsenceRequestPeriods.objects.all()
     serializer_class = EmployeeAbsenceDaysModelSerializer
 

wbhuman_resources/viewsets/absence_charts.py

@@ -10,8 +10,8 @@ from django.utils import timezone
 from django.utils.dateparse import parse_date
 from django.utils.translation import gettext as _
 from wbcore import viewsets
-from wbcore.pandas import fields as pf
-from wbcore.pandas.views import PandasAPIViewSet
+from wbcore.contrib.pandas import fields as pf
+from wbcore.contrib.pandas.views import PandasAPIViewSet
 from wbcore.utils.date import get_date_interval_from_request
 
 from wbhuman_resources.filters import AbsenceRequestPlannerFilter, AbsenceTableFilter
@@ -104,8 +104,7 @@ def update_layoute(fig, start, end):
             )
         ],
         yaxis=dict(
-            title="",
-            titlefont=dict(color="#000000"),
+            title=dict(text="", font=dict(color="#000000")),
             tickfont=dict(size=11, family="Courier", color="#000000"),
             anchor="x",
             side="left",
@@ -120,8 +119,7 @@ def update_layoute(fig, start, end):
             spikethickness=1,
         ),
         xaxis=dict(
-            title="",
-            titlefont=dict(color="#000000"),
+            title=dict(text="", font=dict(color="#000000")),
             tickfont=dict(color="#000000"),
             showline=False,
             linewidth=0.5,

wbhuman_resources/viewsets/buttons/kpis.py

@@ -5,12 +5,12 @@ from wbcore.metadata.configs import buttons as bt
 
 class KPIButtonConfig(bt.ButtonViewConfig):
     def get_custom_instance_buttons(self):
-        BUTTONS = []
+        buttons = []
         if self.view.kwargs.get("pk", None):
-            BUTTONS += [
+            buttons += [
                 bt.WidgetButton(
                     key="evaluationgraph", label=_("Evaluation Graph"), icon=WBIcon.CHART_BARS_HORIZONTAL.icon
                 ),
                 bt.WidgetButton(key="kpievaluationpandas", label=_("Latest Evaluations"), icon=WBIcon.DATA_GRID.icon),
             ]
-        return {*BUTTONS}
+        return {*buttons}

wbhuman_resources/viewsets/buttons/review.py

@@ -32,7 +32,7 @@ class ReviewButtonConfig(bt.ButtonViewConfig):
         return self.get_custom_instance_buttons()
 
     def get_custom_instance_buttons(self):
-        BUTTONS = [
+        buttons = [
             bt.WidgetButton(key="progress", label=_("Progress"), icon=WBIcon.CHART_BARS_HORIZONTAL.icon),
             bt.ActionButton(
                 method=RequestType.PATCH,
@@ -132,7 +132,7 @@ class ReviewButtonConfig(bt.ButtonViewConfig):
                             "include_kpi",
                         )
 
-                BUTTONS.append(
+                buttons.append(
                     bt.ActionButton(
                         method=RequestType.PATCH,
                         identifiers=("wbhuman_resources:review",),
@@ -158,7 +158,7 @@ class ReviewButtonConfig(bt.ButtonViewConfig):
                         ),
                     )
                 )
-        return {*BUTTONS}
+        return {*buttons}
 
 
 class ReviewGroupButtonConfig(bt.ButtonViewConfig):

wbhuman_resources/viewsets/display/calendars.py

@@ -73,12 +73,11 @@ class DefaultDailyPeriodDayOffCalendarDisplayConfig(DisplayViewConfig):
     def get_list_display(self):
         return dp.ListDisplay(
             fields=[
-                dp.Field(key="lower_time", label=_("Start")),
-                dp.Field(key="upper_time", label=_("End")),
+                dp.Field(key="timespan", label=_("Time Range")),
                 dp.Field(key="title", label=_("Title")),
                 dp.Field(key="total_hours", label=_("Total Hours")),
             ]
         )
 
     def get_instance_display(self) -> Display:
-        return create_simple_display([["lower_time", "upper_time", "title", "total_hours"]])
+        return create_simple_display([["title", "title"], ["timespan", "total_hours"]])

wbhuman_resources/viewsets/display/kpis.py

@@ -42,7 +42,7 @@ class KPIDisplayConfig(DisplayViewConfig):
                 create_simple_section("parameters_section", _("Parameters"), handler.get_display_grid()),
                 create_simple_section("evaluation_section", _("Evaluations"), [["evaluations"]], "evaluations"),
             ]
-            grid_fields.extend(["parameters_section", "evaluation_section"])
+            grid_fields.extend([["parameters_section", "evaluation_section"]])
         return create_simple_display(grid_fields, sections)
 
 

wbhuman_resources/viewsets/display/review.py

@@ -303,24 +303,24 @@ class ReviewQuestionReviewDisplayConfig(ReviewQuestionDisplayConfig):
 
 class ReviewAnswerDisplayConfig(DisplayViewConfig):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
-        FIELDS = [
+        fields = [
             dp.Field(key="question_name", label=_("Question"), width=Unit.PIXEL(720)),
             dp.Field(key="mandatory", label=_("Mandatory"), width=Unit.PIXEL(80)),
         ]
         if self.view.get_queryset().filter(question__answer_type=ReviewQuestion.ANSWERTYPE.RATING):
-            FIELDS += [dp.Field(key="answer_number", label=_("Rating"), width=Unit.PIXEL(170))]
+            fields += [dp.Field(key="answer_number", label=_("Rating"), width=Unit.PIXEL(170))]
 
-        FIELDS += [dp.Field(key="answer_text", label=_("Comment"), width=Unit.PIXEL(720))]
+        fields += [dp.Field(key="answer_text", label=_("Comment"), width=Unit.PIXEL(720))]
 
         if review_id := self.view.kwargs.get("review_id"):
             review = Review.objects.get(id=review_id)
             if review.status in [Review.Status.EVALUATION, Review.Status.VALIDATION]:
-                FIELDS = [
+                fields = [
                     dp.Field(key="question_name", label=_("Question"), width=Unit.PIXEL(740)),
                     dp.Field(key="answered_by", label=_("Answered By"), width=Unit.PIXEL(140)),
                     dp.Field(key="answer_text", label=_("Comment"), width=Unit.PIXEL(740)),
                 ]
-        return dp.ListDisplay(fields=FIELDS)
+        return dp.ListDisplay(fields=fields)
 
     def get_instance_display(self) -> Display:
         grid_fields = [[repeat_field(2, "question_name")], ["mandatory", "."]]

wbhuman_resources/viewsets/endpoints/absence.py

@@ -2,6 +2,7 @@ from rest_framework.reverse import reverse
 from wbcore.metadata.configs.endpoints import EndpointViewConfig
 
 from wbhuman_resources.models import AbsenceRequest, EmployeeHumanResource
+from wbhuman_resources.models.absence import get_valid_employee_human_resource
 
 
 class AbsenceRequestEndpointConfig(EndpointViewConfig):
@@ -18,7 +19,9 @@ class AbsenceRequestEndpointConfig(EndpointViewConfig):
         return self.get_endpoint()
 
     def get_create_endpoint(self, **kwargs):
-        return self.get_endpoint()
+        if get_valid_employee_human_resource(self.request.user) is not None:
+            return self.get_endpoint()
+        return None
 
     def get_delete_endpoint(self, **kwargs):
         if self.instance:

wbhuman_resources/viewsets/kpi.py

@@ -9,9 +9,9 @@ from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
 from rest_framework import filters
 from wbcore import viewsets
+from wbcore.contrib.pandas import fields as pf
+from wbcore.contrib.pandas.views import PandasAPIViewSet
 from wbcore.filters import DjangoFilterBackend
-from wbcore.pandas import fields as pf
-from wbcore.pandas.views import PandasAPIViewSet
 from wbcore.serializers.serializers import ModelSerializer
 from wbcore.utils.strings import format_number
 

wbhuman_resources/viewsets/menu/absence.py

@@ -1,12 +1,13 @@
 from django.utils.translation import gettext as _
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
+
+from wbhuman_resources.models.absence import get_valid_employee_human_resource
 
 ABSENCEPLANNER_MENUITEM = MenuItem(
     label=_("Absence Graph"),
     endpoint="wbhuman_resources:absenceplanner-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_absencerequest"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_absencerequest"]
     ),
 )
 
@@ -14,7 +15,7 @@ ABSENCETABLE_MENUITEM = MenuItem(
     label=_("Presence Table"),
     endpoint="wbhuman_resources:absencetable-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_absencerequest"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_absencerequest"]
     ),
 )
 
@@ -22,13 +23,16 @@ ABSENCEREQUEST_MENUITEM = MenuItem(
     label=_("Requests"),
     endpoint="wbhuman_resources:absencerequest-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_absencerequest"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_absencerequest"]
     ),
     add=MenuItem(
         label=_("Add Requests"),
         endpoint="wbhuman_resources:absencerequest-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.add_absencerequest"]
+            method=lambda request: request.user.is_internal
+            and get_valid_employee_human_resource(request.user) is not None,
+            permissions=["wbhuman_resources.add_absencerequest"],
+            include_superuser=False,
         ),
     ),
 )
@@ -37,13 +41,13 @@ ABSENCEREQUESTTYPE_MENUITEM = MenuItem(
     label=_("Request Types"),
     endpoint="wbhuman_resources:absencerequesttype-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_absencerequesttpe"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_absencerequesttpe"]
     ),
     add=MenuItem(
         label=_("Add Request Types"),
         endpoint="wbhuman_resources:absencerequesttype-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user),
+            method=lambda request: request.user.is_internal,
             permissions=["wbhuman_resources.add_absencerequesttype"],
         ),
     ),

wbhuman_resources/viewsets/menu/calendars.py

@@ -1,18 +1,17 @@
 from django.utils.translation import gettext as _
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 DAYOFF_MENUITEM = MenuItem(
     label=_("Days Off"),
     endpoint="wbhuman_resources:dayoff-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_dayoff"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_dayoff"]
     ),
     add=MenuItem(
         label=_("Add Day Off"),
         endpoint="wbhuman_resources:dayoff-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.add_dayoff"]
+            method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.add_dayoff"]
         ),
     ),
 )
@@ -21,13 +20,13 @@ DAYOFFCALENDAR_MENUITEM = MenuItem(
     label=_("Calendars"),
     endpoint="wbhuman_resources:dayoffcalendar-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_dayoffcalendar"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_dayoffcalendar"]
     ),
     add=MenuItem(
         label=_("Add Calendar"),
         endpoint="wbhuman_resources:dayoffcalendar-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.add_dayoffcalendar"]
+            method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.add_dayoffcalendar"]
         ),
     ),
 )

wbhuman_resources/viewsets/menu/employee.py

@@ -1,12 +1,11 @@
 from django.utils.translation import gettext as _
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 EMPLOYEEHUMANRESOURCE_MENUITEM = MenuItem(
     label=_("Balance & Usage"),
     endpoint="wbhuman_resources:employeebalance-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user),
+        method=lambda request: request.user.is_internal,
         permissions=["wbhuman_resources.view_employeehumanresource"],
     ),
 )
@@ -15,14 +14,14 @@ EMPLOYEE_MENUITEM = MenuItem(
     label=_("Employees"),
     endpoint="wbhuman_resources:employee-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user),
+        method=lambda request: request.user.is_internal,
         permissions=["wbhuman_resources.view_employeehumanresource"],
     ),
     add=MenuItem(
         label=_("Add Employee"),
         endpoint="wbhuman_resources:employee-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user),
+            method=lambda request: request.user.is_internal,
             permissions=["wbhuman_resources.add_employeehumanresource"],
         ),
     ),
@@ -32,13 +31,13 @@ POSITION_MENUITEM = MenuItem(
     label=_("Positions"),
     endpoint="wbhuman_resources:position-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_position"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_position"]
     ),
     add=MenuItem(
         label=_("Add Position"),
         endpoint="wbhuman_resources:position-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.add_position"]
+            method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.add_position"]
         ),
     ),
 )