wbportfolio 1.54.22__py2.py3-none-any.whl → 1.55.0__py2.py3-none-any.whl

wbportfolio/viewsets/configs/display/products.py

@@ -124,7 +124,7 @@ class ProductDisplayConfig(DisplayViewConfig):
         return create_simple_display(
             [
                 [repeat_field(2, "name"), repeat_field(2, "name_repr")],
-                ["inception_date", "isin", "ticker", "id_repr"],
+                ["inception_date", "delisted_date", "isin", "id_repr"],
                 ["share_price", "issue_price", "initial_high_water_mark", "currency"],
                 [repeat_field(2, "bank"), repeat_field(2, "parent")],
                 [repeat_field(4, "tags")],

wbportfolio/viewsets/configs/display/rebalancing.py

@@ -11,7 +11,7 @@ class RebalancerDisplayConfig(DisplayViewConfig):
             fields=[
                 dp.Field(key="portfolio", label="Portfolio"),
                 dp.Field(key="rebalancing_model", label="Rebalancing Model"),
-                dp.Field(key="approve_order_proposal_automatically", label="Approve automatically"),
+                dp.Field(key="apply_order_proposal_automatically", label="Approve automatically"),
                 dp.Field(key="frequency_repr", label="Frequency"),
                 dp.Field(key="activation_date", label="Activation Date"),
             ],
@@ -20,7 +20,7 @@ class RebalancerDisplayConfig(DisplayViewConfig):
     def get_instance_display(self) -> Display:
         return create_simple_display(
             [
-                ["rebalancing_model", "approve_order_proposal_automatically"],
+                ["rebalancing_model", "apply_order_proposal_automatically"],
                 ["frequency", "activation_date"],
                 ["rebalancing_dates", "rebalancing_dates"],
             ]

wbportfolio/viewsets/configs/menu/__init__.py

@@ -27,3 +27,4 @@ from .roles import PORTFOLIOROLE_MENUITEM
 from .trades import SUBSCRIPTION_REDEMPTION_MENUITEM, TRADE_MENUITEM
 from .portfolio_cash_flow import PORTFOLIO_DAILY_CASH_FLOW
 from .reconciliations import ACCOUNT_RECONCILIATION_MENU_ITEM
+from .orders import OrderProposalMenuItem

wbportfolio/viewsets/configs/menu/orders.py

@@ -0,0 +1,11 @@
+from wbcore.menus import ItemPermission, MenuItem
+from wbcore.permissions.shortcuts import is_internal_user
+
+OrderProposalMenuItem = MenuItem(
+    label="Order Proposals",
+    endpoint="wbportfolio:orderproposal-list",
+    endpoint_get_parameters={"waiting_for_input": True},
+    permission=ItemPermission(
+        permissions=["wbportfolio.view_orderproposal"], method=lambda request: is_internal_user(request.user)
+    ),
+)

wbportfolio/viewsets/orders/configs/buttons/order_proposals.py

@@ -1,3 +1,6 @@
+from contextlib import suppress
+
+from rest_framework.reverse import reverse
 from wbcore import serializers as wb_serializers
 from wbcore.contrib.icons import WBIcon
 from wbcore.enums import RequestType
@@ -5,14 +8,62 @@ from wbcore.metadata.configs import buttons as bt
 from wbcore.metadata.configs.buttons.view_config import ButtonViewConfig
 from wbcore.metadata.configs.display import create_simple_display
 
+from wbportfolio.models import OrderProposal, Portfolio
+from wbportfolio.serializers import PortfolioRepresentationSerializer
+
 
 class NormalizeSerializer(wb_serializers.Serializer):
     total_cash_weight = wb_serializers.FloatField(default=0, precision=4, percent=True)
 
 
+class ResetSerializer(wb_serializers.Serializer):
+    use_desired_target_weight = wb_serializers.BooleanField(
+        default=False,
+        label="Use initial target weight",
+        help_text="If True, the target weight used will be the value at the time the order proposal was submitted (as it may have changed due to previous modifications). If False, the delta weight will be set to 0 instead.",
+    )
+
+
 class OrderProposalButtonConfig(ButtonViewConfig):
     def get_custom_list_instance_buttons(self):
-        return {
+        buttons = []
+        with suppress(AttributeError, AssertionError):
+            order_proposal = self.view.get_object()
+            if order_proposal.status == OrderProposal.Status.APPLIED.value and order_proposal.portfolio.is_model:
+
+                class PushModelChangeSerializer(wb_serializers.Serializer):
+                    only_for_portfolio_ids = wb_serializers.PrimaryKeyRelatedField(
+                        label="Only for Portfolios", queryset=Portfolio.objects.all()
+                    )
+                    _only_for_portfolio_ids = PortfolioRepresentationSerializer(
+                        source="only_for_portfolio_ids",
+                        many=True,
+                        filter_params={"modeled_after": order_proposal.portfolio.id},
+                    )
+                    approve_automatically = wb_serializers.BooleanField(
+                        default=False,
+                        help_text="True if you want all created orders to be automatically move to the approve state.",
+                    )
+
+                buttons.append(
+                    bt.ActionButton(
+                        method=RequestType.PATCH,
+                        identifiers=("wbportfolio:orderproposal",),
+                        endpoint=reverse("wbportfolio:orderproposal-pushmodelchange", args=[order_proposal.id]),
+                        icon=WBIcon.BROADCAST.icon,
+                        label="Push Model Changes",
+                        description_fields=f"""
+                        Push this rebalancing to all portfolios that are modeled after {order_proposal.portfolio}
+                        """,
+                        action_label="Push Model Changes",
+                        title="Push Model Changes",
+                        serializer=PushModelChangeSerializer,
+                        instance_display=create_simple_display(
+                            [["only_for_portfolio_ids"], ["approve_automatically"]]
+                        ),
+                    )
+                )
+        buttons.append(
             bt.DropDownButton(
                 label="Tools",
                 buttons=(
@@ -23,8 +74,8 @@ class OrderProposalButtonConfig(ButtonViewConfig):
                         icon=WBIcon.SYNCHRONIZE.icon,
                         label="Replay Orders",
                         description_fields="""
-                        <p>Replay Orders. It will recompute all assets positions until next order proposal day (or today otherwise) </p>
-                        """,
+                            <p>Replay Orders. It will recompute all assets positions until next order proposal day (or today otherwise) </p>
+                            """,
                         action_label="Replay Order",
                         title="Replay Order",
                     ),
@@ -35,11 +86,13 @@ class OrderProposalButtonConfig(ButtonViewConfig):
                         icon=WBIcon.REGENERATE.icon,
                         label="Reset Orders",
                         description_fields="""
-                            <p><strong>Warning:</strong> This action will delete all current orders and recreate initial orders based on your last effective portfolio.</p>
-                            <p><strong>Note:</strong> All delta weights will be permanently removed. This operation cannot be undone.</p>
-                            """,
+                                <p><strong>Warning:</strong>This action will reset the order delta weight to either 0 or the difference between the previous weight and the locked target weight, depending on the user’s choice.</p>
+                                <p><strong>Note:</strong>This operation will change the current delta weights and cannot be undone</p>
+                                """,
                         action_label="Reset Orders",
                         title="Reset Orders",
+                        serializer=ResetSerializer,
+                        instance_display=create_simple_display([["use_desired_target_weight"]]),
                     ),
                     bt.ActionButton(
                         method=RequestType.PATCH,
@@ -48,8 +101,8 @@ class OrderProposalButtonConfig(ButtonViewConfig):
                         icon=WBIcon.EDIT.icon,
                         label="Normalize Orders",
                         description_fields="""
-                            <p>Make sure all orders normalize to a total target weight of (100 - {{total_cash_weight}})%</p>
-                            """,
+                                <p>Make sure all orders normalize to a total target weight of (100 - {{total_cash_weight}})%</p>
+                                """,
                         action_label="Normalize Orders",
                         title="Normalize Orders",
                         serializer=NormalizeSerializer,
@@ -62,14 +115,15 @@ class OrderProposalButtonConfig(ButtonViewConfig):
                         icon=WBIcon.DELETE.icon,
                         label="Delete All Orders",
                         description_fields="""
-                    <p>Delete all orders from this order proposal?</p>
-                    """,
+                        <p>Delete all orders from this order proposal?</p>
+                        """,
                         action_label="Delete All Orders",
                         title="Delete All Orders",
                     ),
                 ),
-            ),
-        }
+            )
+        )
+        return set(buttons)
 
     def get_custom_instance_buttons(self):
         return self.get_custom_list_instance_buttons()

wbportfolio/viewsets/orders/configs/displays/order_proposals.py

@@ -1,7 +1,9 @@
+from contextlib import suppress
 from typing import Optional
 
 from wbcore.contrib.color.enums import WBColor
 from wbcore.metadata.configs import display as dp
+from wbcore.metadata.configs.display import Section
 from wbcore.metadata.configs.display.instance_display import Inline, Layout, Page
 from wbcore.metadata.configs.display.instance_display.operators import default
 from wbcore.metadata.configs.display.instance_display.shortcuts import Display
@@ -14,9 +16,12 @@ class OrderProposalDisplayConfig(DisplayViewConfig):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
         return dp.ListDisplay(
             fields=[
+                dp.Field(key="portfolio", label="Portfolio") if "portfolio_id" not in self.view.kwargs else None,
                 dp.Field(key="trade_date", label="Order Date"),
                 dp.Field(key="rebalancing_model", label="Rebalancing Model"),
                 dp.Field(key="comment", label="Comment"),
+                dp.Field(key="creator", label="Creator"),
+                dp.Field(key="approver", label="Approver"),
             ],
             legends=[
                 dp.Legend(
@@ -29,8 +34,8 @@ class OrderProposalDisplayConfig(DisplayViewConfig):
                         ),
                         dp.LegendItem(
                             icon=WBColor.YELLOW_LIGHT.value,
-                            label=OrderProposal.Status.SUBMIT.label,
-                            value=OrderProposal.Status.SUBMIT.value,
+                            label=OrderProposal.Status.PENDING.label,
+                            value=OrderProposal.Status.PENDING.value,
                         ),
                         dp.LegendItem(
                             icon=WBColor.GREEN_LIGHT.value,
@@ -43,9 +48,14 @@ class OrderProposalDisplayConfig(DisplayViewConfig):
                             value=OrderProposal.Status.DENIED.value,
                         ),
                         dp.LegendItem(
-                            icon=WBColor.RED_DARK.value,
-                            label=OrderProposal.Status.FAILED.label,
-                            value=OrderProposal.Status.FAILED.value,
+                            icon=WBColor.GREEN.value,
+                            label=OrderProposal.Status.APPLIED.label,
+                            value=OrderProposal.Status.APPLIED.value,
+                        ),
+                        dp.LegendItem(
+                            icon=WBColor.GREY.value,
+                            label=OrderProposal.Status.EXECUTION.label,
+                            value=OrderProposal.Status.EXECUTION.value,
                         ),
                     ],
                 ),
@@ -60,12 +70,20 @@ class OrderProposalDisplayConfig(DisplayViewConfig):
                         ),
                         dp.FormattingRule(
                             style={"backgroundColor": WBColor.YELLOW_LIGHT.value},
-                            condition=("==", OrderProposal.Status.SUBMIT.value),
+                            condition=("==", OrderProposal.Status.PENDING.value),
                         ),
                         dp.FormattingRule(
                             style={"backgroundColor": WBColor.GREEN_LIGHT.value},
                             condition=("==", OrderProposal.Status.APPROVED.value),
                         ),
