wbcommission 1.59.8__tar.gz → 1.61.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcommission
-Version: 1.59.8
+Version: 1.61.0
 Summary: A workbench module for managing human resources.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: wbcompliance

{wbcommission-1.59.8 → wbcommission-1.61.0}/wbcommission/admin/commission.py

@@ -52,6 +52,7 @@ class CommissionTabularInline(admin.TabularInline):
     ordering = ["order"]
     autocomplete_fields = ["account", "crm_recipient"]
     show_change_link = True
+    fk_name = "account"
 
 
 @admin.register(Commission)

{wbcommission-1.59.8 → wbcommission-1.61.0}/wbcommission/filters/__init__.py

@@ -5,3 +5,4 @@ from .rebate import (
     RebateMarginalityFilter,
 )
 from .signals import *
+from .commissions import CommissionAccountFilterSet, CommissionRuleCommissionFilterSet

wbcommission-1.61.0/wbcommission/filters/commissions.py

@@ -0,0 +1,110 @@
+from datetime import date
+
+from django.db.models import Exists, OuterRef, Q
+from wbcore import filters as wb_filters
+from wbportfolio.models import Product
+
+from wbcommission.models import Commission, CommissionRule
+
+
+def filter_aum(queryset, value):
+    return queryset.filter(
+        Q(assets_under_management_range__startswith__lte=value)
+        & (
+            Q(assets_under_management_range__endswith__gt=value)
+            | Q(assets_under_management_range__endswith__isnull=True)
+        )
+        & (Q(percent__gt=0) | Q(consider_zero_percent_for_exclusion=True))
+    )
+
+
+def filter_timestamp(queryset, value):
+    return queryset.filter(
+        Q(timespan__startswith__lte=value)
+        & Q(timespan__endswith__gt=value)
+        & (Q(percent__gt=0) | Q(consider_zero_percent_for_exclusion=True))
+    )
+
+
+class CommissionRuleCommissionFilterSet(wb_filters.FilterSet):
+    only_valid_at_date = wb_filters.DateFilter(
+        required=False,
+        initial=lambda f, r, v: date.today(),
+        method="filter_only_valid_at_date",
+        label="Only Valid at date",
+        help_text="Set to show only rules that are valid for the given date",
+    )
+
+    def filter_only_valid_at_date(self, queryset, name, value):
+        if value:
+            return filter_timestamp(queryset, value)
+        return queryset
+
+    only_valid_for_aum = wb_filters.NumberFilter(
+        required=False,
+        method="filter_only_valid_for_aum",
+        label="Only Valid for AUM",
+        help_text="Set to show only rules that are valid for the given aum",
+    )
+
+    def filter_only_valid_for_aum(self, queryset, name, value):
+        if value:
+            return filter_aum(queryset, value)
+        return queryset
+
+    class Meta:
+        model = CommissionRule
+        fields = {
+            "commission": ["exact"],
+        }
+
+
+class CommissionAccountFilterSet(wb_filters.FilterSet):
+    only_valid_at_date = wb_filters.DateFilter(
+        required=False,
+        initial=lambda f, r, v: date.today(),
+        method="filter_only_valid_at_date",
+        label="Only Valid at date",
+        help_text="Set to show only rules that are valid for the given date",
+    )
+
+    def filter_only_valid_at_date(self, queryset, name, value):
+        if value:
+            return queryset.annotate(
+                has_valid_rule=Exists(
+                    filter_timestamp(CommissionRule.objects.filter(commission=OuterRef("pk")), value)
+                )
+            ).filter(has_valid_rule=True)
+
+        return queryset
+
+    only_valid_for_aum = wb_filters.NumberFilter(
+        required=False,
+        method="filter_only_valid_for_aum",
+        label="Only Valid for AUM",
+        help_text="Set to show only rules that are valid for the given aum",
+    )
+
+    def filter_only_valid_for_aum(self, queryset, name, value):
+        if value:
+            return queryset.annotate(
+                has_valid_rule=Exists(filter_aum(CommissionRule.objects.filter(commission=OuterRef("pk")), value))
+            ).filter(has_valid_rule=True)
+
+        return queryset
+
+    simulate_for_product = wb_filters.ModelChoiceFilter(
+        label="Simulate for Product",
+        queryset=Product.objects.all(),
+        endpoint=Product.get_representation_endpoint(),
+        value_key=Product.get_representation_value_key(),
+        label_key=Product.get_representation_label_key(),
+        method="fake_filter",
+        depends_on=[{"field": "only_valid_at_date", "options": {}}],
+        filter_params=lambda request, view: {"with_claim_for_account": view.account.id},
+        help_text='Choose a product to compute the actual percent paid for the bellow recipient (need the "Valide at date" filter)',
+    )
+
+    class Meta:
+        model = Commission
+        fields = {}

