wbcommission 1.52.6__py2.py3-none-any.whl → 1.58.1__py2.py3-none-any.whl

wbcommission/filters/rebate.py

@@ -13,7 +13,6 @@ from wbcommission.models.rebate import RebateGroupbyChoice
 
 class RebateDateFilter(CommissionBaseFilterSet):
     date = wb_filters.DateRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Date Range",
         required=True,
         clearable=False,
@@ -98,7 +97,6 @@ class CustomerRebateGroupByFilter(RebateGroupByFilter):
 class RebateMarginalityFilter(PandasFilterSetMixin, wb_filters.FilterSet):
     date = wb_filters.DateRangeFilter(
         label="Date Range",
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         required=True,
         clearable=False,
         initial=current_quarter_date_range,

wbcommission/models/account_service.py

@@ -182,7 +182,9 @@ class AccountRebateManager:
                       and date, a KeyError will be caught, and the function will return Decimal(0).
         """
         with suppress(InstrumentPrice.DoesNotExist, KeyError):
-            product_shares = max(product.prices.get(date=compute_date, calculated=True).outstanding_shares, Decimal(0))
+            product_shares = max(
+                product.prices.get(date=compute_date, calculated=True).outstanding_shares or Decimal(0), Decimal(0)
+            )
             account_shares = max(
                 Decimal(self.df_shares.loc[(terminal_account.id, product.id, compute_date)]), Decimal(0)
             )

wbcommission/models/commission.py

@@ -551,6 +551,9 @@ class CommissionExclusionRule(models.Model):
             ),
         ]
 
+    def __str__(self) -> str:
+        return super().__str__()
+
 
 class CommissionRule(ComplexToStringMixin, WBModel):
     id: Optional[int]

wbcommission/permissions.py

@@ -1,6 +1,6 @@
-from rest_framework.permissions import BasePermission
+from rest_framework.permissions import IsAuthenticated
 
 
-class IsCommissionAdmin(BasePermission):
+class IsCommissionAdmin(IsAuthenticated):
     def has_permission(self, request, view):
         return request.user.has_perm("wbcommission.administrate_commission")

wbcommission/reports/customer_report.py

@@ -218,7 +218,7 @@ def create_report(user, customer, start_date, end_date):
         worksheet_trade_performance.write_string(bank_cell, claim.bank, base_format)
         worksheet_trade_performance.write_string(root_account_cell, claim.account.get_root().title, base_format)
         worksheet_trade_performance.write_string(account_cell, str(claim.account), base_format)
-        worksheet_trade_performance.write_string(product_cell, claim.product.title, base_format)
+        worksheet_trade_performance.write_string(product_cell, claim.product.name, base_format)
 
         worksheet_trade_performance.write_number(
             price_trade_cell, claim.price_date or claim.product.share_price, decimal_format

wbcommission/tests/models/test_commission.py

@@ -478,10 +478,10 @@ class TestCommissionType:
         res = dict()
         for commission_type in CommissionType.objects.all():
             for (
-                terminal_account,
-                compute_date,
-                commission,
-                product,
+                _,
+                _,
+                _,
+                _,
                 recipient,
                 recipient_fees,
                 _,

{wbcommission-1.52.6.dist-info → wbcommission-1.58.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcommission
-Version: 1.52.6
+Version: 1.58.1
 Summary: A workbench module for managing human resources.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: reportlab==3.*
@@ -8,4 +8,7 @@ Requires-Dist: wbcompliance
 Requires-Dist: wbcore
 Requires-Dist: wbcrm
 Requires-Dist: wbfdm
+Requires-Dist: wbmailing
 Requires-Dist: wbnews
+Requires-Dist: wbportfolio
+Requires-Dist: wbreport

{wbcommission-1.52.6.dist-info → wbcommission-1.58.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 wbcommission/__init__.py,sha256=J-j-u0itpEFT6irdmWmixQqYMadNl1X91TxUmoiLHMI,22
 wbcommission/apps.py,sha256=3q9lAeEBfv83rCzud3P0-VZgbWUfG0S61G5h3zFk1Ds,97
 wbcommission/dynamic_preferences_registry.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbcommission/permissions.py,sha256=Qjmterwqsm1st8YZNfj_7-Gl6WnvVvkE6SCgYynMhSU,219
+wbcommission/permissions.py,sha256=Iz_q9QHWCXTJVisRBab4R9oXNX8ca3xVT12vdyYRMXQ,221
 wbcommission/urls.py,sha256=L4TKTeSxsHfoc091TVX2B2-w7kgNolaZ-xlgm5O51lQ,1102
 wbcommission/admin/__init__.py,sha256=xEYZYO9IUSNExPsY7jsxFS-Jjkl92tXnb7eSfwGpkZg,151
 wbcommission/admin/accounts.py,sha256=M43ovnEH9XYBmXLzA10LmbKkn4uq62HYNIauaoThno4,816
@@ -13,7 +13,7 @@ wbcommission/factories/__init__.py,sha256=3EdqwSHMqJIa5C_yH15M75u_frkLEno151aFox
 wbcommission/factories/commission.py,sha256=omIpgTsXAa4bmVZ1349luhAuTEOzeurSpL6IHpl2VgU,3021
 wbcommission/factories/rebate.py,sha256=JzbHV7stofk1F3aaQPEV3rEBc_0uwphpG_hea144utc,683
 wbcommission/filters/__init__.py,sha256=9XoFMsmHcdTqy7ujQFlxvAJFvZoc4hjZ1SR6pyY8-9k,156
-wbcommission/filters/rebate.py,sha256=lHYhl7x4xxJuDlY7hn5RLuP4vecs24MYHGcpripoAzo,8296
+wbcommission/filters/rebate.py,sha256=OOXw2pC2grsscoLs_jIlGMtlSUAHFUWPSnSXQW2Ffj8,8150
 wbcommission/filters/signals.py,sha256=J-a9F3IwWhgl7HZE9I2Z6PA6H7fKDnMrhtSQZ4wqhGU,1583
 wbcommission/generators/__init__.py,sha256=Pt8TjtYCmqhROvWNmf_dxuONKVcrj7SH14nJAcv7_1Q,47
 wbcommission/generators/rebate_generator.py,sha256=O31NGIDUtwONGPOUD3YVCMywN3cSqa5vlmlYWjD7ItE,4155
@@ -33,13 +33,13 @@ wbcommission/migrations/0007_remove_commission_unique_crm_recipient_account_and_
 wbcommission/migrations/0008_alter_commission_options_alter_commission_order.py,sha256=iNwNF1QcmVoj5Eu2yPJEHfI7bIA3e4WZMILjCfBVEx0,830
 wbcommission/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcommission/models/__init__.py,sha256=BJyah0_zKssfU2ohvu4qcQSHAT1ovcZ_go2-sLEagyw,183
-wbcommission/models/account_service.py,sha256=gvnxv_TUfeoBjOKeUBu1MectwpsA54syIkQrhYFzQyA,10616
-wbcommission/models/commission.py,sha256=5Hp2EbmPo9H7L2lM7K8eVOhmZPmEYC6avOQSR_y3U18,29899
+wbcommission/models/account_service.py,sha256=7tUxB8DmqGBPxfu0wCHApSKj6AkmWnHc9JB1rUxe3kk,10660
+wbcommission/models/commission.py,sha256=oSDS5P_5KB9N6fk_xYBBWO1lL3nf44fjVWaDjNN8nRw,29963
 wbcommission/models/rebate.py,sha256=GtR3G5TqmDdlcefF678Z9D993glddAormoWnYzYzQLg,12795
 wbcommission/models/signals.py,sha256=RplhwccwDlEYGfw-lpcXpHPxfmeyKohdz-rKGll-NtU,2240
 wbcommission/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcommission/reports/audit_report.py,sha256=uzzTqYbvfen3AgXHM3mF77R_vDU3o02AVrjNwFXXH0k,2178
-wbcommission/reports/customer_report.py,sha256=S6mdVA4FTU4amyvV1xjKLsBr_PlG1GDUHDRm75V5WP0,14246
+wbcommission/reports/customer_report.py,sha256=1RTF4H5tsbEQTEgM7wEmEC8HU10UKD8ZInwFsh0rI7w,14245
 wbcommission/reports/utils.py,sha256=Twc1SOwRIkB-_RJHFO1-tJaQ3ocCjFz0GsUXZPMZ3i8,1078
 wbcommission/serializers/__init__.py,sha256=t38bchJeNgOcogmedHLfLBQBtRXuR-_hj0US_55Fug4,196
 wbcommission/serializers/commissions.py,sha256=584tQjU3JEhkANxfLBmTyKsSe64JObFFqsoF7bP8jXM,678
@@ -54,7 +54,7 @@ wbcommission/tests/analytics/test_marginality.py,sha256=1a2b8PEV0kLlL8NSwPnDs0DE
 wbcommission/tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcommission/tests/models/mixins.py,sha256=gnsd0GCCdWcR8EYSh9ff-gY1l6dLPeU-LQYynngj9nw,818
 wbcommission/tests/models/test_account_service.py,sha256=_S2qWSJQB2WyF7v1HWrpdMMHEBvuHJA5CHz3GZEto68,13247
-wbcommission/tests/models/test_commission.py,sha256=dzITyJVMu3d5qLc475Sw8AYpbKjq1MMDhFoUFjYdH4Q,27961
+wbcommission/tests/models/test_commission.py,sha256=EqgJtYVi51ue49l-F5bbIQanG_P2FRnAR-eAbY-EJE0,27920
 wbcommission/tests/models/test_rebate.py,sha256=wnq4fJkcTj2PTrwW3He65kRqGE0F2C-vYwafcjVSqVg,5671
 wbcommission/tests/viewsets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcommission/tests/viewsets/test_rebate.py,sha256=TM_-E1PGFui8JBQpeFLdDdVPyqz5FSn-cnoPHq1JzEQ,3262
@@ -77,6 +77,6 @@ wbcommission/viewsets/menu/rebate.py,sha256=Qzhwr2xG3_j7frxs3eWLZuMoUzT2nCBrWmEY
 wbcommission/viewsets/titles/__init__.py,sha256=Sg64aMWm_OD4-P57YoaN6Mqv6NRVU5m7ii_WvaWuTsY,85
 wbcommission/viewsets/titles/commissions.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcommission/viewsets/titles/rebate.py,sha256=VTSHJW3voqCMVhDZ_zVeVmZid_WY3P4X9k11VdJM_GQ,301
-wbcommission-1.52.6.dist-info/METADATA,sha256=zKx8OUV28reTEZtDCfi97jCH0BV0jio5fsjBPUd6tn4,323
-wbcommission-1.52.6.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbcommission-1.52.6.dist-info/RECORD,,
+wbcommission-1.58.1.dist-info/METADATA,sha256=WWnK3lJGCJQe6C2868uY2jDuilDei1mOfDn_nPCXYOE,399
+wbcommission-1.58.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbcommission-1.58.1.dist-info/RECORD,,