+                        dp.FormattingRule(
+                            style={"backgroundColor": WBColor.GREEN.value},
+                            condition=("==", OrderProposal.Status.APPLIED.value),
+                        ),
+                        dp.FormattingRule(
+                            style={"backgroundColor": WBColor.GREY.value},
+                            condition=("==", OrderProposal.Status.EXECUTION.value),
+                        ),
                         dp.FormattingRule(
                             style={"backgroundColor": WBColor.RED_LIGHT.value},
                             condition=("==", OrderProposal.Status.DENIED.value),
@@ -80,6 +98,33 @@ class OrderProposalDisplayConfig(DisplayViewConfig):
         )
 
     def get_instance_display(self) -> Display:
+        orders_grid_template_areas = [["orders"]]
+        orders_grid_template_rows = ["1fr"]
+        sections = []
+        with suppress(AttributeError, AssertionError):
+            op = self.view.get_object()
+            if op.execution_status:
+                orders_grid_template_areas = [["execution"], ["orders"]]
+                orders_grid_template_rows = ["100px", "1fr"]
+                sections.append(
+                    Section(
+                        key="execution",
+                        title="Execution",
+                        collapsed=False,
+                        display=Display(
+                            pages=[
+                                Page(
+                                    layouts={
+                                        default(): Layout(
+                                            grid_template_areas=[["execution_status_repr", "execution_comment"]],
+                                            grid_template_columns=["0.3fr", "0.7fr"],
+                                        )
+                                    }
+                                )
+                            ]
+                        ),
+                    )
+                )
         return Display(
             pages=[
                 Page(
@@ -91,7 +136,7 @@ class OrderProposalDisplayConfig(DisplayViewConfig):
                                 ["trade_date", "total_cash_weight", "min_order_value"],
                                 ["rebalancing_model", "target_portfolio", "target_portfolio"]
                                 if self.view.new_mode
-                                else ["rebalancing_model", "rebalancing_model", "rebalancing_model"],
+                                else ["rebalancing_model", "creator", "approver"],
                                 ["comment", "comment", "comment"],
                             ],
                         ),
@@ -101,9 +146,10 @@ class OrderProposalDisplayConfig(DisplayViewConfig):
                     title="Orders",
                     layouts={
                         default(): Layout(
-                            grid_template_areas=[["orders"]],
-                            grid_template_rows=["1fr"],
+                            grid_template_areas=orders_grid_template_areas,
+                            grid_template_rows=orders_grid_template_rows,
                             inlines=[Inline(key="orders", endpoint="orders")],
+                            sections=sections,
                         ),
                     },
                 ),

