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

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/buttons/products.py

@@ -1,15 +1,18 @@
+from rest_framework.reverse import reverse
 from wbcore.contrib.icons import WBIcon
 from wbcore.metadata.configs import buttons as bt
 from wbcore.metadata.configs.buttons.view_config import ButtonViewConfig
 from wbfdm.viewsets.configs.buttons.instruments import InstrumentButtonViewConfig
 
+from wbportfolio.models import Product
+
 
 class ProductButtonConfig(ButtonViewConfig):
     def get_custom_list_instance_buttons(self):
         return self.get_custom_instance_buttons()
 
     def get_custom_instance_buttons(self):
-        return {
+        buttons = [
             bt.DropDownButton(
                 label="Commission",
                 icon=WBIcon.UNFOLD.icon,
@@ -35,7 +38,34 @@ class ProductButtonConfig(ButtonViewConfig):
                     ),
                 ],
             ),
-        }
+        ]
+        if product_id := self.view.kwargs.get("pk", None):
+            product = Product.objects.get(id=product_id)
+            report_buttons = []
+            for report in product.reports.filter(is_active=True):
+                tmp_buttons = []
+                if primary_version := report.primary_version:
+                    tmp_buttons.append(
+                        bt.HyperlinkButton(
+                            label="Public Report",
+                            endpoint=reverse(
+                                "public_report:report_version", args=[primary_version.lookup], request=self.request
+                            ),
+                        ),
+                    )
+                    if self.request.user.profile.is_internal or self.request.user.is_superuser:
+                        tmp_buttons.append(
+                            bt.WidgetButton(
+                                label="Widget",
+                                endpoint=reverse("wbreport:report-detail", args=[report.id], request=self.request),
+                            ),
+                        )
+                if tmp_buttons:
+                    report_buttons.append(bt.DropDownButton(label=str(report), buttons=tmp_buttons))
+            if report_buttons:
+                buttons.append(bt.DropDownButton(label="Reports", buttons=report_buttons))
+
+        return set(buttons)
 
 
 class ProductCustomerButtonConfig(ButtonViewConfig):

wbportfolio/viewsets/configs/display/__init__.py

@@ -19,9 +19,9 @@ from .claim import (
 from .custodians import CustodianDisplayConfig
 
 from .fees import (
-    FeesAggregatedPortfolioPandasDisplayConfig,
+    FeesAggregatedProductPandasDisplayConfig,
     FeesDisplayConfig,
-    FeesPortfolioDisplayConfig,
+    FeesProductDisplayConfig,
 )
 from .portfolios import (
     PortfolioDisplayConfig,
@@ -49,10 +49,7 @@ from .trades import (
     SubscriptionRedemptionDisplayConfig,
     TradeDisplayConfig,
     TradePortfolioDisplayConfig,
-    TradeTradeProposalDisplayConfig,
 )
-from .trade_proposals import TradeProposalDisplayConfig
-from .transactions import TransactionDisplayConfig, TransactionPortfolioDisplayConfig
 from .portfolio_relationship import (
     PortfolioInstrumentPreferredClassificationThroughDisplayConfig,
     InstrumentPortfolioThroughPortfolioModelDisplayConfig,

wbportfolio/viewsets/configs/display/assets.py

@@ -234,22 +234,9 @@ class CompositionModelPortfolioPandasDisplayConfig(DisplayViewConfig):
 
 class DistributionTableDisplayConfig(DisplayViewConfig):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
-        if group_by := self.request.GET.get("group_by", ""):
-            group_by = group_by.title().replace("_", " ")
-
-        if group_by != "Industry":
-            fields = [
-                dp.Field(key="aggregate_field", label=group_by),
-                dp.Field(key="weighting", label="Weight"),
-            ]
-        else:
-            fields = []
-            for level_rep in self.view.classification_levels_representation:
-                fields.append(dp.Field(key=level_rep, label=level_rep))
-            fields.extend(
-                [
-                    dp.Field(key="equity", label="Equity"),
-                    dp.Field(key="weighting", label="Weight"),
-                ]
-            )
-        return dp.ListDisplay(fields=tuple(fields))
+        fields = [
+            dp.Field(key="weighting", label="Weighting"),
+        ]
+        for k, v in reversed(self.view.columns_map.items()):
+            fields.append(dp.Field(key=k, label=v))
+        return dp.ListDisplay(fields=fields)

wbportfolio/viewsets/configs/display/fees.py

@@ -55,7 +55,7 @@ class FeesDisplayConfig(DisplayViewConfig):
         )
 
 
-class FeesPortfolioDisplayConfig(DisplayViewConfig):
+class FeesProductDisplayConfig(DisplayViewConfig):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
         return dp.ListDisplay(
             fields=[
@@ -98,7 +98,7 @@ class FeesPortfolioDisplayConfig(DisplayViewConfig):
                         dp.Field(key="calculated", label="Calculated"),
                         dp.Field(key="currency_fx_rate", label="FX rate", show="open"),
                         dp.Field(key="currency", label="Currency", show="open"),
-                        dp.Field(key="linked_product", label="Product", show="open"),
+                        dp.Field(key="product", label="Product", show="open"),
                     ],
                 ),
             ]
@@ -117,7 +117,7 @@ class FeesPortfolioDisplayConfig(DisplayViewConfig):
         )
 
 
