wbportfolio 1.55.8__py2.py3-none-any.whl → 1.59.4__py2.py3-none-any.whl

wbportfolio/tests/models/test_utils.py

@@ -0,0 +1,140 @@
+from decimal import Decimal
+from unittest.mock import patch
+
+import pytest
+from pandas._libs.tslibs.offsets import BDay
+
+from wbportfolio.models import AssetPosition, Order, OrderProposal, Portfolio
+from wbportfolio.models.utils import adjust_assets, adjust_orders, adjust_quote, get_adjusted_shares
+
+
+def test_get_adjusted_shares():
+    assert get_adjusted_shares(Decimal("150"), Decimal("100"), Decimal("200")) == Decimal("75")
+
+
+@pytest.mark.django_db
+@patch.object(Order, "_get_price")
+def test_adjust_orders(mock_get_price, weekday, order_factory, instrument_factory):
+    mock_get_price.return_value = (Decimal("100"), Decimal("0"))
+    old_quote = instrument_factory.create()
+    new_quote = instrument_factory.create()
+    o1 = order_factory.create(
+        underlying_instrument=old_quote, order_proposal__trade_date=weekday, price=Decimal("100"), shares=Decimal("10")
+    )
+    o2 = order_factory.create(
+        underlying_instrument=old_quote, order_proposal__trade_date=weekday, price=Decimal("100"), shares=Decimal("20")
+    )
+    adjust_orders(Order.objects.filter(underlying_instrument=old_quote), new_quote)
+
+    o1.refresh_from_db()
+    o2.refresh_from_db()
+
+    assert o1.underlying_instrument == new_quote
+    assert o2.underlying_instrument == new_quote
+    assert o1.price == Decimal("100")
+    assert o2.price == Decimal("100")
+    assert o1.shares == Decimal("10")
+    assert o2.shares == Decimal("20")
+
+    mock_get_price.return_value = (Decimal("200"), Decimal("0"))
+    adjust_orders(Order.objects.filter(underlying_instrument=new_quote), old_quote)
+
+    o1.refresh_from_db()
+    o2.refresh_from_db()
+
+    assert o1.underlying_instrument == old_quote
+    assert o2.underlying_instrument == old_quote
+    assert o1.price == Decimal("200")
+    assert o2.price == Decimal("200")
+    assert o1.shares == Decimal("5")
+    assert o2.shares == Decimal("10")
+
+
+@pytest.mark.django_db
+def test_adjust_assets(weekday, asset_position_factory, instrument_factory, instrument_price_factory):
+    old_quote = instrument_factory.create()
+    new_quote = instrument_factory.create()
+    old_quote_price = instrument_price_factory.create(
+        instrument=old_quote, net_value=Decimal("100"), date=weekday, calculated=False
+    )
+    new_quote_price = instrument_price_factory.create(
+        instrument=new_quote, net_value=Decimal("100"), date=weekday, calculated=False
+    )
+
+    a1 = asset_position_factory.create(
+        underlying_quote=old_quote, date=weekday, initial_price=Decimal("100"), initial_shares=Decimal("10")
+    )
+    a2 = asset_position_factory.create(
+        underlying_quote=old_quote, date=weekday, initial_price=Decimal("100"), initial_shares=Decimal("20")
+    )
+    adjust_assets(AssetPosition.objects.filter(underlying_quote=old_quote), new_quote)
+
+    a1.refresh_from_db()
+    a2.refresh_from_db()
+
+    assert a1.underlying_quote == new_quote
+    assert a2.underlying_quote == new_quote
+    assert a1.underlying_quote_price == new_quote_price
+    assert a2.underlying_quote_price == new_quote_price
+    assert a1.initial_price == Decimal("100")
+    assert a2.initial_price == Decimal("100")
+    assert a1.initial_shares == Decimal("10")
+    assert a2.initial_shares == Decimal("20")
+
+    old_quote_price.net_value = new_quote_price.net_value = Decimal("200")
+    old_quote_price.save()
+    new_quote_price.save()
+
+    adjust_assets(AssetPosition.objects.filter(underlying_quote=new_quote), old_quote)
+
+    a1.refresh_from_db()
+    a2.refresh_from_db()
+
+    assert a1.underlying_quote == old_quote
+    assert a2.underlying_quote == old_quote
+    assert a1.underlying_quote_price == old_quote_price
+    assert a2.underlying_quote_price == old_quote_price
+    assert a1.initial_price == Decimal("200")
+    assert a2.initial_price == Decimal("200")
+    assert a1.initial_shares == Decimal("5")
+    assert a2.initial_shares == Decimal("10")
+
+
+@pytest.mark.django_db
+@patch("wbportfolio.models.utils.adjust_assets")
+@patch("wbportfolio.models.utils.adjust_orders")
+@patch.object(OrderProposal, "replay")
+def test_adjust_quote(mock_replay, mock_adjust_orders, mock_adjust_assets, weekday, order_factory, instrument_factory):
+    old_quote = instrument_factory.create()
+    new_quote = instrument_factory.create()
+    o1 = order_factory.create(  # noqa: F841
+        underlying_instrument=old_quote, order_proposal__trade_date=weekday, price=Decimal("100"), shares=Decimal("10")
+    )
+    o2 = order_factory.create(  # noqa: F841
+        underlying_instrument=old_quote,
+        order_proposal__trade_date=(weekday + BDay(1)),
+        price=Decimal("100"),
+        shares=Decimal("10"),
+    )
+    o3 = order_factory.create(
+        underlying_instrument=old_quote,
+        order_proposal__trade_date=(weekday + BDay(1)),
+        price=Decimal("100"),
+        shares=Decimal("10"),
+    )
+    adjust_quote(
+        old_quote,
+        new_quote,
+        adjust_after=weekday,
+        only_portfolios=Portfolio.objects.filter(id=o3.order_proposal.portfolio.id),
+    )
+
+    mock_adjust_assets.asser_called_once()
+    assert set(mock_adjust_assets.call_args[0][0]) == set(AssetPosition.objects.none())
+    assert mock_adjust_assets.call_args[0][1] == new_quote
+
+    mock_adjust_orders.assert_called_once()
+    assert set(mock_adjust_orders.call_args[0][0]) == set(Order.objects.filter(id=o3.id))
+    assert mock_adjust_orders.call_args[0][1] == new_quote
+
+    mock_replay.assert_called_once_with(reapply_order_proposal=True)

