wbcommission 1.59.0__tar.gz → 1.59.8__tar.gz

{wbcommission-1.59.0 → wbcommission-1.59.8}/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.4
 Name: wbcommission
-Version: 1.59.0
+Version: 1.59.8
 Summary: A workbench module for managing human resources.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
-Requires-Dist: reportlab==3.*
 Requires-Dist: wbcompliance
 Requires-Dist: wbcore
 Requires-Dist: wbcrm

{wbcommission-1.59.0 → wbcommission-1.59.8}/pyproject.toml

@@ -13,7 +13,6 @@ dependencies = [
   "wbportfolio",
   "wbreport",
   "wbmailing",
-  "reportlab == 3.*",
 ]
 
 [tool.uv.sources]

{wbcommission-1.59.0 → wbcommission-1.59.8}/wbcommission/factories/commission.py

@@ -34,6 +34,7 @@ class CommissionFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = Commission
+        skip_postgeneration_save = True
 
     @factory.post_generation
     def rule_timespan(self, create, extracted, **kwargs):

{wbcommission-1.59.0 → wbcommission-1.59.8}/wbcommission/filters/rebate.py

@@ -1,7 +1,7 @@
 from wbcore import filters as wb_filters
 from wbcore.contrib.directory.models import Company
+from wbcore.contrib.pandas.filterset import PandasFilterSetMixin
 from wbcore.filters.defaults import current_quarter_date_range
-from wbcore.pandas.filterset import PandasFilterSetMixin
 from wbfdm.models import ClassificationGroup
 from wbfdm.preferences import get_default_classification_group
 from wbportfolio.filters.transactions.claim import CommissionBaseFilterSet

wbcommission-1.59.8/wbcommission/migrations/0009_rename_rebate_commission_type_date_recipient_product_account_wbcommissio_commiss_432402_idx.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.9 on 2025-12-09 08:50
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wbcommission', '0008_alter_commission_options_alter_commission_order'),
+    ]
+
+    operations = [
+        migrations.RenameIndex(
+            model_name='rebate',
+            new_name='wbcommissio_commiss_432402_idx',
+            old_fields=('commission_type', 'date', 'recipient', 'product', 'account'),
+        ),
+    ]

{wbcommission-1.59.0 → wbcommission-1.59.8}/wbcommission/models/commission.py

@@ -312,7 +312,7 @@ class Commission(OrderedModel, WBModel):
                 condition=Q(account_role_type_recipient__isnull=False),
             ),
             models.CheckConstraint(
-                check=(
+                condition=(
                     Q(
                         crm_recipient__isnull=False,
                         portfolio_role_recipient__isnull=True,

{wbcommission-1.59.0 → wbcommission-1.59.8}/wbcommission/models/rebate.py

@@ -13,6 +13,7 @@ from wbcore.contrib.notifications.dispatch import send_notification
 from wbcore.contrib.notifications.utils import create_notification_type
 from wbcore.signals import pre_merge
 from wbcore.utils.enum import ChoiceEnum
+from wbcore.workers import Queue
 from wbcrm.models.accounts import Account
 
 from .commission import Commission, CommissionType
@@ -155,11 +156,7 @@ class Rebate(BookingEntryCalculatedValueMixin, models.Model):
         verbose_name = "Rebate"
         verbose_name_plural = "Rebates"
         unique_together = ("date", "recipient", "account", "product", "commission_type")
-        index_together = [
-            # ("date", "recipient", "product"),
-            ("commission_type", "date", "recipient", "product", "account"),
-            #             ("date", "recipient", "product", "commission"),
-        ]
+        indexes = [models.Index(fields=["commission_type", "date", "recipient", "product", "account"])]
         notification_types = [
             create_notification_type(
                 "wbcommission.rebate.computation_done",
@@ -271,7 +268,7 @@ class Rebate(BookingEntryCalculatedValueMixin, models.Model):
 # ----------- TASKS -----------
 
 
-@shared_task(queue="commission")
+@shared_task(queue=Queue.EXTENDED_BACKGROUND.value)
 def manage_rebate_as_task(
     main_account_id: int,
     start_date: date_lib | None = None,

{wbcommission-1.59.0 → wbcommission-1.59.8}/wbcommission/reports/audit_report.py

@@ -5,6 +5,7 @@ import pandas as pd
 from celery import shared_task
 from wbcore.contrib.authentication.models import User
 from wbcore.contrib.directory.models import Entry
+from wbcore.workers import Queue
 from wbcrm.models.accounts import Account
 from wbportfolio.models.products import Product
 
@@ -13,7 +14,7 @@ from wbcommission.models import Commission, CommissionType, Rebate
 from .utils import create_report_and_send
 
 
-@shared_task(queue="commission")
+@shared_task(queue=Queue.DEFAULT.value)
 def create_audit_report_and_send_as_task(user_id: int, recipient_id: int, start_date: date, end_date: date):
     user = User.objects.get(id=user_id)
     recipient = Entry.objects.get(id=recipient_id)

{wbcommission-1.59.0 → wbcommission-1.59.8}/wbcommission/reports/customer_report.py

@@ -8,6 +8,7 @@ from django.db.models import Case, F, Sum, When
 from wbcore.contrib.authentication.models import User
 from wbcore.contrib.currency.models import CurrencyFXRates
 from wbcore.contrib.directory.models import Entry
+from wbcore.workers import Queue
 from wbcrm.models.accounts import (
     Account,
     AccountRole,
@@ -25,7 +26,7 @@ from .utils import create_report_and_send
 AccountCustomer = None
 
 
-@shared_task(queue="commission")
+@shared_task(queue=Queue.DEFAULT.value)
 def create_customer_report_and_send_as_task(user_id: int, recipient_id: int, start_date: date, end_date: date):
     user = User.objects.get(id=user_id)
     recipient = Entry.objects.get(id=recipient_id)

{wbcommission-1.59.0 → wbcommission-1.59.8}/wbcommission/viewsets/rebate.py

@@ -19,7 +19,7 @@ from wbcore import viewsets
 from wbcore.contrib.currency.models import CurrencyFXRates
 from wbcore.contrib.directory.models import Entry
 from wbcore.contrib.io.viewsets import ExportPandasAPIViewSet
-from wbcore.pandas import fields as pf
+from wbcore.contrib.pandas import fields as pf
 from wbcore.permissions.permissions import IsInternalUser
 from wbcore.serializers import decorator
 from wbcore.utils.date import get_date_interval_from_request
@@ -212,13 +212,16 @@ class RebatePandasView(RebatePermissionMixin, ExportPandasAPIViewSet):
                 columns=["value_usd", "commission_type__key", pivot, pivot_label],
             )
         df = df.rename(columns={pivot: "id", pivot_label: "title"})
-        df = pd.pivot_table(
-            df,
-            index=["id", "title"],
-            columns="commission_type__key",
-            values="value_usd",
-            aggfunc="sum",
-            fill_value=0,
+        df = (
+            pd.pivot_table(
+                df,
+                index=["id", "title"],
+                columns="commission_type__key",
+                values="value_usd",
+                aggfunc="sum",
+            )
+            .astype(float)
+            .fillna(0)
         )
         df["total"] = df.sum(axis=1)
         # Ensure all type are always present as a columns