{wbcommission-1.59.8 → wbcommission-1.61.0}/wbcommission/generators/rebate_generator.py

@@ -17,9 +17,11 @@ class RebateGenerator(AbstractBookingEntryGenerator):
     TITLE = "Rebate Generation"
 
     @staticmethod
-    def generate_booking_entries(from_date: date, to_date: date, counterparty: Entry) -> Iterable[BookingEntry]:
+    def generate_booking_entries(
+        from_date: date, to_date: date, counterparty: Entry, booking_date: date
+    ) -> Iterable[BookingEntry]:
         rebates = Rebate.objects.filter(recipient=counterparty, date__gte=from_date, date__lte=to_date)
-
+        vat = counterparty.entry_accounting_information.vat.get_rate(booking_date)
         for product_id in rebates.distinct("product_id").values_list("product_id", flat=True):
             product = Product.objects.get(id=product_id)
 
@@ -33,10 +35,10 @@ class RebateGenerator(AbstractBookingEntryGenerator):
                 if rebate_sum > 0:
                     yield BookingEntry(
                         title=f"{product.name} {product.isin} {rebate_title} Fees",
-                        booking_date=date.today(),
+                        booking_date=booking_date,
                         reference_date=to_date,
                         gross_value=Decimal(-1 * rebate_sum),
-                        vat=Decimal(counterparty.entry_accounting_information.vat) or Decimal(0.0),
+                        vat=vat,
                         currency=product.currency,
                         counterparty=counterparty,
                         parameters={
@@ -48,7 +50,7 @@ class RebateGenerator(AbstractBookingEntryGenerator):
                                 "title": "Rebates",
                                 "reverse": "wbcommission:rebatetable-list",
                                 "parameters": {
-                                    "date": f'{from_date.strftime("%Y-%m-%d")},{to_date.strftime("%Y-%m-%d")}',
+                                    "date": f"{from_date.strftime('%Y-%m-%d')},{to_date.strftime('%Y-%m-%d')}",
                                     "product": product_id,
                                     "recipient": counterparty.id,
                                     "group_by": "ACCOUNT",

{wbcommission-1.59.8 → wbcommission-1.61.0}/wbcommission/locale/de/LC_MESSAGES/django.po

@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-30 11:37+0200\n"
+"POT-Creation-Date: 2026-01-16 14:04+0100\n"
 "PO-Revision-Date: 2025-05-30 09:40+0000\n"
 "Language-Team: German (https://app.transifex.com/stainly/teams/171242/de/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +16,16 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: serializers/commissions.py:104 serializers/commissions.py:105
+#: serializers/commissions.py:106
+msgid "Exactly one recipient field must be set (others left empty)."
+msgstr ""
+
 #: viewsets/buttons/rebate.py:19
 msgid "Start"
 msgstr ""
 
-#: viewsets/rebate.py:435
+#: viewsets/rebate.py:438
 msgid ""
 "The selected date range includes a Saturday or Sunday. Please note that fees"
 " and rebates are normalized over the weekend, as fees continue to accumulate"

{wbcommission-1.59.8 → wbcommission-1.61.0}/wbcommission/locale/en/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-30 11:37+0200\n"
+"POT-Creation-Date: 2026-01-16 14:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,11 +16,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: serializers/commissions.py:104 serializers/commissions.py:105
+#: serializers/commissions.py:106
+msgid "Exactly one recipient field must be set (others left empty)."
+msgstr ""
+
 #: viewsets/buttons/rebate.py:19
 msgid "Start"
 msgstr ""
 
-#: viewsets/rebate.py:435
+#: viewsets/rebate.py:438
 msgid ""
 "The selected date range includes a Saturday or Sunday. Please note that fees "
 "and rebates are normalized over the weekend, as fees continue to accumulate "

{wbcommission-1.59.8 → wbcommission-1.61.0}/wbcommission/locale/fr/LC_MESSAGES/django.po

@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-30 11:37+0200\n"
+"POT-Creation-Date: 2026-01-16 14:04+0100\n"
 "PO-Revision-Date: 2025-05-30 09:40+0000\n"
 "Language-Team: French (https://app.transifex.com/stainly/teams/171242/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +16,16 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
+#: serializers/commissions.py:104 serializers/commissions.py:105
+#: serializers/commissions.py:106
+msgid "Exactly one recipient field must be set (others left empty)."
+msgstr ""
+
 #: viewsets/buttons/rebate.py:19
 msgid "Start"
 msgstr ""
 
-#: viewsets/rebate.py:435
+#: viewsets/rebate.py:438
 msgid ""
 "The selected date range includes a Saturday or Sunday. Please note that fees"
 " and rebates are normalized over the weekend, as fees continue to accumulate"

wbcommission-1.61.0/wbcommission/migrations/0010_alter_rebate_unique_together_rebate_unique_rebate.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.2.9 on 2025-12-16 15:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('directory', '0014_alter_entry_relationship_managers_and_more'),
+        ('wbcommission', '0009_rename_rebate_commission_type_date_recipient_product_account_wbcommissio_commiss_432402_idx'),
+        ('wbcrm', '0019_alter_activity_companies_alter_activity_participants_and_more'),
+        ('wbportfolio', '0095_portfolio_keep_only_essential_positions'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='rebate',
+            unique_together=set(),
+        ),
+        migrations.AddConstraint(
+            model_name='rebate',
+            constraint=models.UniqueConstraint(fields=('date', 'recipient', 'account', 'product', 'commission_type'), name='unique_rebate'),
+        ),
+    ]

wbcommission-1.61.0/wbcommission/migrations/0011_commissionrole_unique_commission_role.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.9 on 2026-01-14 09:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('directory', '0015_alter_emailcontact_address_and_more'),
+        ('wbcommission', '0010_alter_rebate_unique_together_rebate_unique_rebate'),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name='commissionrole',
+            constraint=models.UniqueConstraint(fields=('person', 'commission'), name='unique_commission_role'),
+        ),
+    ]