-class FeesAggregatedPortfolioPandasDisplayConfig(DisplayViewConfig):
+class FeesAggregatedProductPandasDisplayConfig(DisplayViewConfig):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
         return dp.ListDisplay(
             fields=[

wbportfolio/viewsets/configs/display/portfolios.py

@@ -51,9 +51,9 @@ class PortfolioDisplayConfig(DisplayViewConfig):
                     key=None,
                     children=[
                         dp.Field(key="automatic_rebalancer", label="Automatic Rebalancer"),
-                        dp.Field(key="last_trade_proposal_date", label="Last Rebalance", width=Unit.PIXEL(250)),
+                        dp.Field(key="last_order_proposal_date", label="Last Rebalance", width=Unit.PIXEL(250)),
                         dp.Field(
-                            key="next_expected_trade_proposal_date",
+                            key="next_expected_order_proposal_date",
                             label="Next Rebalancing",
                             width=Unit.PIXEL(250),
                             show="open",
@@ -126,15 +126,15 @@ class PortfolioDisplayConfig(DisplayViewConfig):
                     },
                 ),
                 Page(
-                    title="Trade",
+                    title="Order",
                     layouts={
                         default(): dp.Layout(
                             grid_template_areas=[
-                                ["trade_proposals"],
+                                ["order_proposals"],
                             ],
                             grid_template_rows=["auto"],
                             inlines=[
-                                dp.Inline(key="trade_proposals", endpoint="trade_proposals"),
+                                dp.Inline(key="order_proposals", endpoint="order_proposals"),
                             ],
                         )
                     },

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_trade_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_trade_proposal_automatically"],
+                ["rebalancing_model", "apply_order_proposal_automatically"],
                 ["frequency", "activation_date"],
                 ["rebalancing_dates", "rebalancing_dates"],
             ]

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/configs/display/trades.py

@@ -1,6 +1,5 @@
 from typing import Optional
 
-from django.shortcuts import get_object_or_404
 from wbcore.contrib.color.enums import WBColor
 from wbcore.contrib.icons import WBIcon
 from wbcore.enums import Unit
@@ -12,8 +11,6 @@ from wbcore.metadata.configs.display.instance_display.shortcuts import (
 from wbcore.metadata.configs.display.instance_display.utils import repeat_field
 from wbcore.metadata.configs.display.view_config import DisplayViewConfig
 
-from wbportfolio.models import Trade, TradeProposal
-
 NEGATIVE_RED_FORMATTING = [
     dp.FormattingRule(
         style={
@@ -37,63 +34,6 @@ SHARE_FORMATTING = dp.Formatting(
     ],
 )
 
-TRADE_STATUS_LEGENDS = dp.Legend(
-    key="status",
-    items=[
-        dp.LegendItem(
-            icon=WBColor.RED_LIGHT.value,
-            label=Trade.Status.FAILED.label,
-            value=Trade.Status.FAILED.value,
-        ),
-        dp.LegendItem(
-            icon=WBColor.BLUE_LIGHT.value,
-            label=Trade.Status.DRAFT.label,
-            value=Trade.Status.DRAFT.value,
-        ),
-        dp.LegendItem(
-            icon=WBColor.YELLOW_LIGHT.value,
-            label=Trade.Status.SUBMIT.label,
-            value=Trade.Status.SUBMIT.value,
-        ),
-        dp.LegendItem(
-            icon=WBColor.GREEN_LIGHT.value,
-            label=Trade.Status.EXECUTED.label,
-            value=Trade.Status.EXECUTED.value,
-        ),
-        dp.LegendItem(
-            icon=WBColor.GREEN.value,
-            label=Trade.Status.CONFIRMED.label,
-            value=Trade.Status.CONFIRMED.value,
-        ),
-    ],
-)
-
-TRADE_STATUS_FORMATTING = dp.Formatting(
-    column="status",
-    formatting_rules=[
-        dp.FormattingRule(
-            style={"backgroundColor": WBColor.RED_LIGHT.value},
-            condition=("==", Trade.Status.FAILED.value),
-        ),
-        dp.FormattingRule(
-            style={"backgroundColor": WBColor.BLUE_LIGHT.value},
-            condition=("==", Trade.Status.DRAFT.value),
-        ),
-        dp.FormattingRule(
-            style={"backgroundColor": WBColor.YELLOW_LIGHT.value},
-            condition=("==", Trade.Status.SUBMIT.value),
-        ),
-        dp.FormattingRule(
-            style={"backgroundColor": WBColor.GREEN_LIGHT.value},
-            condition=("==", Trade.Status.EXECUTED.value),
-        ),
-        dp.FormattingRule(
-            style={"backgroundColor": WBColor.GREEN.value},
-            condition=("==", Trade.Status.CONFIRMED.value),
-        ),
-    ],
-)
-
 
 class TradeDisplayConfig(DisplayViewConfig):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
@@ -145,8 +85,7 @@ class TradeDisplayConfig(DisplayViewConfig):
                     ),
                 ),
             ],
-            legends=[TRADE_STATUS_LEGENDS],
-            formatting=[SHARE_FORMATTING, TRADE_STATUS_FORMATTING],
+            formatting=[SHARE_FORMATTING],
         )
 
     def get_instance_display(self) -> Display:
@@ -285,130 +224,3 @@ class SubscriptionRedemptionDisplayConfig(TradeDisplayConfig):
 
 class TradePortfolioDisplayConfig(TradeDisplayConfig):
     pass
-
-
-class TradeTradeProposalDisplayConfig(DisplayViewConfig):
-    def get_list_display(self) -> Optional[dp.ListDisplay]:
-        trade_proposal = get_object_or_404(TradeProposal, pk=self.view.kwargs.get("trade_proposal_id", None))
-        fields = [
-            dp.Field(
-                label="Instrument",
-                open_by_default=True,
-                key=None,
-                children=[
-                    dp.Field(key="underlying_instrument", label="Name", width=Unit.PIXEL(250)),
-                    dp.Field(key="underlying_instrument_isin", label="ISIN", width=Unit.PIXEL(125)),
-                    dp.Field(key="underlying_instrument_ticker", label="Ticker", width=Unit.PIXEL(100)),
-                    dp.Field(
-                        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(
-                label="Weight",
-                open_by_default=False,
-                key=None,
-                children=[
-                    dp.Field(key="effective_weight", label="Effective Weight", show="open", width=Unit.PIXEL(150)),
-                    dp.Field(key="target_weight", label="Target Weight", show="open", width=Unit.PIXEL(150)),
-                    dp.Field(
-                        key="weighting",
-                        label="Delta Weight",
-                        formatting_rules=[
-                            dp.FormattingRule(
-                                style={"color": WBColor.RED_DARK.value, "fontWeight": "bold"},
-                                condition=("<", 0),
-                            ),
-                            dp.FormattingRule(
-                                style={"color": WBColor.GREEN_DARK.value, "fontWeight": "bold"},
-                                condition=(">", 0),
-                            ),
-                        ],
-                        width=Unit.PIXEL(150),
-                    ),
-                ],
-            ),
-        ]
-        if not trade_proposal.portfolio.only_weighting:
-            fields.append(
-                dp.Field(
-                    label="Shares",
-                    open_by_default=False,
-                    key=None,
-                    children=[
-                        dp.Field(key="effective_shares", label="Effective Shares", show="open", width=Unit.PIXEL(150)),
-                        dp.Field(key="target_shares", label="Target Shares", show="open", width=Unit.PIXEL(150)),
-                        dp.Field(
-                            key="shares",
-                            label="Shares",
-                            formatting_rules=[
-                                dp.FormattingRule(
-                                    style={"color": WBColor.RED_DARK.value, "fontWeight": "bold"},
-                                    condition=("<", 0),
-                                ),
-                                dp.FormattingRule(
-                                    style={"color": WBColor.GREEN_DARK.value, "fontWeight": "bold"},
-                                    condition=(">", 0),
-                                ),
-                            ],
-                            width=Unit.PIXEL(150),
-                        ),
-                    ],
-                )
-            )
-        fields.append(
-            dp.Field(
-                label="Information",
-                open_by_default=False,
-                key=None,
-                children=[
-                    dp.Field(
-                        key="transaction_subtype",
-                        label="Direction",
-                        formatting_rules=[
-                            dp.FormattingRule(
-                                style={"color": WBColor.RED_DARK.value, "fontWeight": "bold"},
-                                condition=("==", Trade.Type.SELL.name),
-                            ),
-                            dp.FormattingRule(
-                                style={"color": WBColor.RED_DARK.value, "fontWeight": "bold"},
-                                condition=("==", Trade.Type.DECREASE.name),
-                            ),
-                            dp.FormattingRule(
-                                style={"color": WBColor.GREEN_DARK.value, "fontWeight": "bold"},
-                                condition=("==", Trade.Type.INCREASE.name),
-                            ),
-                            dp.FormattingRule(
-                                style={"color": WBColor.GREEN_DARK.value, "fontWeight": "bold"},
-                                condition=("==", Trade.Type.BUY.name),
-                            ),
-                            dp.FormattingRule(
-                                style={"color": WBColor.GREY.value, "fontWeight": "bold"},
-                                condition=("==", Trade.Type.NO_CHANGE.name),
-                            ),
-                        ],
-                        width=Unit.PIXEL(125),
-                    ),
-                    dp.Field(key="comment", label="Comment", width=Unit.PIXEL(250)),
-                    dp.Field(key="order", label="Order", show="open", width=Unit.PIXEL(100)),
-                ],
-            )
-        )
-        return dp.ListDisplay(
-            fields=fields,
-            legends=[TRADE_STATUS_LEGENDS],
-            formatting=[TRADE_STATUS_FORMATTING],
-        )
-
-    def get_instance_display(self) -> Display:
-        trade_proposal = get_object_or_404(TradeProposal, pk=self.view.kwargs.get("trade_proposal_id", None))
-
-        fields = [
-            ["company", "security", "underlying_instrument"],
-            ["effective_weight", "target_weight", "weighting"],
-        ]
-        if not trade_proposal.portfolio.only_weighting:
-            fields.append(["effective_shares", "target_shares", "shares"])
-        fields.append([repeat_field(3, "comment")])
-        return create_simple_display(fields)

wbportfolio/viewsets/configs/endpoints/__init__.py

@@ -28,10 +28,10 @@ from .claim import (
 
 from .custodians import CustodianEndpointConfig
 from .fees import (
-    FeesAggregatedPortfolioPandasEndpointConfig,
-    FeesPortfolioEndpointConfig,
+    FeesAggregatedProductPandasEndpointConfig,
+    FeesProductEndpointConfig,
 )
-from .fees import FeesAggregatedPortfolioPandasEndpointConfig, FeesPortfolioEndpointConfig, FeeEndpointConfig
+from .fees import FeesAggregatedProductPandasEndpointConfig, FeesProductEndpointConfig, FeeEndpointConfig
 
 from .portfolios import (
     PortfolioEndpointConfig,
@@ -62,12 +62,8 @@ from .trades import (
     TradeEndpointConfig,
     TradeInstrumentEndpointConfig,
     TradePortfolioEndpointConfig,
-    TradeProposalEndpointConfig,
-    TradeProposalPortfolioEndpointConfig,
-    TradeTradeProposalEndpointConfig,
     SubscriptionRedemptionEndpointConfig,
 )
-from .transactions import TransactionEndpointConfig, TransactionPortfolioEndpointConfig
 from .portfolio_relationship import (
     PortfolioInstrumentPreferredClassificationThroughEndpointConfig,
     InstrumentPortfolioThroughPortfolioModelEndpointConfig,

wbportfolio/viewsets/configs/endpoints/fees.py

@@ -6,9 +6,9 @@ class FeeEndpointConfig(EndpointViewConfig):
         return None
 
 
-class FeesPortfolioEndpointConfig(FeeEndpointConfig):
+class FeesProductEndpointConfig(FeeEndpointConfig):
     pass
 
 
-class FeesAggregatedPortfolioPandasEndpointConfig(EndpointViewConfig):
+class FeesAggregatedProductPandasEndpointConfig(EndpointViewConfig):
     pass

wbportfolio/viewsets/configs/endpoints/trades.py

@@ -1,11 +1,6 @@
-from contextlib import suppress
-
-from django.shortcuts import get_object_or_404
 from rest_framework.reverse import reverse
 from wbcore.metadata.configs.endpoints import EndpointViewConfig
 
-from wbportfolio.models import TradeProposal
-
 
 class TradeEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
@@ -50,42 +45,6 @@ class CustodianDistributionInstrumentEndpointConfig(EndpointViewConfig):
         )
 
 
-class TradeProposalEndpointConfig(EndpointViewConfig):
-    def get_delete_endpoint(self, **kwargs):
-        if pk := self.view.kwargs.get("pk", None):
-            trade_proposal = get_object_or_404(TradeProposal, pk=pk)
-            if trade_proposal.status == TradeProposal.Status.DRAFT:
-                return super().get_endpoint()
-        return None
-
-
-class TradeProposalPortfolioEndpointConfig(TradeProposalEndpointConfig):
-    def get_endpoint(self, **kwargs):
-        return reverse(
-            "wbportfolio:portfolio-tradeproposal-list", args=[self.view.kwargs["portfolio_id"]], request=self.request
-        )
-
-
-class TradeTradeProposalEndpointConfig(EndpointViewConfig):
-    def get_endpoint(self, **kwargs):
-        if trade_proposal_id := self.view.kwargs.get("trade_proposal_id", None):
-            trade_proposal = TradeProposal.objects.get(id=trade_proposal_id)
-            if trade_proposal.status == TradeProposal.Status.DRAFT:
-                return reverse(
-                    "wbportfolio:tradeproposal-trade-list",
-                    args=[self.view.kwargs["trade_proposal_id"]],
-                    request=self.request,
-                )
-        return None
-
-    def get_delete_endpoint(self, **kwargs):
-        with suppress(AttributeError, AssertionError):
-            trade = self.view.get_object()
-            if trade._effective_weight:  # we make sure trade with a valid effective position cannot be deleted
-                return None
-        return super().get_delete_endpoint(**kwargs)
-
-
 class SubscriptionRedemptionEndpointConfig(TradeEndpointConfig):
     def get_endpoint(self, **kwargs):
         return reverse("wbportfolio:subscriptionredemption-list", args=[], request=self.request)

wbportfolio/viewsets/configs/menu/__init__.py

@@ -25,6 +25,6 @@ from .products import PRODUCT_MENUITEM, PRODUCTCUSTOMER_MENUITEM
 from .registers import REGISTER_MENUITEM
 from .roles import PORTFOLIOROLE_MENUITEM
 from .trades import SUBSCRIPTION_REDEMPTION_MENUITEM, TRADE_MENUITEM
-from .transactions import TRANSACTION_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/configs/titles/__init__.py

@@ -27,8 +27,8 @@ from .claim import (
 from .custodians import CustodianTitleConfig
 
 from .fees import (
-    FeesAggregatedPortfolioTitleConfig,
-    FeesPortfolioTitleConfig,
+    FeesAggregatedProductTitleConfig,
+    FeesProductTitleConfig,
     FeesTitleConfig,
 )
 
@@ -60,6 +60,5 @@ from .trades import (
     TradePortfolioTitleConfig,
     TradeTitleConfig,
 )
-from .transactions import TransactionPortfolioTitleConfig
 from .esg import ESGMetricAggregationPortfolioPandasTitleConfig
 from .assets_and_net_new_money_progression import AssetAndNetNewMoneyProgressionChartTitleConfig