wbportfolio/tests/models/transactions/test_rebalancing.py

@@ -65,7 +65,7 @@ class TestRebalancer:
         )
         order_proposal = rebalancer.evaluate_rebalancing(trade_date)
         assert order_proposal.orders.count() == 2
-        assert order_proposal.status == OrderProposal.Status.APPLIED
+        assert order_proposal.status == OrderProposal.Status.CONFIRMED
         assert AssetPosition.objects.get(
             portfolio=rebalancer.portfolio, date=trade_date, underlying_quote=a1.underlying_instrument
         ).weighting == Decimal(0.5)

wbportfolio/tests/rebalancing/test_models.py

@@ -82,7 +82,7 @@ class TestCompositeRebalancing:
         assert not model.is_valid()
 
         order_proposal = OrderProposalFactory.create(
-            portfolio=model.portfolio, trade_date=model.last_effective_date, status=OrderProposal.Status.APPLIED
+            portfolio=model.portfolio, trade_date=model.last_effective_date, status=OrderProposal.Status.CONFIRMED
         )
         t1 = OrderFactory.create(
             portfolio=model.portfolio,
@@ -104,7 +104,7 @@ class TestCompositeRebalancing:
 
     def test_get_target_portfolio(self, portfolio, weekday, model, asset_position_factory):
         order_proposal = OrderProposalFactory.create(
-            portfolio=model.portfolio, trade_date=model.last_effective_date, status=OrderProposal.Status.APPLIED
+            portfolio=model.portfolio, trade_date=model.last_effective_date, status=OrderProposal.Status.CONFIRMED
         )
         asset_position_factory(portfolio=portfolio, date=model.last_effective_date)  # noise
         asset_position_factory(portfolio=portfolio, date=model.last_effective_date)  # noise

wbportfolio/tests/viewsets/test_products.py

@@ -23,6 +23,7 @@ class TestProductModelViewSet:
             portfolio_factory.create_batch(4, invested_timespan=DateRange(date.min, date.max))
             + portfolio_factory.create_batch(2, invested_timespan=DateRange(date.min, date.max)),
             product_factory.create_batch(6),
+            strict=False,
         ):
             InstrumentPortfolioThroughModel.objects.update_or_create(
                 instrument=product, defaults={"portfolio": portfolio}

wbportfolio/urls.py

@@ -139,7 +139,7 @@ product_router.register(r"fees", viewsets.FeesProductModelViewSet, basename="pro
 
 # Subrouter for Order Proposal
 order_proposal_router = WBCoreRouter()
-order_proposal_router.register(r"trade", viewsets.OrderOrderProposalModelViewSet, basename="orderproposal-order")
+order_proposal_router.register(r"order", viewsets.OrderOrderProposalModelViewSet, basename="orderproposal-order")
 
 trade_router = WBCoreRouter()
 trade_router.register(r"claim", viewsets.ClaimTradeModelViewSet, basename="trade-claim")

wbportfolio/viewsets/charts/assets.py

@@ -101,7 +101,9 @@ class AbstractDistributionMixin(UserPortfolioRequestPermissionMixin):
             columns = {}
             level_representations = self.classification_group.get_levels_representation()
             for key, label in zip(
-                reversed(self.classification_group.get_fields_names(sep="_")), reversed(level_representations[1:])
+                reversed(self.classification_group.get_fields_names(sep="_")),
+                reversed(level_representations[1:]),
+                strict=False,
             ):
                 columns[key] = label
             columns["label"] = "Classification"
@@ -158,6 +160,7 @@ class AbstractDistributionMixin(UserPortfolioRequestPermissionMixin):
         return df.reset_index(names="id")
 
     def manipulate_dataframe(self, df):
+        df["id"] = df["id"].fillna(-1)
         if self.group_by == AssetPositionGroupBy.INDUSTRY:
             if not PortfolioRole.is_analyst(self.request.user.profile, portfolio=self.portfolio):
                 df["equity"] = ""
@@ -169,8 +172,8 @@ class AbstractDistributionMixin(UserPortfolioRequestPermissionMixin):
                 dict(Classification.objects.filter(id__in=df["classification"].dropna()).values_list("id", "name"))
             )
         elif self.group_by == AssetPositionGroupBy.CASH:
-            df.loc[df["id"] == True, "label"] = "Cash"
-            df.loc[df["id"] == False, "label"] = "Non-Cash"
+            df.loc[df["id"], "label"] = "Cash"
+            df.loc[~df["id"], "label"] = "Non-Cash"
         elif self.group_by == AssetPositionGroupBy.COUNTRY:
             df["label"] = df["id"].map(dict(Geography.objects.filter(id__in=df["id"]).values_list("id", "name")))
         elif self.group_by == AssetPositionGroupBy.CURRENCY:
@@ -180,6 +183,7 @@ class AbstractDistributionMixin(UserPortfolioRequestPermissionMixin):
             df["label"] = df["id"].map(
                 dict(InstrumentType.objects.filter(id__in=df["id"]).values_list("id", "short_name"))
             )
+        df.loc[df["id"] == -1, "label"] = "N/A"
         df.sort_values(by="weighting", ascending=False, inplace=True)
         return df
 
@@ -307,7 +311,7 @@ class ContributorPortfolioChartView(UserPortfolioRequestPermissionMixin, viewset
 
             text_forex = df_forex.contribution_forex.apply(lambda x: f"{x:,.2%}")
             text_equity = contribution_equity.apply(lambda x: f"{x:,.2%}")
-            setattr(self, "nb_rows", df.shape[0])
+            self.nb_rows = df.shape[0]
             fig.add_trace(
                 go.Bar(
                     y=df.instrument_id,

wbportfolio/viewsets/configs/buttons/assets.py

@@ -96,7 +96,7 @@ class AssetPositionPortfolioButtonConfig(AssetPositionButtonConfig):
                                     request=self.request,
                                 )
                             ),
-                            label=f"{PortfolioPortfolioThroughModel.Type[rel.type].label} Portfolio",
+                            label=f"Dependency Portfolio ({PortfolioPortfolioThroughModel.Type[rel.type].label})",
                         )
                     )
         return set(btns)