wbcommission-1.61.0/wbcommission/migrations/0012_commission_root_account.py

@@ -0,0 +1,40 @@
+# Generated by Django 5.2.9 on 2026-01-15 13:43
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+def migrate_root_account(apps, schema_editor):
+    Commission = apps.get_model('wbcommission', 'Commission')
+    Account = apps.get_model('wbcrm', 'Account')
+    objs = []
+    for c in Commission.objects.all():
+        c.root_account = Account.objects.filter(tree_id=c.account.tree_id, level=0).first()
+        objs.append(c)
+    Commission.objects.bulk_update(objs, ["root_account"])
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wbcommission', '0011_commissionrole_unique_commission_role'),
+        ('wbcrm', '0020_alter_product_unique_together_product_unique_product'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='commission',
+            name='root_account',
+            field=models.ForeignKey(blank=True, null=True,on_delete=django.db.models.deletion.CASCADE, related_name='root_account_commissions', to='wbcrm.account', verbose_name='Root Account'),
+            preserve_default=False,
+        ),
+        migrations.RunSQL(sql="SET CONSTRAINTS ALL IMMEDIATE;"),
+        migrations.RunPython(migrate_root_account),
+        migrations.RunSQL(sql="SET CONSTRAINTS ALL DEFERRED;"),
+        migrations.AlterField(
+            model_name='commission',
+            name='root_account',
+            field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE,
+                                    related_name='root_account_commissions', to='wbcrm.account',
+                                    verbose_name='Root Account'),
+            preserve_default=False,
+        ),
+    ]

