wbportfolio 1.50.15__py2.py3-none-any.whl → 1.51.1__py2.py3-none-any.whl

wbportfolio/import_export/parsers/ubs/valuation.py

@@ -6,7 +6,6 @@ import numpy as np
 import pandas as pd
 
 from wbportfolio.import_export.utils import get_file_extension
-from wbportfolio.models import Product
 
 
 def file_name_parse(file_name):
@@ -30,7 +29,7 @@ def parse(import_source):
         raise Exception("File not supported")
 
     parts = file_name_parse(import_source.file.name)
-    product = Product.objects.get(isin=parts["isin"])
+    isin = parts["isin"]
 
     xx, yy = np.where(df == "Instrument")
     df = df.iloc[: xx[0], :].transpose().dropna(how="all", axis=0).reset_index(drop=True)
@@ -43,7 +42,7 @@ def parse(import_source):
 
     data = [
         {
-            "instrument": {"instrument_type": "product", "id": product.id},
+            "instrument": {"instrument_type": "product", "isin": isin},
             "date": date.strftime("%Y-%m-%d"),
             "net_value": value,
             "calculated": False,

wbportfolio/import_export/parsers/vontobel/instrument.py

@@ -17,7 +17,7 @@ ASSET_TYPE_MAP = {
     "EQUBEA": "equity",
     "EQUREG": "equity",
     "FNDETF": "etf",
-    "OTHOTH": np.nan,
+    "OTHOTH": None,
     "STROTH": "etf",
     "STRPRT": "etf",
 }
@@ -28,7 +28,7 @@ def parse(import_source):
     df = df.rename(columns=FIELD_MAP)
     df = df.replace([np.inf, -np.inf, np.nan], None)
     df["instrument_type"] = df["instrument_type"].apply(lambda x: ASSET_TYPE_MAP[x])
-    df = df.drop(columns=df.columns.difference(FIELD_MAP.values()))
+    df = df.drop(columns=df.columns.difference(FIELD_MAP.values())).astype(str)
     df["exchange"] = df["exchange"].apply(lambda x: {"operating_mic_code": x})
     df = df.dropna(subset="instrument_type")
     return {"data": df.to_dict("records")}

wbportfolio/import_export/parsers/vontobel/management_fees.py

@@ -3,9 +3,7 @@ from datetime import datetime
 
 import pandas as pd
 
-from wbportfolio.models import FeeProductPercentage, Fees
-
-from .utils import get_portfolio_id, get_product
+from wbportfolio.models import FeeProductPercentage, Fees, Product
 
 FIELD_MAP = {
     "Transaction_Date": "transaction_date",
@@ -27,11 +25,11 @@ def parse(import_source):
     data = []
     if not df.empty:
         df = df.rename(columns=FIELD_MAP)
-        df.linked_product = df.linked_product.apply(lambda x: get_product(x))
+        df.linked_product = df.linked_product.apply(lambda x: Product.objects.filter(identifier=x).first())
         df["transaction_date"] = pd.to_datetime(df["transaction_date"], dayfirst=True)
         df["book_date"] = pd.to_datetime(df["book_date"], dayfirst=True).dt.strftime("%Y-%m-%d")
         df["value_date"] = pd.to_datetime(df["value_date"], dayfirst=True).dt.strftime("%Y-%m-%d")
-        df["portfolio"] = df.linked_product.apply(lambda x: get_portfolio_id(x))
+        df["portfolio"] = df.linked_product.apply(lambda x: x.primary_portfolio if x else None)
         df["base_management_fees"] = df.apply(
             lambda row: float(
                 row["linked_product"].get_fees_percent(row["transaction_date"], FeeProductPercentage.Type.MANAGEMENT)

wbportfolio/import_export/parsers/vontobel/performance_fees.py

@@ -2,7 +2,7 @@ import pandas as pd
 
 from wbportfolio.models import Fees
 
-from .utils import get_perf_fee_isin, get_portfolio_id, get_product
+from .utils import get_perf_fee_isin
 
 FIELD_MAP = {
     "LastPriceDate": "transaction_date",
@@ -30,7 +30,6 @@ def parse(import_source):
         df["transaction_date"] = pd.to_datetime(df["transaction_date"], dayfirst=True).dt.strftime("%Y-%m-%d")
         df["value_date"] = pd.to_datetime(df["value_date"], dayfirst=True).dt.strftime("%Y-%m-%d")
         df = df.dropna(subset=["linked_product"])
-        df["portfolio"] = df.linked_product.apply(lambda x: get_portfolio_id(x))
-        df.linked_product = df.linked_product.apply(lambda x: get_product(x).id)
+        df.linked_product = df.linked_product.apply(lambda x: {"identifier": x})
         data = df.to_dict("records")
     return {"data": data}

wbportfolio/import_export/parsers/vontobel/trade.py

@@ -2,8 +2,6 @@ import pandas as pd
 
 from wbportfolio.models import Trade
 
-from .utils import get_portfolio_id
-
 FIELD_MAP = {
     "Transaction_Date": "transaction_date",
     "Trade_Date": "book_date",
@@ -30,7 +28,7 @@ def parse(import_source):
         df["book_date"] = pd.to_datetime(df["book_date"], dayfirst=True).dt.strftime("%Y-%m-%d")
         df["value_date"] = pd.to_datetime(df["value_date"], dayfirst=True).dt.strftime("%Y-%m-%d")
         df["transaction_subtype"] = df.shares.apply(lambda x: Trade.Type.SELL if x < 0 else Trade.Type.BUY)
-        df["portfolio"] = df["portfolio"].apply(lambda x: get_portfolio_id(x))
+        df["portfolio"] = df["portfolio"].apply(lambda x: {"instrument_type": "product", "identifier": str(x)})
         df = df.dropna(subset=["underlying_instrument__isin"])
 
         df["underlying_instrument__currency__key"] = df["currency__key"]

wbportfolio/import_export/parsers/vontobel/utils.py

@@ -1,15 +1,3 @@
-from wbportfolio.models import Product
-
-
-def get_product(identifier):
-    return Product.objects.filter(identifier=identifier).first()
-
-
-def get_portfolio_id(identifier):
-    if (product := get_product(identifier)) and (portfolio := product.primary_portfolio):
-        return portfolio.id
-
-
 def get_perf_fee_isin(source):
     default_perf_fee_isin = "CH0040602242"
     if source:

wbportfolio/locale/de/LC_MESSAGES/django.po

@@ -0,0 +1,197 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-05-20 09:31+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: wbportfolio/contrib/company_portfolio/configs/display.py:25
+#: wbportfolio/contrib/company_portfolio/configs/display.py:29
+msgid "AUM By Product"
+msgstr ""
+
+#: wbportfolio/contrib/company_portfolio/configs/display.py:44
+#: wbportfolio/contrib/company_portfolio/configs/display.py:48
+msgid "AUM"
+msgstr ""
+
+#: wbportfolio/contrib/company_portfolio/configs/display.py:84
+#: wbportfolio/contrib/company_portfolio/configs/display.py:88
+msgid "Asset Allocation"
+msgstr ""
+
+#: wbportfolio/contrib/company_portfolio/configs/display.py:103
+#: wbportfolio/contrib/company_portfolio/configs/display.py:107
+msgid "Geographic Focus"
+msgstr ""
+
+#: wbportfolio/contrib/company_portfolio/configs/display.py:124
+msgid "Customer Information"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:118
+msgid "The last share price of the product"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:127
+msgid "The number of shares computed through the Workbench"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:133
+msgid "The nominal value computed through the Workbench"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:140
+msgid ""
+"The number of shares externally provided through the Account holder. "
+"Initially set to the number of shares computed through the Workbench"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:148
+msgid ""
+"The nominal value externally provided through the Account holder. Initially "
+"set to the number of shares computed through the Workbench"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:155
+msgid "Account Reconciliation (Product)"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:156
+msgid "Account Reconciliation (Products)"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/reconciliations.py:19
+msgid "Approved By"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/reconciliations.py:22
+msgid "Approved Timestamp"
+msgstr ""
+
+#: wbportfolio/models/transactions/claim.py:338
+#: wbportfolio/models/transactions/claim.py:341
+#: wbportfolio/models/transactions/claim.py:344
+msgid "With this status, this has to be provided."
+msgstr ""
+
+#: wbportfolio/models/transactions/rebalancing.py:81
+msgid "Evaluation Frequency"
+msgstr ""
+
+#: wbportfolio/models/transactions/rebalancing.py:82
+msgid "The Evaluation Frequency in RRULE format"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:473
+msgid "All trades need to be draft before submitting"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:482
+msgid "There is no valid trade on this proposal"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:550
+msgid "The portfolio does not allow manual rebalanced"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:553
+msgid ""
+"At least one trade needs to be submitted to be able to approve this proposal"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:557
+msgid ""
+"The portfolio needs to be a model portfolio in order to approve this trade "
+"proposal manually"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:560
+msgid "The pre trades rules did not passed successfully"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:592
+msgid ""
+"At least one trade needs to be submitted to be able to deny this proposal"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:671
+msgid ""
+"The portfolio needs to be a model portfolio in order to revert this trade "
+"proposal manually"
+msgstr ""
+
+#: wbportfolio/models/transactions/trades.py:324
+msgid "Cannot execute a trade without a valid quote price"
+msgstr ""
+
+#: wbportfolio/models/transactions/trades.py:327
+msgid ""
+"The portfolio needs to be a model portfolio in order to execute this trade "
+"manually"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/portfolios.py:105
+msgid "Linked Instruments"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/portfolios.py:112
+msgid "Dependency Portfolios"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/portfolios.py:119
+msgid "Preferred Classification"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:26
+#: wbportfolio/viewsets/configs/display/products.py:156
+msgid "Information"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:62
+msgid "Performance"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:144
+msgid "Classifications"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:148
+msgid "Fees"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:166
+msgid "White Label Customers"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:170
+msgid "Portfolios"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:173
+msgid "Related Instruments"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:178
+msgid "Index"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:180
+msgid "Roles"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:183
+msgid "Preferred Classification per Instrument"
+msgstr ""

wbportfolio/locale/fr/LC_MESSAGES/django.po

@@ -0,0 +1,197 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-05-20 09:32+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: wbportfolio/contrib/company_portfolio/configs/display.py:25
+#: wbportfolio/contrib/company_portfolio/configs/display.py:29
+msgid "AUM By Product"
+msgstr ""
+
+#: wbportfolio/contrib/company_portfolio/configs/display.py:44
+#: wbportfolio/contrib/company_portfolio/configs/display.py:48
+msgid "AUM"
+msgstr ""
+
+#: wbportfolio/contrib/company_portfolio/configs/display.py:84
+#: wbportfolio/contrib/company_portfolio/configs/display.py:88
+msgid "Asset Allocation"
+msgstr ""
+
+#: wbportfolio/contrib/company_portfolio/configs/display.py:103
+#: wbportfolio/contrib/company_portfolio/configs/display.py:107
+msgid "Geographic Focus"
+msgstr ""
+
+#: wbportfolio/contrib/company_portfolio/configs/display.py:124
+msgid "Customer Information"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:118
+msgid "The last share price of the product"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:127
+msgid "The number of shares computed through the Workbench"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:133
+msgid "The nominal value computed through the Workbench"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:140
+msgid ""
+"The number of shares externally provided through the Account holder. "
+"Initially set to the number of shares computed through the Workbench"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:148
+msgid ""
+"The nominal value externally provided through the Account holder. Initially "
+"set to the number of shares computed through the Workbench"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:155
+msgid "Account Reconciliation (Product)"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:156
+msgid "Account Reconciliation (Products)"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/reconciliations.py:19
+msgid "Approved By"
+msgstr ""
+
+#: wbportfolio/models/reconciliations/reconciliations.py:22
+msgid "Approved Timestamp"
+msgstr ""
+
+#: wbportfolio/models/transactions/claim.py:338
+#: wbportfolio/models/transactions/claim.py:341
+#: wbportfolio/models/transactions/claim.py:344
+msgid "With this status, this has to be provided."
+msgstr ""
+
+#: wbportfolio/models/transactions/rebalancing.py:81
+msgid "Evaluation Frequency"
+msgstr ""
+
+#: wbportfolio/models/transactions/rebalancing.py:82
+msgid "The Evaluation Frequency in RRULE format"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:473
+msgid "All trades need to be draft before submitting"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:482
+msgid "There is no valid trade on this proposal"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:550
+msgid "The portfolio does not allow manual rebalanced"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:553
+msgid ""
+"At least one trade needs to be submitted to be able to approve this proposal"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:557
+msgid ""
+"The portfolio needs to be a model portfolio in order to approve this trade "
+"proposal manually"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:560
+msgid "The pre trades rules did not passed successfully"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:592
+msgid ""
+"At least one trade needs to be submitted to be able to deny this proposal"
+msgstr ""
+
+#: wbportfolio/models/transactions/trade_proposals.py:671
+msgid ""
+"The portfolio needs to be a model portfolio in order to revert this trade "
+"proposal manually"
+msgstr ""
+
+#: wbportfolio/models/transactions/trades.py:324
+msgid "Cannot execute a trade without a valid quote price"
+msgstr ""
+
+#: wbportfolio/models/transactions/trades.py:327
+msgid ""
+"The portfolio needs to be a model portfolio in order to execute this trade "
+"manually"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/portfolios.py:105
+msgid "Linked Instruments"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/portfolios.py:112
+msgid "Dependency Portfolios"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/portfolios.py:119
+msgid "Preferred Classification"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:26
+#: wbportfolio/viewsets/configs/display/products.py:156
+msgid "Information"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:62
+msgid "Performance"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:144
+msgid "Classifications"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:148
+msgid "Fees"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:166
+msgid "White Label Customers"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:170
+msgid "Portfolios"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:173
+msgid "Related Instruments"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:178
+msgid "Index"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:180
+msgid "Roles"
+msgstr ""
+
+#: wbportfolio/viewsets/configs/display/products.py:183
+msgid "Preferred Classification per Instrument"
+msgstr ""

wbportfolio/models/portfolio.py

@@ -429,6 +429,14 @@ class Portfolio(DeleteToDisableMixin, WBModel):
                 True,
                 True,
             ),
+            create_notification_type(
+                "wbportfolio.portfolio.replay_done",
+                "Portfolio Replay finished",
+                "Sends a notification when a the requested trade proposal replay is done",
+                True,
+                True,
+                True,
+            ),
         ]
 
     def is_active_at_date(self, val_date: date) -> bool:

wbportfolio/models/transactions/trade_proposals.py

@@ -12,8 +12,10 @@ from django.utils.translation import gettext_lazy as _
 from django_fsm import FSMField, transition
 from pandas._libs.tslibs.offsets import BDay
 from wbcompliance.models.risk_management.mixins import RiskCheckMixin
+from wbcore.contrib.authentication.models import User
 from wbcore.contrib.currency.models import Currency
 from wbcore.contrib.icons import WBIcon
+from wbcore.contrib.notifications.dispatch import send_notification
 from wbcore.enums import RequestType
 from wbcore.metadata.configs.buttons import ActionButton
 from wbcore.models import WBModel
@@ -313,6 +315,11 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
             positions, overriding_trade_proposal = self.portfolio.drift_weights(
                 last_trade_proposal.trade_date, next_trade_date
             )
+            self.portfolio.assets.filter(
+                date__gt=last_trade_proposal.trade_date, date__lte=next_trade_date, is_estimated=False
+            ).update(
+                is_estimated=True
+            )  # ensure that we reset non estimated position leftover to estimated between trade proposal during replay
             self.portfolio.bulk_create_positions(
                 positions, delete_leftovers=True, compute_metrics=False, evaluate_rebalancer=False
             )
@@ -542,7 +549,7 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
             AssetPositionIterator(self.portfolio).add(assets), evaluate_rebalancer=False, force_save=True
         )
         if replay and self.portfolio.is_manageable:
-            replay_as_task.delay(self.id)
+            replay_as_task.delay(self.id, user_id=by.id if by else None)
 
     def can_approve(self):
         errors = dict()
@@ -646,23 +653,13 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
         with suppress(KeyError):
             del self.__dict__["validated_trading_service"]
         trades = []
-        assets = []
+        self.portfolio.assets.filter(
+            date=self.trade_date, is_estimated=False
+        ).delete()  # we delete the existing portfolio as it has been reverted
         for trade in self.trades.all():
             trade.status = Trade.Status.DRAFT
             trades.append(trade)
-            with suppress(AssetPosition.DoesNotExist):
-                asset = AssetPosition.unannotated_objects.get(
-                    underlying_quote=trade.underlying_instrument,
-                    portfolio=trade.portfolio,
-                    date=trade.transaction_date,
-                    is_estimated=False,
-                )
-                asset.set_weighting(asset.weighting - trade.weighting)
-                assets.append(asset)
         Trade.objects.bulk_update(trades, ["status"])
-        self.portfolio.bulk_create_positions(
-            AssetPositionIterator(self.portfolio).add(assets), evaluate_rebalancer=False, force_save=True
-        )
 
     def can_revert(self):
         errors = dict()
@@ -692,6 +689,16 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
 
 
 @shared_task(queue="portfolio")
-def replay_as_task(trade_proposal_id):
+def replay_as_task(trade_proposal_id, user_id: int | None = None):
     trade_proposal = TradeProposal.objects.get(id=trade_proposal_id)
     trade_proposal.replay()
+    if user_id:
+        user = User.objects.get(id=user_id)
+        send_notification(
+            code="wbportfolio.portfolio.replay_done",
+            title="Trade Proposal Replay Completed",
+            body=f'We’ve successfully replayed your trade proposal for "{trade_proposal.portfolio}" from {trade_proposal.trade_date:%Y-%m-%d}. You can now review its updated composition.',
+            user=user,
+            reverse_name="wbportfolio:portfolio-detail",
+            reverse_args=[trade_proposal.portfolio.id],
+        )

wbportfolio/models/transactions/trades.py

@@ -536,9 +536,15 @@ class Trade(ShareMixin, Transaction, OrderedModel, WBModel):
                     self.transaction_subtype = Trade.Type.REDEMPTION
         elif self.weighting is not None:
             if self.weighting > 0:
-                self.transaction_subtype = Trade.Type.BUY
+                if self._effective_weight:
+                    self.transaction_subtype = Trade.Type.INCREASE
+                else:
+                    self.transaction_subtype = Trade.Type.BUY
             elif self.weighting < 0:
-                self.transaction_subtype = Trade.Type.SELL
+                if self._target_weight:
+                    self.transaction_subtype = Trade.Type.DECREASE
+                else:
+                    self.transaction_subtype = Trade.Type.SELL
         else:
             self.transaction_subtype = Trade.Type.REBALANCE
 

wbportfolio/serializers/signals.py

@@ -140,7 +140,7 @@ def claim_adding_additional_resource(sender, serializer, instance, request, user
     start = current_quarter_date_start()
     return {
         "claims": reverse("wbportfolio:entry-claim-list", args=[instance.id], request=request),
-        "aum": f'{reverse("wbportfolio:aumtable-list", args=[], request=request)}?group_by=PRODUCT&account_owner={instance.id}&date_gte={start:%Y-%m-%d}&date_lte={date.today():%Y-%m-%d}',
+        "aum": f'{reverse("wbportfolio:aumtable-list", args=[], request=request)}?group_by=PRODUCT&account_owner={instance.id}&date={start:%Y-%m-%d},{date.today():%Y-%m-%d}',
     }
 
 

wbportfolio/serializers/transactions/trades.py

@@ -4,6 +4,7 @@ from decimal import Decimal
 from rest_framework import serializers
 from rest_framework.reverse import reverse
 from wbcore import serializers as wb_serializers
+from wbcore.metadata.configs.display.list_display import BaseTreeGroupLevelOption
 from wbfdm.models import Instrument
 from wbfdm.serializers import InvestableInstrumentRepresentationSerializer
 from wbfdm.serializers.instruments.instruments import CompanyRepresentationSerializer, SecurityRepresentationSerializer
@@ -270,6 +271,7 @@ class TradeTradeProposalModelSerializer(TradeModelSerializer):
         source="underlying_instrument",
         optional_get_parameters={"security": "parent"},
         depends_on=[{"field": "security", "options": {}}],
+        tree_config=BaseTreeGroupLevelOption(clear_filter=True, filter_key="parent"),
     )
 
     status = wb_serializers.ChoiceField(default=Trade.Status.DRAFT, choices=Trade.Status.choices)