wbportfolio/viewsets/configs/buttons/mixins.py

@@ -7,7 +7,7 @@ from wbfdm.models.instruments import Instrument
 
 class InstrumentButtonMixin:
     @classmethod
-    def add_instrument_request_button(self, request=None, view=None, pk=None, **kwargs):
+    def add_instrument_request_button(cls, request=None, view=None, pk=None, **kwargs):
         buttons = [
             bt.WidgetButton(key="assets", label="Implemented Portfolios (Assets)"),
             # bt.WidgetButton(
@@ -44,7 +44,7 @@ class InstrumentButtonMixin:
         )
 
     @classmethod
-    def add_transactions_request_button(self, request=None, view=None, pk=None, **kwargs):
+    def add_transactions_request_button(cls, request=None, view=None, pk=None, **kwargs):
         return bt.DropDownButton(
             label="Transactions",
             icon=WBIcon.UNFOLD.icon,

wbportfolio/viewsets/configs/buttons/portfolios.py

@@ -2,6 +2,7 @@ from contextlib import suppress
 from datetime import date
 
 from pandas._libs.tslibs.offsets import BDay
+from rest_framework.reverse import reverse
 from wbcore import serializers as wb_serializers
 from wbcore.contrib.currency.serializers import CurrencyRepresentationSerializer
 from wbcore.contrib.icons import WBIcon
@@ -11,9 +12,11 @@ from wbcore.metadata.configs.buttons.view_config import ButtonViewConfig
 from wbcore.metadata.configs.display.instance_display.shortcuts import (
     create_simple_display,
 )
+from wbfdm.models import Instrument
+from wbfdm.serializers import InvestableUniverseRepresentationSerializer
 
 from wbportfolio.models import AssetPosition, Portfolio
-from wbportfolio.serializers import RebalancerModelSerializer
+from wbportfolio.serializers import PortfolioRepresentationSerializer, RebalancerModelSerializer
 from wbportfolio.viewsets.configs.display.rebalancing import RebalancerDisplayConfig
 
 
@@ -32,6 +35,28 @@ class CreateModelPortfolioSerializer(wb_serializers.ModelSerializer):
         )
 
 