wbportfolio/viewsets/orders/configs/displays/orders.py

@@ -81,6 +81,7 @@ class OrderOrderProposalDisplayConfig(DisplayViewConfig):
                         key="underlying_instrument_refinitiv_identifier_code", label="RIC", width=Unit.PIXEL(100)
                     ),
                     dp.Field(key="underlying_instrument_instrument_type", label="Asset Class", width=Unit.PIXEL(125)),
+                    dp.Field(key="underlying_instrument_exchange", label="Exchange", width=Unit.PIXEL(125)),
                 ],
             ),
             dp.Field(
@@ -161,6 +162,18 @@ class OrderOrderProposalDisplayConfig(DisplayViewConfig):
                 ],
             )
         )
+        if order_proposal.execution_status:
+            fields.append(
+                dp.Field(
+                    label="Execution",
+                    open_by_default=True,
+                    key=None,
+                    children=[
+                        dp.Field(key="execution_confirmed", label="Confirmed", width=Unit.PIXEL(50)),
+                        dp.Field(key="execution_comment", label="Comment", width=Unit.PIXEL(100)),
+                    ],
+                )
+            )
         return dp.ListDisplay(
             fields=fields,
             legends=[ORDER_STATUS_LEGENDS],

wbportfolio/viewsets/orders/order_proposals.py

@@ -21,6 +21,7 @@ from wbcore.utils.views import CloneMixin
 
 from wbportfolio.models import AssetPosition, OrderProposal
 from wbportfolio.models.orders.order_proposals import (
+    push_model_change_as_task,
     replay_as_task,
 )
 from wbportfolio.serializers import (
@@ -29,6 +30,8 @@ from wbportfolio.serializers import (
     ReadOnlyOrderProposalModelSerializer,
 )
 
+from ...filters.orders import OrderProposalFilterSet
+from ...order_routing import ExecutionStatus
 from ..mixins import UserPortfolioRequestPermissionMixin
 from .configs import (
     OrderProposalButtonConfig,
@@ -52,6 +55,7 @@ class OrderProposalModelViewSet(CloneMixin, RiskCheckViewSetMixin, InternalUserP
 
     queryset = OrderProposal.objects.select_related("rebalancing_model", "portfolio")
     serializer_class = OrderProposalModelSerializer
+    filterset_class = OrderProposalFilterSet
     display_config_class = OrderProposalDisplayConfig
     button_config_class = OrderProposalButtonConfig
     endpoint_config_class = OrderProposalEndpointConfig
@@ -81,14 +85,29 @@ class OrderProposalModelViewSet(CloneMixin, RiskCheckViewSetMixin, InternalUserP
             ]
         )
 
-    def add_messages(self, request, instance=None, **kwargs):
-        if instance and instance.status == OrderProposal.Status.SUBMIT:
-            if not instance.portfolio.is_manageable:
-                info(request, "This order proposal cannot be approved the portfolio is considered unmanaged.")
-            if instance.has_non_successful_checks:
+    def add_messages(self, request, instance: OrderProposal | None = None, **kwargs):
+        if instance:
+            if instance.status == OrderProposal.Status.PENDING:
+                if not instance.portfolio.is_manageable:
+                    info(request, "This order proposal cannot be approved the portfolio is considered unmanaged.")
+                if instance.has_non_successful_checks:
+                    warning(
+                        request,
+                        "This order proposal cannot be approved because there is unsuccessful pre-trade checks. Please rectify accordingly and resubmit a valid order proposal",
+                    )
+            if (
+                instance.execution_status in [ExecutionStatus.IN_DRAFT, ExecutionStatus.COMPLETED]
+                and instance.orders.filter(execution_confirmed=False).exists()
+            ):
+                warning(request, "Some orders failed confirmation. Check the list for further details.")
+            if instance.execution_status in [
+                ExecutionStatus.REJECTED,
+                ExecutionStatus.FAILED,
+                ExecutionStatus.UNKNOWN,
+            ]:
                 warning(
                     request,
-                    "This order proposal cannot be approved because there is unsuccessful pre-trade checks. Please rectify accordingly and resubmit a valid order proposal",
+                    f"The execution status is {ExecutionStatus[instance.execution_status].label}. Detail: {instance.execution_comment}",
                 )
 
     @classmethod
@@ -98,9 +117,10 @@ class OrderProposalModelViewSet(CloneMixin, RiskCheckViewSetMixin, InternalUserP
     @action(detail=True, methods=["PATCH"])
     def reset(self, request, pk=None):
         order_proposal = get_object_or_404(OrderProposal, pk=pk)
+        use_desired_target_weight = request.GET.get("use_desired_target_weight") == "true"
         if order_proposal.status == OrderProposal.Status.DRAFT:
             order_proposal.orders.all().update(weighting=0)
-            order_proposal.reset_orders()
+            order_proposal.reset_orders(use_desired_target_weight=use_desired_target_weight)
             return Response({"send": True})
         return Response({"status": "Order Proposal is not Draft"}, status=status.HTTP_400_BAD_REQUEST)
 
@@ -129,6 +149,26 @@ class OrderProposalModelViewSet(CloneMixin, RiskCheckViewSetMixin, InternalUserP
             return Response({"send": True})
         return Response({"status": "Order Proposal is not Draft"}, status=status.HTTP_400_BAD_REQUEST)
 
+    @action(detail=True, methods=["PATCH"])
+    def pushmodelchange(self, request, pk=None):
+        order_proposal = get_object_or_404(OrderProposal, pk=pk)
+        only_for_portfolio_ids = list(
+            map(lambda o: int(o), filter(lambda r: r, request.data.get("only_for_portfolio_ids", "").split(",")))
+        )
+        approve_automatically = request.data.get("approve_automatically") == "true"
+        if order_proposal.status == OrderProposal.Status.APPLIED and order_proposal.portfolio.is_model:
+            push_model_change_as_task.delay(
+                order_proposal.id,
+                request.user.id,
+                only_for_portfolio_ids=only_for_portfolio_ids,
+                approve_automatically=approve_automatically,
+            )
+            return Response({"send": True})
+        return Response(
+            {"status": "Order Proposal needs to be approved and linked to be a model portfolio"},
+            status=status.HTTP_400_BAD_REQUEST,
+        )
+
 
 class OrderProposalPortfolioModelViewSet(UserPortfolioRequestPermissionMixin, OrderProposalModelViewSet):
     endpoint_config_class = OrderProposalPortfolioEndpointConfig

wbportfolio/viewsets/orders/orders.py

@@ -92,7 +92,9 @@ class OrderOrderProposalModelViewSet(
                 sum_effective_total_value_fx_portfolio=Sum(F("effective_total_value_fx_portfolio")),
             )
             # weights aggregates
-            cash_sum_effective_weight = Decimal("1.0") - noncash_aggregates["sum_effective_weight"]
+            cash_sum_effective_weight = (
+                self.order_proposal.total_effective_portfolio_weight - noncash_aggregates["sum_effective_weight"]
+            )
             cash_sum_target_cash_weight = Decimal("1.0") - noncash_aggregates["sum_target_weight"]
             noncash_sum_effective_weight = noncash_aggregates["sum_effective_weight"] or Decimal(0)
             noncash_sum_target_weight = noncash_aggregates["sum_target_weight"] or Decimal(0)
@@ -176,14 +178,17 @@ class OrderOrderProposalModelViewSet(
         return OrderOrderProposalModelSerializer
 
     def add_messages(self, request, queryset=None, paginated_queryset=None, instance=None, initial=False):
-        if queryset is not None and queryset.exists() and self.order_proposal.status != OrderProposal.Status.APPROVED:
-            total_target_weight = queryset.aggregate(c=Sum(F("target_weight")))["c"] or Decimal(0)
+        if self.orders.exists() and self.order_proposal.status in [
+            OrderProposal.Status.PENDING,
+            OrderProposal.Status.DRAFT,
+        ]:
+            total_target_weight = self.orders.aggregate(c=Sum(F("target_weight")))["c"] or Decimal(0)
             if round(total_target_weight, 8) != 1:
                 warning(
                     request,
                     "The total target weight does not equal 1. To avoid automatic cash allocation, please adjust the order weights to sum up to 1. Otherwise, a cash component will be added when this order proposal is submitted.",
                 )
-            if queryset.filter(has_warnings=True).exists():
+            if self.orders.filter(has_warnings=True).exists():
                 error(
                     request,
                     "Some orders failed preparation. To resolve this, please revert the order proposal to draft, review and correct the orders, and then resubmit.",
@@ -191,32 +196,29 @@ class OrderOrderProposalModelViewSet(
 
     @cached_property
     def orders(self):
-        if self.is_portfolio_manager:
-            return self.order_proposal.get_orders()
-        else:
-            return Order.objects.none()
+        qs = self.order_proposal.get_orders()
+        if not self.is_portfolio_manager:
+            return qs.none()
+        return qs
 
     def get_queryset(self):
-        return (
-            self.orders.exclude(underlying_instrument__is_cash=True)
-            .annotate(
-                underlying_instrument_isin=F("underlying_instrument__isin"),
-                underlying_instrument_ticker=F("underlying_instrument__ticker"),
-                underlying_instrument_refinitiv_identifier_code=F("underlying_instrument__refinitiv_identifier_code"),
-                underlying_instrument_instrument_type=Case(
-                    When(
-                        underlying_instrument__parent__is_security=True,
-                        then=F("underlying_instrument__parent__instrument_type__short_name"),
-                    ),
-                    default=F("underlying_instrument__instrument_type__short_name"),
+        return self.orders.annotate(  # .exclude(underlying_instrument__is_cash=True)
+            underlying_instrument_isin=F("underlying_instrument__isin"),
+            underlying_instrument_ticker=F("underlying_instrument__ticker"),
+            underlying_instrument_refinitiv_identifier_code=F("underlying_instrument__refinitiv_identifier_code"),
+            underlying_instrument_instrument_type=Case(
+                When(
+                    underlying_instrument__parent__is_security=True,
+                    then=F("underlying_instrument__parent__instrument_type__short_name"),
                 ),
-                effective_total_value_fx_portfolio=F("effective_weight") * Value(self.portfolio_total_asset_value),
-                target_total_value_fx_portfolio=F("target_weight") * Value(self.portfolio_total_asset_value),
-                portfolio_currency=F("portfolio__currency__symbol"),
-                security=F("underlying_instrument__parent"),
-                company=F("underlying_instrument__parent__parent"),
-            )
-            .select_related(
-                "underlying_instrument", "underlying_instrument__parent", "underlying_instrument__parent__parent"
-            )
+                default=F("underlying_instrument__instrument_type__short_name"),
+            ),
+            underlying_instrument_exchange=F("underlying_instrument__exchange__name"),
+            effective_total_value_fx_portfolio=F("previous_weight") * Value(self.portfolio_total_asset_value),
+            target_total_value_fx_portfolio=F("target_weight") * Value(self.portfolio_total_asset_value),
+            portfolio_currency=F("portfolio__currency__symbol"),
+            security=F("underlying_instrument__parent"),
+            company=F("underlying_instrument__parent__parent"),
+        ).select_related(
+            "underlying_instrument", "underlying_instrument__parent", "underlying_instrument__parent__parent"
         )

wbportfolio/viewsets/portfolios.py

@@ -147,8 +147,8 @@ class PortfolioModelViewSet(UserPortfolioRequestPermissionMixin, InternalUserPer
             activation_date = datetime.strptime(request.POST["activation_date"], "%Y-%m-%d")
             rebalancing_model = get_object_or_404(RebalancingModel, pk=request.POST["rebalancing_model"])
             frequency = request.POST["frequency"]
-            approve_order_proposal_automatically = (
-                request.POST.get("approve_order_proposal_automatically", "false") == "true"
+            apply_order_proposal_automatically = (
+                request.POST.get("apply_order_proposal_automatically", "false") == "true"
             )
 
             rebalancer, _ = Rebalancer.objects.update_or_create(
@@ -157,7 +157,7 @@ class PortfolioModelViewSet(UserPortfolioRequestPermissionMixin, InternalUserPer
                     "rebalancing_model": rebalancing_model,
                     "frequency": frequency,
                     "activation_date": activation_date,
-                    "approve_order_proposal_automatically": approve_order_proposal_automatically,
+                    "apply_order_proposal_automatically": apply_order_proposal_automatically,
                 },
             )
             return Response(

{wbportfolio-1.54.22.dist-info → wbportfolio-1.55.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbportfolio
-Version: 1.54.22
+Version: 1.55.0
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 License-File: LICENSE
 Requires-Dist: cryptography==3.4.*
@@ -19,6 +19,8 @@ Requires-Dist: wbcompliance
 Requires-Dist: wbcore
 Requires-Dist: wbcrm
 Requires-Dist: wbfdm
+Requires-Dist: wbmailing
 Requires-Dist: wbnews
+Requires-Dist: wbreport
 Requires-Dist: xlrd==2.*
 Requires-Dist: xlsxwriter==3.*