{wbcommission-1.59.8 → wbcommission-1.61.0}/wbcommission/models/account_service.py

@@ -195,7 +195,7 @@ class AccountRebateManager:
                 )
         return Decimal(0)
 
-    def get_root_account_total_holding(self, compute_date: date) -> Decimal:
+    def get_terminal_accounts_total_holding(self, compute_date: date) -> dict[int, Decimal]:
         """
         Calculate the total assets under management (AUM) for the root account.
 
@@ -206,14 +206,16 @@ class AccountRebateManager:
             compute_date (date): The date for which the total AUM is calculated.
 
         Returns:
-            Decimal: The total assets under management for the root account on the given date.
+            dict: The total assets under management for each account on the given date.
 
         Raises:
             KeyError: If no AUM data is available for any terminal account on the given date,
                       a KeyError will be caught, and the function will return Decimal(0).
         """
-        account_aum = Decimal(0)
+        res = {}
         for terminal_account in self.terminal_accounts:
             with suppress(KeyError):
-                account_aum += Decimal(self.df_aum.loc[(terminal_account.id, slice(None), compute_date)].sum())
-        return account_aum
+                res[terminal_account.id] = Decimal(
+                    self.df_aum.loc[(terminal_account.id, slice(None), compute_date)].sum()
+                )
+        return res

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

@@ -86,7 +86,7 @@ class CommissionType(WBModel):
         terminal_account: "Account",
         compute_date: date,
         content_object: models.Model,
-        root_account_total_holding: Decimal,
+        terminal_accounts_total_holding: dict[int, Decimal],
     ) -> Generator[tuple["Commission", Decimal], None, None]:
         """
         Retrieve valid commissions for the given terminal account and parameters.
@@ -99,20 +99,25 @@ class CommissionType(WBModel):
             terminal_account (Account): The terminal account for which to retrieve valid commissions.
             compute_date (date): The date for which to compute the rebates.
             content_object (models.Model): The content object for which to compute rebates.
-            root_account_total_holding (Decimal): The total holding of the root account.
+            terminal_accounts_total_holding (dict): The total holding for each terminal account of the root account.
 
         Yields:
             tuple: A tuple containing a valid Commission instance and its corresponding actual percentage.
         """
 
-        applicable_commissions = Commission.objects.filter(
-            account__in=terminal_account.get_ancestors(include_self=True).filter(is_active=True), commission_type=self
-        ).order_by("order")
         available_percent = Decimal(1)