+class AdjustQuoteSerializer(wb_serializers.Serializer):
+    old_quote = wb_serializers.PrimaryKeyRelatedField(queryset=Instrument.objects.all())
+    _old_quote = InvestableUniverseRepresentationSerializer(source="old_quote")
+
+    new_quote = wb_serializers.PrimaryKeyRelatedField(queryset=Instrument.objects.all())
+    _new_quote = InvestableUniverseRepresentationSerializer(
+        source="new_quote",
+        optional_get_parameters={"old_quote": "sibling_of"},
+        depends_on=[{"field": "old_quote", "options": {}}],
+    )
+
+    only_portfolios = wb_serializers.PrimaryKeyRelatedField(queryset=Portfolio.objects.all(), required=False)
+    _only_portfolios = PortfolioRepresentationSerializer(
+        source="only_portfolios",
+        optional_get_parameters={"old_quote": "invests_in"},
+        depends_on=[{"field": "new_quote", "options": {}}],
+        many=True,
+    )
+
+    adjust_after = wb_serializers.DateField(required=False)
+
+
 def _get_portfolio_start_end_serializer_class(portfolio):
     today = date.today()
 
@@ -60,6 +85,25 @@ def _get_rebalance_serializer_class(portfolio):
 
 
 class PortfolioButtonConfig(ButtonViewConfig):
