wbcrm 1.51.0__py2.py3-none-any.whl → 1.51.2__py2.py3-none-any.whl

wbcrm/models/activities.py

@@ -15,7 +15,7 @@ from django.db.models.signals import m2m_changed, post_delete, post_save
 from django.dispatch import receiver
 from django.template.loader import render_to_string
 from django.utils import timezone
-from django.utils.translation import gettext, ngettext_lazy, pgettext_lazy
+from django.utils.translation import gettext, pgettext_lazy
 from django.utils.translation import gettext_lazy as _
 from django_fsm import FSMField, transition
 from dynamic_preferences.registries import global_preferences_registry
@@ -309,20 +309,16 @@ class Activity(Recurrence):
         if missing_companies := missing.get("missing_companies_by_participant", None):
             participants_with_missing_companies = [participant.computed_str for participant in missing_companies]
             errors["companies"] = [
-                ngettext_lazy(
-                    "You need to enter an employer for {persons}",
+                _(
                     "You need to enter an employer for: {persons}",
-                    len(participants_with_missing_companies),
                 ).format(persons=", ".join(participants_with_missing_companies))
             ]
 
         if missing_participants := missing.get("missing_participants_by_company", None):
             companies_with_missing_participants = [company.name for company in missing_participants]
             errors["participants"] = [
-                ngettext_lazy(
-                    "You need to enter an employee for {companies}",
+                _(
                     "You need to enter an employee for: {companies}",
-                    len(companies_with_missing_participants),
                 ).format(companies=", ".join(companies_with_missing_participants))
             ]
         return errors
@@ -609,21 +605,17 @@ class Activity(Recurrence):
             participants_with_missing_companies = [
                 participant.computed_str for participant in missing["missing_employers_for_participant"]
             ]
-            message += ngettext_lazy(
-                "You did not supply an employer for {persons}<br />",
-                "For the following participants you did not supply an employer: {persons}<br />",
-                len(participants_with_missing_companies),
-            ).format(persons=", ".join(participants_with_missing_companies))
+            message += _("For the following participants you did not supply an employer: {persons}<br />").format(
+                persons=", ".join(participants_with_missing_companies)
+            )
 
         if missing.get("missing_employees_for_company"):
             companies_with_missing_participants = [
                 company.computed_str for company in missing["missing_employees_for_company"]
             ]
-            message += ngettext_lazy(
-                "You did not supply an employee for {companies}<br />",
-                "For the following companies you did not supply an employee: {companies}<br />",
-                len(companies_with_missing_participants),
-            ).format(companies=", ".join(companies_with_missing_participants))
+            message += _("For the following companies you did not supply an employee: {companies}<br />").format(
+                companies=", ".join(companies_with_missing_participants)
+            )
 
         return message
 

wbcrm/serializers/activities.py

@@ -7,7 +7,7 @@ from django.db.models import Q
 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_lazy, ngettext
+from django.utils.translation import gettext_lazy
 from psycopg.types.range import TimestamptzRange
 from rest_framework.exceptions import ValidationError
 from rest_framework.reverse import reverse
@@ -398,10 +398,8 @@ class ActivityModelSerializer(ActivityModelListSerializer):
                             groups = ", ".join(
                                 list(dict.fromkeys(missing_members.values_list("groups__title", flat=True)))
                             )
-                            error_message = ngettext(
-                                "{missing_members} {util_str} of the group: {groups}\n. You cannot remove members of selected groups.",
+                            error_message = _(
                                 "{missing_members} {util_str} of the following group(s): {groups}\n. You cannot remove members of selected groups.",
-                                len(dict.fromkeys(missing_members.values_list("groups__title", flat=True))),
                             ).format(missing_members=missing_members_computed_strs, util_str=util_str, groups=groups)
 
                             raise ValidationError({"groups": error_message})

wbcrm/synchronization/activity/shortcuts.py

@@ -1,3 +1,6 @@
+from contextlib import suppress
+
+from dynamic_preferences.exceptions import NotFoundInRegistry
 from dynamic_preferences.registries import global_preferences_registry
 from wbcore.utils.importlib import import_from_dotted_path
 
@@ -5,6 +8,7 @@ from wbcore.utils.importlib import import_from_dotted_path
 def get_backend():
     from wbcrm.synchronization.activity.controller import ActivityController
 
-    if backend := global_preferences_registry.manager()["wbactivity_sync__sync_backend_calendar"]:
-        backend = import_from_dotted_path(backend)
-        return ActivityController(backend=backend)
+    with suppress(NotFoundInRegistry):
+        if backend := global_preferences_registry.manager()["wbactivity_sync__sync_backend_calendar"]:
+            backend = import_from_dotted_path(backend)
+            return ActivityController(backend=backend)

wbcrm/viewsets/activities.py

@@ -255,12 +255,12 @@ class ActivityChartModelViewSet(viewsets.ChartViewSet):
             df = pd.DataFrame(
                 queryset.values("type", "start_date", "end_date", "activity_type_color", "activity_type_title")
             )
-            df["start_date"] = df["start_date"].dt.floor("H")
-            df["end_date"] = df["end_date"].dt.ceil("H")
+            df["start_date"] = df["start_date"].dt.floor("h")
+            df["end_date"] = df["end_date"].dt.ceil("h")
             df = (
                 pd.concat(
                     [
-                        pd.DataFrame(index=pd.date_range(r.start_date, r.end_date, freq="1H")).assign(
+                        pd.DataFrame(index=pd.date_range(r.start_date, r.end_date, freq="1h")).assign(
                             type=r.type,
                             activity_type_color=r.activity_type_color,
                             activity_type_title=r.activity_type_title,
@@ -275,7 +275,7 @@ class ActivityChartModelViewSet(viewsets.ChartViewSet):
                 x="Period",
                 color="Type",
                 labels="Type",
-                nbins=len(pd.date_range(df["Period"].min(), df["Period"].max(), freq="1H")) + 1,
+                nbins=len(pd.date_range(df["Period"].min(), df["Period"].max(), freq="1h")) + 1,
             )
             fig.update_layout(
                 paper_bgcolor="rgba(0,0,0,0)",

wbcrm/viewsets/display/accounts.py

@@ -42,6 +42,7 @@ class AccountDisplayConfig(DisplayViewConfig):
                     filter_key="parent",
                     filter_depth=1,
                     # lookup="id_repr",
+                    filter_blacklist=["parent__isnull"],
                     list_endpoint=reverse(
                         "wbcrm:account-list",
                         args=[],

wbcrm/viewsets/endpoints/accounts.py

@@ -23,10 +23,3 @@ class AccountRoleAccountEndpointConfig(EndpointViewConfig):
 class InheritedAccountRoleAccountEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
         return None
-
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbcrm:account-inheritedrole-list",
-            args=[self.view.kwargs["account_id"]],
-            request=self.request,
-        )

wbcrm/viewsets/menu/activities.py

@@ -1,6 +1,3 @@
-from datetime import timedelta
-
-from django.utils import timezone
 from django.utils.translation import gettext as _
 from wbcore.menus import ItemPermission, MenuItem
 from wbcore.permissions.shortcuts import is_internal_user
@@ -10,13 +7,6 @@ def default_activity_create_get_params(request) -> dict:
     return {"participants": request.user.profile.id}
 
 
-def default_activitychart_get_params(request) -> dict:
-    current_last_week_date_start = timezone.now().date() - timedelta(days=7)
-    current_next_week_date_end = timezone.now().date() + timedelta(days=7)
-
-    return {"period": f"{current_last_week_date_start:%Y-%m-%d},{current_next_week_date_end:%Y-%m-%d}"}
-
-
 ACTIVITYTYPE_MENUITEM = MenuItem(
     label=_("Activity Types"),
     endpoint="wbcrm:activitytype-list",
@@ -41,7 +31,6 @@ ACTIVITY_MENUTITEM = MenuItem(
     permission=ItemPermission(
         method=lambda request: is_internal_user(request.user), permissions=["wbcrm.view_activity"]
     ),
-    # endpoint_get_parameters={"only_recent": True}, # TODO confirm that this can actually be commented out
     add=MenuItem(
         label=_("Create Activity"),
         endpoint="wbcrm:activity-list",
@@ -57,5 +46,4 @@ ACTIVITYCHART_MENUITEM = MenuItem(
     permission=ItemPermission(
         method=lambda request: is_internal_user(request.user), permissions=["wbcrm.view_activity"]
     ),
-    endpoint_get_parameters=default_activitychart_get_params,
 )

{wbcrm-1.51.0.dist-info → wbcrm-1.51.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcrm
-Version: 1.51.0
+Version: 1.51.2
 Summary: A workbench module that contains all the functionality related to a customer relationship management.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: django-eventtools==1.*

{wbcrm-1.51.0.dist-info → wbcrm-1.51.2.dist-info}/RECORD

@@ -20,14 +20,19 @@ wbcrm/factories/groups.py,sha256=OWmGk-H9zEnLOo_5oe4czSVvAUUOfrpUmVHgG9xvtak,621
 wbcrm/factories/products.py,sha256=UuhCaSZsrmIA8ccj80gAaNNlAmhcKLjwDwNOvE3BHro,244
 wbcrm/filters/__init__.py,sha256=ZX47xCq18N_FTvvFCk2mIlFoValKFaTcxw9xv8qdn0E,305
 wbcrm/filters/accounts.py,sha256=WwBNxXnyevdP_k7yHCgy-5eM-ILc8MgVTltPcAmu760,2738
-wbcrm/filters/activities.py,sha256=y1MmnXlypIcDfj4P3oa3VbAHY1LTwGamUeeX6h6XbDs,7783
+wbcrm/filters/activities.py,sha256=-1BIlnMn5fDyqt3Ze9lmEPXi1DU-rpUQirrnba4kp7I,8233
 wbcrm/filters/groups.py,sha256=X6XC5nUZOlOwuJJxjl0tD9-FfzFkwIDeIXUdbQ1GHMs,624
 wbcrm/filters/products.py,sha256=K1ZJ4hhMibv0YBnQyzlPqg4KkT-uq_fGVNVJPzlP8j0,1204
 wbcrm/filters/signals.py,sha256=cd4LSwPUwutLI4CcFjzADVhv2Bc0-XkYoiaojO0rkvs,3820
 wbcrm/fixtures/wbcrm.json,sha256=Z6EwzO1nqRvEP8-WzHXJJGCP7SK6Sb86dTgjJRzVw2U,33896
 wbcrm/kpi_handlers/activities.py,sha256=xjq6dQUToDmYZFqaZm3Gj3deQnPeUZcH4VS2qvVtIXY,7900
-wbcrm/locale/de/LC_MESSAGES/django.po,sha256=imWmc6GAdOzknaBpQbFGgS4Dz0sws2NClgc9B3IfPOM,48985
-wbcrm/locale/fr/LC_MESSAGES/django.po,sha256=06ABRDZvhdOiVhrarJUxL1I4X2_5bLcrxfk2IO7rxw8,35464
+wbcrm/locale/de/LC_MESSAGES/django.mo,sha256=BZIIiBu8WMoQb8Qw_9fA2dxbLiSv9rrMUEYVAhra7qQ,28100
+wbcrm/locale/de/LC_MESSAGES/django.po,sha256=lXm59GXWz7arKR60zc-I-Di3WrLO6LQvdmswcCBIC7c,44007
+wbcrm/locale/de/LC_MESSAGES/django.po.translated,sha256=jNLVXzyCyHmgei5FDR-qt3mXjK2NJXS4YPFivlu4fNE,49041
+wbcrm/locale/en/LC_MESSAGES/django.mo,sha256=UXCQbz2AxBvh-IQ7bGgjoBnijo8h9DfE9107A-2Mgkk,337
+wbcrm/locale/en/LC_MESSAGES/django.po,sha256=plTLpQy5CrczDKLQbU6TGoW1ZDI3VNNz_xi1mEkSmj8,32455
+wbcrm/locale/fr/LC_MESSAGES/django.mo,sha256=t4lh3zX7kshbDAFzXa5HU_YGPXkPzKqODNXL2MeZ5KQ,429
+wbcrm/locale/fr/LC_MESSAGES/django.po,sha256=gjprXC-vdXWy_w0m8koNXW1BnF18WS_zTY6Ip6v0S6s,32550
 wbcrm/migrations/0001_initial_squashed_squashed_0032_productcompanyrelationship_alter_product_prospects_and_more.py,sha256=tI2lU8Z8oW_-FexgquJOC41HwqFO6OyLuRtVY9Es2Ho,166228
 wbcrm/migrations/0002_alter_activity_repeat_choice.py,sha256=OBl6j8p4l3f5k1T3TzOgQtunSXJx0M3Uk-gAuPjPxkM,1187
 wbcrm/migrations/0003_remove_activity_external_id_and_more.py,sha256=Lz4RTsGJPnR2nKZ_FH_WSD22IRVqZ6_aZcleTJT4pSM,2097
@@ -48,7 +53,7 @@ wbcrm/migrations/0017_event.py,sha256=PzhAVAa2z4itzctQBz-6i__aRDh3TDe029F8leE34W
 wbcrm/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcrm/models/__init__.py,sha256=23U2eBeZStYgUKSGfi3q88JtfqfbNTk7MbnLEAGw1gk,287
 wbcrm/models/accounts.py,sha256=Wtr8QtHWSnkVmbdZqY64kQJaZ5UDqSfkIKSUaqxBirI,25435
-wbcrm/models/activities.py,sha256=dRYA04_lHrr6ONZAk2hnzmlPWIKUBcsElKq_PApGSL8,54411
+wbcrm/models/activities.py,sha256=f_BQ-NXCIILzK5C0ST287Ai78oHClAIVcsCCXHfln-w,53828
 wbcrm/models/events.py,sha256=jUHArKuZlPzMXpzwrtxM0fI6POF2-ETybtphjPQxqqA,393
 wbcrm/models/groups.py,sha256=att5YADwTLoI5NmSoiMhOBJ8qyBbdKubPGMI2dXUCf0,4345
 wbcrm/models/products.py,sha256=q7BOU3hPGZwolVfOPkkAFhGYYBRDGHU8ldKui9FAMPQ,2472
@@ -58,7 +63,7 @@ wbcrm/models/llm/analyze_relationship.py,sha256=AsOXela63Mqz-5-xo_vOc5mMfDazO-Ix
 wbcrm/report/activity_report.py,sha256=Y2NveP9u6CeXImXtxR4XfZK-2CFBa5CnUG-jx35Msnc,4843
 wbcrm/serializers/__init__.py,sha256=qKwo5e-Ix-Iow1RRdKFC0uZQmuSHzc8DIypIhi_E8HI,726
 wbcrm/serializers/accounts.py,sha256=F7fJAa4lamkuQxfiLU08iE4vCaDtiMtcxwTFowxHnMk,5552
-wbcrm/serializers/activities.py,sha256=krziaCnOvDCvelteRiJp7LT1whDUQKopKKtXDEwxQm4,21847
+wbcrm/serializers/activities.py,sha256=Y5CHgnbDLA9HKS6WxYrs5fpjbSyOKvZt92nSBrFObN0,21585
 wbcrm/serializers/groups.py,sha256=YqiHGiytbD1lIuSUEBk4CwlwipAFs_uh2V9DZG7JukQ,783
 wbcrm/serializers/products.py,sha256=xBv5l2xgrUQRIjlqe_qKTiWDcp0lOq5FHDBms9lm_V0,2002
 wbcrm/serializers/recurrence.py,sha256=0I42almPuwWDsRfpxig3rt_U_xGPsekBr8jQKF1BKrA,4589
@@ -80,7 +85,7 @@ wbcrm/synchronization/activity/backend.py,sha256=DVj27wLv5D6YMG_9xlh9CPN7wfgCABa
 wbcrm/synchronization/activity/controller.py,sha256=I2kT7eQffTNr_wxPFAKIfy9wfiQKD60BXW9ON7srff4,31403
 wbcrm/synchronization/activity/dynamic_preferences_registry.py,sha256=59K5Xq50IRg4yrBUevefi-0jDZtmT3JoVT3qbniJFDQ,4247
 wbcrm/synchronization/activity/preferences.py,sha256=7grSPy1oECqBK598UP8kO_t7sUNFCv6mRkEmz3LEYng,1009
-wbcrm/synchronization/activity/shortcuts.py,sha256=l8W9ySulTJ5PmSqAZ-HvQUb8uV3Mb_VMweMmhjm5C54,430
+wbcrm/synchronization/activity/shortcuts.py,sha256=pj-HHna2IeD7g3X2U5RJLqXAerE_KW-xNALIDbNNSyo,576
 wbcrm/synchronization/activity/tasks.py,sha256=NrCjx8WMhdsFwe1PbLwV2tdFBLg-XrnuFJt4yjlv9Ow,607
 wbcrm/synchronization/activity/urls.py,sha256=yNld96CD88zeWimGbUmuiq5OjTBLEGKpwvF2I25oBD8,168
 wbcrm/synchronization/activity/utils.py,sha256=pNXtMRBr-u5vRaonyhkSIYHHzt7q3gEw-VGLBSFXrSI,1427
@@ -138,7 +143,7 @@ wbcrm/tests/e2e/e2e_wbcrm_utility.py,sha256=NB2pQXEzr8-S7cMGOs6w5IrT3gdcuzwz5x3a
 wbcrm/tests/e2e/test_e2e.py,sha256=p4elt_MWXWxBy6i8ayKdqTxHARiaozdd9xmi9_orQr4,16520
 wbcrm/viewsets/__init__.py,sha256=aoi2Hry7C6CixqV7ZIVrVPSjrcRcdRkE3zBmm1Va1Qo,668
 wbcrm/viewsets/accounts.py,sha256=gO7nb4cYtm4qZO5tpcQ2akoH54F6Uq01VFpshq5pdvQ,4458
-wbcrm/viewsets/activities.py,sha256=6fFuv8AqrFeh7rPOJyBdV0D2hlUq_8_FeRQtEhBVwyQ,12873
+wbcrm/viewsets/activities.py,sha256=ifN6evcgYStW0hCN2v9rWrBQQynkysSTyF2Ccrh5754,12873
 wbcrm/viewsets/groups.py,sha256=2W529zW2m1DIRYTxn8nEDYjWjQAHzh6yV7Owvf3KZA4,1414
 wbcrm/viewsets/mixins.py,sha256=pqyP00VNA5jJL9LwvIw7Mfc-zN-z5yJ-cAblZY7o7c4,1113
 wbcrm/viewsets/products.py,sha256=aby4V6F-7WzosKIbYV_CEguXrNo2IN8ZjUTcUGGmX8w,2157
@@ -148,18 +153,18 @@ wbcrm/viewsets/buttons/accounts.py,sha256=8r07RQ5l-MZQO3yY-NT5D18nJs_lMVweYi28lH
 wbcrm/viewsets/buttons/activities.py,sha256=jb-AHCTGmDgfObnboXcsqF8bqCZE2o4aTk0Le5qX1pI,3880
 wbcrm/viewsets/buttons/signals.py,sha256=DbY78n1T_zqs16DW5x_5gsFyd-GUN1KrExWLUvT5-YI,729
 wbcrm/viewsets/display/__init__.py,sha256=Ryjs6DW42eFHuh3_uW91blo0pgfR07dCDeZzOU12mNM,357
-wbcrm/viewsets/display/accounts.py,sha256=Ai1pUYqWmuT_55FpnFU5xTvXhmDc3CZqjqpxbMtozOA,4656
+wbcrm/viewsets/display/accounts.py,sha256=rfgcMwTNX8OMZTUoa7l9dFl8pQwH0iNZ6EQm_7G01LI,4713
 wbcrm/viewsets/display/activities.py,sha256=EPUql__9q788y-hJ0_9l7vALMAHsMOgnHfmutRfArcQ,18653
 wbcrm/viewsets/display/groups.py,sha256=fwmqaWrGWS6GwCi2PkjH9dbgwx5uf8pebXrjDB5tIeQ,785
 wbcrm/viewsets/display/products.py,sha256=D5AmkE4HqZPcablhBmnQRpgCjKMD45vCaKjoAAnvY20,3988
 wbcrm/viewsets/endpoints/__init__.py,sha256=-AKt5SNWdmKSy_H7EWUNpQWaDNURoA1v68HWPuWeH4I,340
-wbcrm/viewsets/endpoints/accounts.py,sha256=jQLThgETptmcgIqbmgVkO1PYv8ryDiRk-wzrkf7Vy1Y,980
+wbcrm/viewsets/endpoints/accounts.py,sha256=FszmIqf52EJNEbtTY1vaK8kVKz4LrC_A3DGkdURBsJg,769
 wbcrm/viewsets/endpoints/activities.py,sha256=UGtDJ4GyedyVKCowTlgKhnhZYKiMVU8D81z2CGfmj0w,1369
 wbcrm/viewsets/endpoints/groups.py,sha256=JLPEEtyKbCDb0R7aCdHtrG3XWyfCduW1zdOwK6QcfIQ,282
 wbcrm/viewsets/endpoints/products.py,sha256=1sjCon-dgWwwwCJV_KxRGRiHLDVv1t60Vv8ezNpiXCU,362
 wbcrm/viewsets/menu/__init__.py,sha256=V2ns9vGWIkkN4PsJHvGVnbiQUaGcx9VFA2UV65l8nXA,221
 wbcrm/viewsets/menu/accounts.py,sha256=XyfLf-3EmMDUyVeGEG4-THIifIwAp5RnX9UCm0epG2g,630
-wbcrm/viewsets/menu/activities.py,sha256=rp10r9WsI_ji7YPfLRhWP9ieGG6BwNF3G6pH_Fr4msU,2152
+wbcrm/viewsets/menu/activities.py,sha256=BvzrUtMj9xk-ybG4y6a36nGN01CtsRkzqQUEpjewUB0,1602
 wbcrm/viewsets/menu/groups.py,sha256=cTRT9-TVWvzx0-fk_OrBYujqZkqdw88_Q2lDfBfIwoU,606
 wbcrm/viewsets/menu/products.py,sha256=0YwZwTakoR92_l5kjX4I0pCAnx--OTIlTZ0HkB3lFPw,654
 wbcrm/viewsets/previews/__init__.py,sha256=EWvN0AiXSj7XzT48LfT6EH-ZkrzCQcM9zMKKDUsZ_Pc,46
@@ -171,6 +176,6 @@ wbcrm/viewsets/titles/products.py,sha256=cFAK5zljjybabk2U0KzPT2PVfV5vmO_UlJd6QlI
 wbcrm/viewsets/titles/utils.py,sha256=IaHQTmEG2OwIHS1bRv7sjuT950wefUJNi3yvPdrpNEs,1144
 wbcrm/workflows/__init__.py,sha256=biwXXPkVJugT9Vc1cwbInAUY8EnVmOauxdPz7e_2w_A,32
 wbcrm/workflows/assignee_methods.py,sha256=L7ymErtcpFgXdTMTj_lDOVJqsLAGLNT6qMlrkHGuXWM,999
-wbcrm-1.51.0.dist-info/METADATA,sha256=kQQy6dC9NXdywcrzyRBolzPoZDNEkCzdUsXYimLatuY,450
-wbcrm-1.51.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbcrm-1.51.0.dist-info/RECORD,,
+wbcrm-1.51.2.dist-info/METADATA,sha256=3RLs_jIxbdriBW_-h73TuaKA7z5oFP7cfltutpnTdRo,450
+wbcrm-1.51.2.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbcrm-1.51.2.dist-info/RECORD,,