wbcommission 1.44.5__tar.gz → 1.45.0__tar.gz

{wbcommission-1.44.5 → wbcommission-1.45.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcommission
-Version: 1.44.5
+Version: 1.45.0
 Summary: A workbench module for managing human resources.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: reportlab==3.*

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/admin/accounts.py

@@ -1,8 +1,9 @@
 from django.contrib import admin
-from wbcommission.models.rebate import manage_rebate_as_task
 from wbcrm.admin.accounts import AccountModelAdmin as BaseAccountModelAdmin
 from wbcrm.models.accounts import Account
 
+from wbcommission.models.rebate import manage_rebate_as_task
+
 from .commission import CommissionTabularInline
 
 admin.site.unregister(Account)

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/admin/commission.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from wbcommission.models import (
     Commission,
     CommissionExclusionRule,

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/analytics/marginality.py

@@ -5,11 +5,12 @@ import numpy as np
 import pandas as pd
 from django.db.models import Case, OuterRef, Subquery, Value, When
 from django.db.models.functions import Coalesce
-from wbcommission.models import CommissionType, Rebate
 from wbcore.contrib.currency.models import CurrencyFXRates
 from wbfdm.models import InstrumentPrice
 from wbportfolio.models import Fees
 
+from wbcommission.models import CommissionType, Rebate
+
 
 class MarginalityCalculator:
     FEE_MAP = {

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/factories/commission.py

@@ -2,13 +2,14 @@ from datetime import date
 
 import factory
 from psycopg.types.range import DateRange
+from wbportfolio.models.roles import PortfolioRole
+
 from wbcommission.models.commission import (
     Commission,
     CommissionExclusionRule,
     CommissionRole,
     CommissionType,
 )
-from wbportfolio.models.roles import PortfolioRole
 
 
 class CommissionTypeFactory(factory.django.DjangoModelFactory):

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/factories/rebate.py

@@ -1,4 +1,5 @@
 import factory
+
 from wbcommission.models import Rebate
 
 

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/filters/rebate.py

@@ -1,5 +1,3 @@
-from wbcommission.models import Rebate
-from wbcommission.models.rebate import RebateGroupbyChoice
 from wbcore import filters as wb_filters
 from wbcore.contrib.directory.models import Company
 from wbcore.filters.defaults import current_quarter_date_range
@@ -9,6 +7,9 @@ from wbfdm.preferences import get_default_classification_group
 from wbportfolio.filters.transactions.claim import CommissionBaseFilterSet
 from wbportfolio.models import Product
 
+from wbcommission.models import Rebate
+from wbcommission.models.rebate import RebateGroupbyChoice
+
 
 class RebateDateFilter(CommissionBaseFilterSet):
     date = wb_filters.DateRangeFilter(

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/generators/rebate_generator.py

@@ -7,10 +7,11 @@ from typing import Iterable
 from django.db.models import QuerySet, Sum
 from wbaccounting.generators.base import AbstractBookingEntryGenerator
 from wbaccounting.models import BookingEntry
-from wbcommission.models import Rebate
 from wbcore.contrib.directory.models import Entry
 from wbportfolio.models import Product
 
+from wbcommission.models import Rebate
+
 
 class RebateGenerator(AbstractBookingEntryGenerator):
     TITLE = "Rebate Generation"

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/reports/audit_report.py

@@ -3,12 +3,13 @@ from io import BytesIO
 
 import pandas as pd
 from celery import shared_task
-from wbcommission.models import Commission, CommissionType, Rebate
 from wbcore.contrib.authentication.models import User
 from wbcore.contrib.directory.models import Entry
 from wbcrm.models.accounts import Account
 from wbportfolio.models.products import Product
 
+from wbcommission.models import Commission, CommissionType, Rebate
+
 from .utils import create_report_and_send
 
 

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/reports/customer_report.py

@@ -5,7 +5,6 @@ from io import BytesIO
 import xlsxwriter
 from celery import shared_task
 from django.db.models import Case, F, Sum, When
-from wbcommission.models import CommissionType, Rebate
 from wbcore.contrib.authentication.models import User
 from wbcore.contrib.currency.models import CurrencyFXRates
 from wbcore.contrib.directory.models import Entry
@@ -19,6 +18,8 @@ from wbfdm.models import InstrumentPrice
 from wbportfolio.models.transactions.claim import Claim
 from xlsxwriter.utility import xl_rowcol_to_cell
 
+from wbcommission.models import CommissionType, Rebate
+
 from .utils import create_report_and_send
 
 AccountCustomer = None

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/serializers/commissions.py

@@ -1,6 +1,7 @@
-from wbcommission.models import CommissionType
 from wbcore import serializers as wb_serializers
 
+from wbcommission.models import CommissionType
+
 
 class CommissionTypeRepresentationSerializer(wb_serializers.RepresentationSerializer):
     _detail = wb_serializers.HyperlinkField(reverse_name="wbcommission:commissiontype-detail")

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/serializers/rebate.py

@@ -1,6 +1,7 @@
-from wbcommission.models import Rebate
 from wbcore import serializers as wb_serializers
 
+from wbcommission.models import Rebate
+
 
 class RebateModelSerializer(wb_serializers.ModelSerializer):
     id = wb_serializers.PrimaryKeyField()

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/tests/analytics/test_marginality.py

@@ -3,11 +3,12 @@ from faker import Faker
 from pandas.tseries.offsets import BDay
 from rest_framework.reverse import reverse
 from rest_framework.test import APIClient, APIRequestFactory
+from wbportfolio.factories import FeesFactory, InstrumentPriceFactory, ProductFactory
+from wbportfolio.models import Product
+
 from wbcommission.analytics.marginality import MarginalityCalculator
 from wbcommission.factories import CommissionTypeFactory, RebateFactory
 from wbcommission.viewsets.rebate import RebateProductMarginalityViewSet
-from wbportfolio.factories import FeesFactory, InstrumentPriceFactory, ProductFactory
-from wbportfolio.models import Product
 
 fake = Faker()
 

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/tests/models/mixins.py

@@ -1,7 +1,8 @@
 import pytest
+from wbcrm.factories import AccountFactory
+
 from wbcommission.factories import CommissionTypeFactory
 from wbcommission.models.account_service import AccountRebateManager
-from wbcrm.factories import AccountFactory
 
 
 class AccountManagerFixture:

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/tests/models/test_account_service.py

@@ -4,9 +4,10 @@ from decimal import Decimal
 import pytest
 from faker import Faker
 from pandas.tseries.offsets import BDay
-from wbcommission.models.account_service import AccountRebateManager
 from wbportfolio.models import Claim
 
+from wbcommission.models.account_service import AccountRebateManager
+
 from .mixins import AccountManagerFixture
 
 fake = Faker()

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/tests/models/test_commission.py

@@ -7,10 +7,11 @@ from django.contrib.auth.models import Permission
 from faker import Faker
 from pandas.tseries.offsets import BDay
 from psycopg.types.range import DateRange, NumericRange
-from wbcommission.models import Commission, CommissionRule, CommissionType
 from wbportfolio.models import Claim, Trade
 from wbportfolio.models.roles import PortfolioRole
 
+from wbcommission.models import Commission, CommissionRule, CommissionType
+
 fake = Faker()
 
 

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/tests/models/test_rebate.py

@@ -4,6 +4,7 @@ import pytest
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
 from faker import Faker
+
 from wbcommission.models import CommissionType, Rebate
 
 from .mixins import AccountManagerFixture

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/tests/test_permissions.py

@@ -3,11 +3,12 @@ from django.contrib.auth.models import Permission
 from faker import Faker
 from rest_framework.reverse import reverse
 from rest_framework.test import APIClient
-from wbcommission.permissions import IsCommissionAdmin
 from wbcore.contrib.authentication.factories import UserFactory
 from wbcore.contrib.authentication.models import User
 from wbcore.tests.test_permissions.test_backend import create_internal_user
 
+from wbcommission.permissions import IsCommissionAdmin
+
 fake = Faker()
 
 

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/tests/viewsets/test_rebate.py

@@ -2,6 +2,11 @@ import pytest
 from django.db.models import Sum
 from faker import Faker
 from rest_framework.test import APIRequestFactory
+from wbcore.contrib.authentication.factories.users import UserFactory
+from wbcore.contrib.directory.models import Entry
+from wbcore.utils.strings import format_number
+from wbcrm.factories.accounts import AccountFactory, AccountRoleFactory
+
 from wbcommission.factories import (
     AccountTypeRoleCommissionFactory,
     CommissionFactory,
@@ -9,10 +14,6 @@ from wbcommission.factories import (
 )
 from wbcommission.models.rebate import Rebate
 from wbcommission.viewsets.rebate import RebateModelViewSet, RebatePandasView
-from wbcore.contrib.authentication.factories.users import UserFactory
-from wbcore.contrib.directory.models import Entry
-from wbcore.utils.strings import format_number
-from wbcrm.factories.accounts import AccountFactory, AccountRoleFactory
 
 fake = Faker()
 

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/urls.py

@@ -1,8 +1,9 @@
 from django.apps import apps
 from django.urls import include, path
-from wbcommission import viewsets
 from wbcore.routers import WBCoreRouter
 
+from wbcommission import viewsets
+
 router = WBCoreRouter()
 
 router.register(

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/viewsets/commissions.py

@@ -1,6 +1,7 @@
-from wbcommission.models import CommissionType
 from wbcore import viewsets
 
+from wbcommission.models import CommissionType
+
 from ..serializers import (
     CommissionTypeModelSerializer,
     CommissionTypeRepresentationSerializer,

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/viewsets/mixins.py

@@ -2,6 +2,7 @@ from datetime import date, datetime
 
 from django.http import HttpRequest
 from django.utils.functional import cached_property
+
 from wbcommission.models import Commission, Rebate
 
 

{wbcommission-1.44.5 → wbcommission-1.45.0}/wbcommission/viewsets/rebate.py

@@ -12,6 +12,21 @@ from django.utils.functional import cached_property
 from rest_framework import status
 from rest_framework.decorators import action
 from rest_framework.response import Response
+from wbcore import serializers as wb_serializers
+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.permissions.permissions import IsInternalUser
+from wbcore.serializers import decorator
+from wbcore.utils.date import get_date_interval_from_request
+from wbcore.utils.strings import format_number
+from wbcrm.models.accounts import Account
+from wbfdm.models import Classification, ClassificationGroup, InstrumentPrice
+from wbfdm.preferences import get_default_classification_group
+from wbportfolio.models import Product
+
 from wbcommission.filters import (
     CustomerRebateGroupByFilter,
     RebateDateFilter,
@@ -36,20 +51,6 @@ from wbcommission.viewsets.titles.rebate import (
     RebatePandasViewTitleConfig,
     RebateProductMarginalityTitleConfig,
 )
-from wbcore import serializers as wb_serializers
-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.permissions.permissions import IsInternalUser
-from wbcore.serializers import decorator
-from wbcore.utils.date import get_date_interval_from_request
-from wbcore.utils.strings import format_number
-from wbcrm.models.accounts import Account
-from wbfdm.models import Classification, ClassificationGroup, InstrumentPrice
-from wbfdm.preferences import get_default_classification_group
-from wbportfolio.models import Product
 
 from ..analytics.marginality import MarginalityCalculator
 from ..permissions import IsCommissionAdmin
@@ -233,8 +234,7 @@ class RebatePandasView(RebatePermissionMixin, ExportPandasAPIViewSet):
             return {}
         return {
             **{
-                "rebate_"
-                + commission_type.key: {
+                "rebate_" + commission_type.key: {
                     "Σ": format_number(df["rebate_" + commission_type.key].sum()),
                 }
                 for commission_type in CommissionType.objects.all()