-        for order in applicable_commissions.values("order").distinct("order"):
-            # in case there is duplicates, we get the lower commissison in the account tree
-            commission = applicable_commissions.filter(order=order["order"]).order_by("-account__level").first()
-            if commission.is_valid(compute_date, content_object, root_account_total_holding):
+        # for hiearchical account structure, we prioritize the immidiate parent account (i.e. self)
+        for commission in Commission.objects.filter(
+            root_account=terminal_account.get_root(), commission_type=self, account__is_active=True
+        ).order_by("order"):
+            account_holding = sum(
+                [
+                    terminal_accounts_total_holding.get(account.id, Decimal("0"))
+                    for account in commission.account.get_descendants(include_self=True)
+                ]
+            )
+            commission.commission_account_holding = account_holding
+            if commission.is_valid(compute_date, content_object, account_holding):
                 actual_percent = (
                     available_percent * commission.validated_percent
                     if commission.validated_net_commission
@@ -125,7 +130,7 @@ class CommissionType(WBModel):
 
     def compute_rebates(
         self, root_account: "Account", verbose: bool = False, **iterator_kwargs
-    ) -> Generator[tuple["Account", date, "Commission", models.Model, "Entry", Decimal], None, None]:
+    ) -> Generator[tuple["Account", date, "Commission", models.Model, "Entry", Decimal, dict], None, None]:
         """
         Generate rebate information for terminal accounts based on given parameters.
 
@@ -162,7 +167,7 @@ class CommissionType(WBModel):
             iterator = tqdm(iterator, total=len(iterator))
 
         for terminal_account, content_object, compute_date in iterator:
-            root_account_total_holding = rebate_manager.get_root_account_total_holding(compute_date)
+            terminal_accounts_total_holding = rebate_manager.get_terminal_accounts_total_holding(compute_date)
             terminal_account_holding_ratio = rebate_manager.get_terminal_account_holding_ratio(
                 terminal_account,
                 content_object,
@@ -172,7 +177,7 @@ class CommissionType(WBModel):
             # Calculate rebates for the current terminal account
             if terminal_account_holding_ratio:
                 for commission, actual_percent in self.get_valid_commissions(
-                    terminal_account, compute_date, content_object, root_account_total_holding
+                    terminal_account, compute_date, content_object, terminal_accounts_total_holding
                 ):
                     # total commission pool for the given object that day
                     commission_pool = rebate_manager.get_commission_pool(content_object, compute_date)
@@ -210,7 +215,7 @@ class CommissionType(WBModel):
                             rebate_gain,
                             {
                                 "terminal_account_holding_ratio": terminal_account_holding_ratio,
-                                "root_account_total_holding": root_account_total_holding,
+                                "commission_account_holding": getattr(commission, "commission_account_holding", None),
                                 "commission_percent": actual_percent,
                                 "commission_pool": commission_pool,
                                 "recipient_percent": recipient_percent,
@@ -247,6 +252,13 @@ class Commission(OrderedModel, WBModel):
         on_delete=models.CASCADE,
         verbose_name="Account",
     )
+    root_account = models.ForeignKey[Account](
+        to="wbcrm.Account",
+        related_name="root_account_commissions",
+        on_delete=models.CASCADE,
+        verbose_name="Root Account",
+    )  # we store the root account in order to allow reordering on root account as well as type
+
     crm_recipient = models.ForeignKey[Entry](
         to="directory.Entry",
         related_name="recipient_commissions",
@@ -287,6 +299,7 @@ class Commission(OrderedModel, WBModel):
         verbose_name="Account Role to decide with exclusion rule applies",
     )
     objects = CommissionManager()
+    order_with_respect_to = ("commission_type", "root_account")
 
     if TYPE_CHECKING:
         rules = RelatedManager["CommissionRule"]()
@@ -333,8 +346,7 @@ class Commission(OrderedModel, WBModel):
             ),
         ]
 
-    @property
-    def recipient_repr(self) -> str:
+    def get_recipient_repr(self) -> str:
         if self.crm_recipient:
             return f"Profile {self.crm_recipient.computed_str}"
         elif self.portfolio_role_recipient:
@@ -342,11 +354,15 @@ class Commission(OrderedModel, WBModel):
         else:
             return f"Account Role Type: {self.account_role_type_recipient.title}"
 
+    def save(self, *args, **kwargs):
+        self.root_account = self.account.get_root()
+        super().save(*args, **kwargs)
+
     def __str__(self) -> str:
         return repr(self)
 
     def __repr__(self) -> str:
-        return f"Net: {self.net_commission} - {self.account.title} - {self.order} - {self.commission_type} - {self.recipient_repr} (id: {self.id})"
+        return f"Net: {self.net_commission} - {self.account.title} - {self.order} - {self.commission_type} - {self.get_recipient_repr()} (id: {self.id})"
 
     @property
     def validated_percent(self) -> Decimal:
@@ -606,6 +622,7 @@ class CommissionRole(ComplexToStringMixin, WBModel):
     class Meta:
         verbose_name = "Commission Role"
         verbose_name_plural = "Commission Roles"
+        constraints = [models.UniqueConstraint(fields=["person", "commission"], name="unique_commission_role")]
 
     def compute_str(self) -> str:
         return f"{self.person} -> {self.commission}"
@@ -631,6 +648,16 @@ class CommissionRole(ComplexToStringMixin, WBModel):
         return "id"
 
 
+@receiver(pre_merge, sender="directory.Person")
+def pre_merge_person_commisionrole(sender: models.Model, merged_object, main_object, **kwargs):
+    for role in CommissionRole.objects.filter(person=merged_object):
+        if CommissionRole.objects.filter(person=main_object, commission=role.commission).exists():
+            role.delete()
+        else:
+            role.person = main_object
+            role.save()
+
+
 @receiver(post_save, sender="wbcommission.Commission")
 def post_commission_creation(sender, instance, created, **kwargs):
     # if a new commission line is created, we create a general rule

{wbcommission-1.59.8 → wbcommission-1.61.0}/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.utils.models import MergeError
 from wbcore.workers import Queue
 from wbcrm.models.accounts import Account
 
@@ -155,7 +156,11 @@ class Rebate(BookingEntryCalculatedValueMixin, models.Model):
     class Meta:
         verbose_name = "Rebate"
         verbose_name_plural = "Rebates"
-        unique_together = ("date", "recipient", "account", "product", "commission_type")
+        constraints = (
+            models.UniqueConstraint(
+                name="unique_rebate", fields=("date", "recipient", "account", "product", "commission_type")
+            ),
+        )
         indexes = [models.Index(fields=["commission_type", "date", "recipient", "product", "account"])]
         notification_types = [
             create_notification_type(
@@ -315,3 +320,28 @@ def handle_pre_merge_account_for_rebate(sender: models.Model, merged_object: Acc
         except Rebate.DoesNotExist:
             rebate.account = main_object
             rebate.save()
+
+
+@receiver(pre_merge, sender="directory.Entry")
+def pre_merge_entry_rebate(sender: models.Model, merged_object, main_object, **kwargs):
+    for commission in Commission.objects.filter(crm_recipient=merged_object):
+        if Commission.objects.filter(crm_recipient=main_object, account=commission.account).exists():
+            raise MergeError(f"Commission already exists for {main_object} and the account {commission.account}")
+        else:
+            commission.crm_recipient = main_object
+            commission.save()
+
+    for rebate in Rebate.objects.filter(recipient=merged_object):
+        if Rebate.objects.filter(
+            date=rebate.date,
+            recipient=main_object,
+            account=rebate.account,
+            product=rebate.product,
+            commission_type=rebate.commission_type,
+        ).exists():
+            raise MergeError(
+                f"Rebate already exists for {main_object} and the account {rebate.account}, we cannot safely handle this automatically."
+            )
+        else:
+            rebate.recipient = main_object
+            rebate.save()

{wbcommission-1.59.8 → wbcommission-1.61.0}/wbcommission/serializers/__init__.py

@@ -1,3 +1,3 @@
 from .rebate import RebateModelSerializer, RebateProductMarginalitySerializer
-from .commissions import CommissionTypeRepresentationSerializer, CommissionTypeModelSerializer
+from .commissions import CommissionTypeRepresentationSerializer, CommissionTypeModelSerializer, CommissionModelSerializer, CommissionRepresentationSerializer
 from .signals import *