+    def get_custom_buttons(self) -> set:
+        return {
+            bt.ActionButton(
+                method=RequestType.POST,
+                identifiers=("wbportfolio:portfolio",),
+                endpoint=reverse("wbportfolio:portfolio-adjustquote", args=[], request=self.request),
+                label="Adjust quote",
+                serializer=AdjustQuoteSerializer,
+                action_label="Action triggered",
+                title="Adjust Quote",
+                instance_display=create_simple_display(
+                    [
+                        ["old_quote", "new_quote", "adjust_after"],
+                        ["only_portfolios", "only_portfolios", "only_portfolios"],
+                    ]
+                ),
+            ),
+        }
+
     def get_custom_instance_buttons(self):
         admin_buttons = [
             bt.ActionButton(

wbportfolio/viewsets/configs/display/reconciliations.py

@@ -49,14 +49,14 @@ class AccountReconciliationLineDisplayViewConfig(DisplayViewConfig):
         ]
         editable = [dp.FormattingRule(style={"fontWeight": "bold"})]
         equal = [dp.FormattingRule(condition=("==", False, "is_equal"), style={"backgroundColor": "orange"})]
-        borderLeft = [
+        border_left = [
             dp.FormattingRule(
                 style={
                     "borderLeft": "1px solid #bdc3c7",
                 }
             )
         ]
-        borderRight = [
+        border_right = [
             dp.FormattingRule(
                 style={
                     "borderRight": "1px solid #bdc3c7",
@@ -111,7 +111,7 @@ class AccountReconciliationLineDisplayViewConfig(DisplayViewConfig):
                             key="shares_external",
                             label="Shares",
                             width=90,
-                            formatting_rules=[*equal, *editable, *borderLeft],
+                            formatting_rules=[*equal, *editable, *border_left],
                         ),
                         dp.Field(
                             key="nominal_value_external",
@@ -128,7 +128,7 @@ class AccountReconciliationLineDisplayViewConfig(DisplayViewConfig):
                             key="assets_under_management_external",
                             label="AuM",
                             width=120,
-                            formatting_rules=[*equal, *borderRight],
+                            formatting_rules=[*equal, *border_right],
                         ),
                     ],
                 ),

wbportfolio/viewsets/esg.py

@@ -58,12 +58,10 @@ class ESGMetricAggregationPortfolioPandasViewSet(UserPortfolioRequestPermissionM
                 df = (
                     pd.DataFrame(
                         AssetPosition.objects.filter(portfolio=self.portfolio, date=self.val_date)
-                        .exclude(
-                            Q(underlying_instrument__is_cash=True) | Q(underlying_instrument__is_cash_equivalent=True)
-                        )
-                        .values("underlying_instrument", "weighting", "total_value_fx_usd")
+                        .exclude(Q(underlying_quote__is_cash=True) | Q(underlying_quote__is_cash_equivalent=True))
+                        .values("underlying_quote", "weighting", "total_value_fx_usd")
                     )
-                    .groupby("underlying_instrument")
+                    .groupby("underlying_quote")
                     .sum()
                     .astype(float)
                 )

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

@@ -9,6 +9,7 @@ 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.order_routing import ExecutionStatus
 from wbportfolio.serializers import PortfolioRepresentationSerializer
 
 
@@ -24,12 +25,61 @@ class ResetSerializer(wb_serializers.Serializer):
     )
 
 
+class ExecuteSerializer(wb_serializers.Serializer):
+    prioritize_target_weight = wb_serializers.BooleanField(
+        default=False,
+        label="Prioritize Target Weight",
+        help_text="If True, we will communicate to the custodian to prioritize target weight in case both shares and target weight are communicated.",
+    )
+
+
 class OrderProposalButtonConfig(ButtonViewConfig):
     def get_custom_list_instance_buttons(self):
         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:
+            if order_proposal.can_execute(self.request.user):
+                buttons.append(
+                    bt.ActionButton(
+                        method=RequestType.PATCH,
+                        identifiers=("wbportfolio:order",),
+                        icon=WBIcon.DEAL_MONEY.icon,
+                        endpoint=reverse("wbportfolio:orderproposal-execute", args=[order_proposal.id]),
+                        label="Execute",
+                        action_label="Execute",
+                        description_fields="<p>Execute the orders through the setup custodian.</p>",
+                        serializer=ExecuteSerializer,
+                        instance_display=create_simple_display([["prioritize_target_weight"]]),
+                    )
+                )
+
+            elif order_proposal.status == OrderProposal.Status.EXECUTION and order_proposal.execution_status in [
+                ExecutionStatus.PENDING,
+                ExecutionStatus.IN_DRAFT,
+            ]:
+                buttons.append(
+                    bt.ActionButton(
+                        method=RequestType.PATCH,
+                        identifiers=("wbportfolio:order",),
+                        icon=WBIcon.PREVIOUS.icon,
+                        endpoint=reverse("wbportfolio:orderproposal-cancelexecution", args=[order_proposal.id]),
+                        label="Cancel Execution",
+                        action_label="Cancel Execution",
+                        description_fields="<p>Cancel the current requested execution. Time sensitive operation.</p>",
+                    )
+                )
+                buttons.append(
+                    bt.ActionButton(
+                        method=RequestType.PATCH,
+                        identifiers=("wbportfolio:order",),
+                        icon=WBIcon.REFRESH.icon,
+                        endpoint=reverse("wbportfolio:orderproposal-updateexecutionstatus", args=[order_proposal.id]),
+                        label="Update Execution Status",
+                        action_label="Update Execution Status",
+                        description_fields="<p>Update Execution Status.<p>",
+                    )
+                )
+            if order_proposal.can_be_confirmed and order_proposal.portfolio.is_model:
 
                 class PushModelChangeSerializer(wb_serializers.Serializer):
                     only_for_portfolio_ids = wb_serializers.PrimaryKeyRelatedField(
@@ -48,7 +98,7 @@ class OrderProposalButtonConfig(ButtonViewConfig):
                 buttons.append(
                     bt.ActionButton(
                         method=RequestType.PATCH,
-                        identifiers=("wbportfolio:orderproposal",),
+                        identifiers=("wbportfolio:order",),
                         endpoint=reverse("wbportfolio:orderproposal-pushmodelchange", args=[order_proposal.id]),
                         icon=WBIcon.BROADCAST.icon,
                         label="Push Model Changes",
@@ -63,13 +113,25 @@ class OrderProposalButtonConfig(ButtonViewConfig):
                         ),
                     )
                 )
+            if order_proposal.status == OrderProposal.Status.DRAFT:
+                buttons.append(
+                    bt.ActionButton(
+                        method=RequestType.PATCH,
+                        identifiers=("wbportfolio:order",),
+                        endpoint=reverse("wbportfolio:orderproposal-refreshpretradechecks", args=[order_proposal.id]),
+                        icon=WBIcon.RUNNING.icon,
+                        label="Evaluate Pre-Trade Checks",
+                        action_label="Checks are running.",
+                        title="Evaluate Pre-Trade Checks",
+                    )
+                )
         buttons.append(
             bt.DropDownButton(
                 label="Tools",
                 buttons=(
                     bt.ActionButton(
                         method=RequestType.PATCH,
-                        identifiers=("wbportfolio:orderproposal",),
+                        identifiers=("wbportfolio:order",),
                         key="replay",
                         icon=WBIcon.SYNCHRONIZE.icon,
                         label="Replay Orders",
@@ -81,7 +143,7 @@ class OrderProposalButtonConfig(ButtonViewConfig):
                     ),
                     bt.ActionButton(
                         method=RequestType.PATCH,
-                        identifiers=("wbportfolio:orderproposal",),
+                        identifiers=("wbportfolio:order",),
                         key="reset",
                         icon=WBIcon.REGENERATE.icon,
                         label="Reset Orders",
@@ -96,12 +158,12 @@ class OrderProposalButtonConfig(ButtonViewConfig):
                     ),
                     bt.ActionButton(
                         method=RequestType.PATCH,
-                        identifiers=("wbportfolio:orderproposal",),
+                        identifiers=("wbportfolio:order",),
                         key="normalize",
                         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 (1 - {{total_cash_weight}})</p>
                                 """,
                         action_label="Normalize Orders",
                         title="Normalize Orders",
@@ -110,15 +172,12 @@ class OrderProposalButtonConfig(ButtonViewConfig):
                     ),
                     bt.ActionButton(
                         method=RequestType.PATCH,
-                        identifiers=("wbportfolio:orderproposal",),
-                        key="deleteall",
-                        icon=WBIcon.DELETE.icon,
-                        label="Delete All Orders",
-                        description_fields="""
-                        <p>Delete all orders from this order proposal?</p>
-                        """,
-                        action_label="Delete All Orders",
-                        title="Delete All Orders",
+                        identifiers=("wbportfolio:order",),
+                        key="refresh_return",
+                        icon=WBIcon.REFRESH.icon,
+                        label="Refresh Returns & Price",
+                        action_label="Refresh Returns & Price",
+                        title="Refresh Returns & Price",
                     ),
                 ),
             )

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

@@ -1,5 +1,86 @@
+from wbcore import serializers as wb_serializers
+from wbcore.contrib.icons import WBIcon
+from wbcore.enums import RequestType
+from wbcore.metadata.configs import buttons as bt
 from wbcore.metadata.configs.buttons.enums import Button
 from wbcore.metadata.configs.buttons.view_config import ButtonViewConfig
+from wbcore.metadata.configs.display import create_simple_display
+
+from wbportfolio.order_routing import ExecutionInstruction
+
+
+class ExecutionInstructionSerializer(wb_serializers.Serializer):
+    execution_instruction = wb_serializers.ChoiceField(
+        choices=ExecutionInstruction.choices,
+        default=ExecutionInstruction.MARKET_ON_CLOSE.value,
+        clear_dependent_fields=False,
+    )
+    apply_execution_instruction_to_all_orders = wb_serializers.BooleanField(
+        default=False, label="Apply Execution instruction to all orders"
+    )
+
+    percentage = wb_serializers.FloatField(
+        label="Percentage [1% - 25%]",
+        percent=True,
+        required=False,
+        allow_null=True,
+        on_unsatisfied_deps="hide",
+        depends_on=[
+            {
+                "field": "execution_instruction",
+                "options": {"activates_on": [ExecutionInstruction.IN_LINE_WITH_VOLUME.value]},
+            }
+        ],
+    )
+    price = wb_serializers.FloatField(
+        label="Price (optional)",
+        required=False,
+        allow_null=True,
+        on_unsatisfied_deps="hide",
+        depends_on=[
+            {
+                "field": "execution_instruction",
+                "options": {"activates_on": [ExecutionInstruction.LIMIT_ORDER.value]},
+            }
+        ],
+    )
+    good_for_date = wb_serializers.DateField(
+        label="Good For Date (optional)",
+        required=False,
+        allow_null=True,
+        on_unsatisfied_deps="hide",
+        depends_on=[
+            {
+                "field": "execution_instruction",
+                "options": {"activates_on": [ExecutionInstruction.LIMIT_ORDER.value]},
+            }
+        ],
+    )
+    period = wb_serializers.IntegerField(
+        label="Period in minutes",
+        required=False,
+        allow_null=True,
+        on_unsatisfied_deps="hide",
+        depends_on=[
+            {
+                "field": "execution_instruction",
+                "options": {"activates_on": [ExecutionInstruction.VWAP.value, ExecutionInstruction.TWAP.value]},
+            }
+        ],
+    )
+    time = wb_serializers.TimeField(
+        label="Time (UTC)",
+        format="%H:%M",
+        required=False,
+        allow_null=True,
+        on_unsatisfied_deps="hide",
+        depends_on=[
+            {
+                "field": "execution_instruction",
+                "options": {"activates_on": [ExecutionInstruction.VWAP.value, ExecutionInstruction.TWAP.value]},
+            }
+        ],
+    )
 
 
 class OrderOrderProposalButtonConfig(ButtonViewConfig):
@@ -7,3 +88,26 @@ class OrderOrderProposalButtonConfig(ButtonViewConfig):
         return {
             Button.SAVE_AND_CLOSE.value,
         }
+
+    def get_custom_list_instance_buttons(self) -> set:
+        return {
+            bt.ActionButton(
+                method=RequestType.PUT,
+                identifiers=("wbportfolio:order",),
+                icon=WBIcon.DEAL_MONEY.icon,
+                key="execution_instruction",
+                label="Change Execution",
+                action_label="Execution changed",
+                description_fields="<p>Change Execution</p>",
+                serializer=ExecutionInstructionSerializer,
+                instance_display=create_simple_display(
+                    [
+                        ["execution_instruction", "execution_instruction"],
+                        ["percentage", "percentage"],
+                        ["price", "good_for_date"],
+                        ["period", "time"],
+                        ["apply_execution_instruction_to_all_orders", "."],
+                    ]
+                ),
+            )
+        }