wbportfolio 1.52.4__py2.py3-none-any.whl → 1.52.6__py2.py3-none-any.whl

wbportfolio/serializers/transactions/trade_proposals.py

@@ -1,3 +1,5 @@
+from decimal import Decimal
+
 from django.contrib.messages import warning
 from django.core.exceptions import ValidationError
 from rest_framework.reverse import reverse
@@ -16,6 +18,17 @@ class TradeProposalModelSerializer(wb_serializers.ModelSerializer):
         queryset=Portfolio.objects.all(), write_only=True, required=False, default=DefaultFromView("portfolio")
     )
     _target_portfolio = PortfolioRepresentationSerializer(source="target_portfolio")
+    total_cash_weight = wb_serializers.DecimalField(
+        default=0,
+        decimal_places=4,
+        max_digits=5,
+        write_only=True,
+        required=False,
+        precision=4,
+        percent=True,
+        label="Target Cash",
+        help_text="Enter the desired percentage for the cash component. The remaining percentage (100% minus this value) will be allocated to total target weighting. Default is 0%.",
+    )
 
     trade_date = wb_serializers.DateField(
         read_only=lambda view: not view.new_mode, default=DefaultFromView("default_trade_date")
@@ -23,6 +36,7 @@ class TradeProposalModelSerializer(wb_serializers.ModelSerializer):
 
     def create(self, validated_data):
         target_portfolio = validated_data.pop("target_portfolio", None)
+        total_cash_weight = validated_data.pop("total_cash_weight", Decimal("0.0"))
         rebalancing_model = validated_data.get("rebalancing_model", None)
         if request := self.context.get("request"):
             validated_data["creator"] = request.user.profile
@@ -32,7 +46,9 @@ class TradeProposalModelSerializer(wb_serializers.ModelSerializer):
         if target_portfolio and not rebalancing_model and (last_effective_date := obj.last_effective_date):
             target_portfolio_dto = target_portfolio._build_dto(last_effective_date)
         try:
-            obj.reset_trades(target_portfolio=target_portfolio_dto)
+            obj.reset_trades(
+                target_portfolio=target_portfolio_dto, total_target_weight=Decimal("1.0") - total_cash_weight
+            )
         except ValidationError as e:
             if request := self.context.get("request"):
                 warning(request, str(e), extra_tags="auto_close=0")
@@ -60,6 +76,7 @@ class TradeProposalModelSerializer(wb_serializers.ModelSerializer):
         fields = (
             "id",
             "trade_date",
+            "total_cash_weight",
             "comment",
             "status",
             "portfolio",

wbportfolio/serializers/transactions/trades.py

@@ -320,6 +320,16 @@ class TradeTradeProposalModelSerializer(TradeModelSerializer):
     effective_shares = wb_serializers.DecimalField(read_only=True, max_digits=16, decimal_places=6, default=0)
     target_shares = wb_serializers.DecimalField(read_only=True, max_digits=16, decimal_places=6, default=0)
 
+    total_value_fx_portfolio = wb_serializers.DecimalField(read_only=True, max_digits=16, decimal_places=2, default=0)
+    effective_total_value_fx_portfolio = wb_serializers.DecimalField(
+        read_only=True, max_digits=16, decimal_places=2, default=0
+    )
+    target_total_value_fx_portfolio = wb_serializers.DecimalField(
+        read_only=True, max_digits=16, decimal_places=2, default=0
+    )
+
+    portfolio_currency = wb_serializers.CharField(read_only=True)
+
     def validate(self, data):
         data.pop("company", None)
         data.pop("security", None)
@@ -331,6 +341,8 @@ class TradeTradeProposalModelSerializer(TradeModelSerializer):
             )
         effective_weight = self.instance._effective_weight if self.instance else Decimal(0.0)
         weighting = data.get("weighting", self.instance.weighting if self.instance else Decimal(0.0))
+        if (target_weight := data.pop("target_weight", None)) is not None:
+            weighting = target_weight - effective_weight
         if (target_weight := data.pop("target_weight", None)) is not None:
             weighting = target_weight - effective_weight
         if weighting >= 0:
@@ -343,14 +355,25 @@ class TradeTradeProposalModelSerializer(TradeModelSerializer):
     class Meta:
         model = Trade
         percent_fields = ["effective_weight", "target_weight", "weighting"]
+        decorators = {
+            "total_value_fx_portfolio": wb_serializers.decorator(
+                decorator_type="text", position="left", value="{{portfolio_currency}}"
+            ),
+            "effective_total_value_fx_portfolio": wb_serializers.decorator(
+                decorator_type="text", position="left", value="{{portfolio_currency}}"
+            ),
+            "target_total_value_fx_portfolio": wb_serializers.decorator(
+                decorator_type="text", position="left", value="{{portfolio_currency}}"
+            ),
+        }
         read_only_fields = (
             "transaction_subtype",
             "shares",
-            # "underlying_instrument",
-            # "_underlying_instrument",
-            "shares",
             "effective_shares",
             "target_shares",
+            "total_value_fx_portfolio",
+            "effective_total_value_fx_portfolio",
+            "target_total_value_fx_portfolio",
         )
         fields = (
             "id",
@@ -375,6 +398,10 @@ class TradeTradeProposalModelSerializer(TradeModelSerializer):
             "order",
             "effective_shares",
             "target_shares",
+            "total_value_fx_portfolio",
+            "effective_total_value_fx_portfolio",
+            "target_total_value_fx_portfolio",
+            "portfolio_currency",
         )
 
 

wbportfolio/tests/models/transactions/test_trade_proposals.py

@@ -66,11 +66,11 @@ class TestTradeProposal:
         validated_trading_service = trade_proposal.validated_trading_service
 
         # Assert effective and target portfolios are as expected
-        assert validated_trading_service.effective_portfolio.to_dict() == {
+        assert validated_trading_service._effective_portfolio.to_dict() == {
             a1.underlying_quote.id: a1.weighting,
             a2.underlying_quote.id: a2.weighting,
         }
-        assert validated_trading_service.target_portfolio.to_dict() == {
+        assert validated_trading_service._target_portfolio.to_dict() == {
             a1.underlying_quote.id: a1.weighting + t1.weighting,
             a2.underlying_quote.id: a2.weighting + t2.weighting,
         }
@@ -361,6 +361,8 @@ class TestTradeProposal:
         """
         portfolio = trade_proposal.portfolio
         instrument = instrument_factory.create(currency=portfolio.currency)
+        underlying_quote_price = instrument_price_factory.create(instrument=instrument, date=trade_proposal.trade_date)
+        mock_fct.return_value = Decimal(1_000_000)  # 1 million cash
         trade = trade_factory.create(
             trade_proposal=trade_proposal,
             transaction_date=trade_proposal.trade_date,
@@ -368,12 +370,12 @@ class TestTradeProposal:
             underlying_instrument=instrument,
         )
         trade.refresh_from_db()
-        underlying_quote_price = instrument_price_factory.create(instrument=instrument, date=trade.transaction_date)
-        mock_fct.return_value = Decimal(1_000_000)  # 1 million cash
 
         # Assert estimated shares are correctly calculated
         assert (
-            trade_proposal.get_estimated_shares(trade.weighting, trade.underlying_instrument)
+            trade_proposal.get_estimated_shares(
+                trade.weighting, trade.underlying_instrument, underlying_quote_price.net_value
+            )
             == Decimal(1_000_000) * trade.weighting / underlying_quote_price.net_value
         )
 

wbportfolio/tests/rebalancing/test_models.py

@@ -38,30 +38,24 @@ class TestModelPortfolioRebalancing:
     def model(self, portfolio, weekday):
         from wbportfolio.rebalancing.models import ModelPortfolioRebalancing
 
+        PortfolioPortfolioThroughModel.objects.create(
+            portfolio=portfolio,
+            dependency_portfolio=PortfolioFactory.create(),
+            type=PortfolioPortfolioThroughModel.Type.MODEL,
+        )
         return ModelPortfolioRebalancing(portfolio, (weekday + BDay(1)).date(), weekday)
 
     def test_is_valid(self, portfolio, weekday, model, asset_position_factory, instrument_price_factory):
         assert not model.is_valid()
         asset_position_factory.create(portfolio=model.portfolio, date=model.last_effective_date)
         assert not model.is_valid()
-        model_portfolio = PortfolioFactory.create()
-        PortfolioPortfolioThroughModel.objects.create(
-            portfolio=model.portfolio,
-            dependency_portfolio=model_portfolio,
-            type=PortfolioPortfolioThroughModel.Type.MODEL,
-        )
+
         a = asset_position_factory.create(portfolio=model.model_portfolio, date=model.last_effective_date)
         assert not model.is_valid()
         instrument_price_factory.create(instrument=a.underlying_quote, date=model.trade_date)
         assert model.is_valid()
 
     def test_get_target_portfolio(self, portfolio, weekday, model, asset_position_factory):
-        model_portfolio = PortfolioFactory.create()
-        PortfolioPortfolioThroughModel.objects.create(
-            portfolio=model.portfolio,
-            dependency_portfolio=model_portfolio,
-            type=PortfolioPortfolioThroughModel.Type.MODEL,
-        )
         asset_position_factory(portfolio=portfolio, date=model.last_effective_date)  # noise
         asset_position_factory(portfolio=portfolio, date=model.last_effective_date)  # noise
         a1 = asset_position_factory(weighting=0.8, portfolio=portfolio.model_portfolio, date=model.last_effective_date)
@@ -91,7 +85,7 @@ class TestCompositeRebalancing:
             transaction_date=model.last_effective_date,
             transaction_subtype=Trade.Type.BUY,
             trade_proposal=trade_proposal,
-            weighting=0.7,
+            weighting=Decimal(0.7),
             status=Trade.Status.EXECUTED,
         )
         TradeFactory.create(
@@ -99,7 +93,7 @@ class TestCompositeRebalancing:
             transaction_date=model.last_effective_date,
             transaction_subtype=Trade.Type.BUY,
             trade_proposal=trade_proposal,
-            weighting=0.3,
+            weighting=Decimal(0.3),
             status=Trade.Status.EXECUTED,
         )
         assert not model.is_valid()
@@ -117,7 +111,7 @@ class TestCompositeRebalancing:
             transaction_date=model.last_effective_date,
             transaction_subtype=Trade.Type.BUY,
             trade_proposal=trade_proposal,
-            weighting=0.8,
+            weighting=Decimal(0.8),
             status=Trade.Status.EXECUTED,
         )
         t2 = TradeFactory.create(
@@ -125,7 +119,7 @@ class TestCompositeRebalancing:
             transaction_date=model.last_effective_date,
             transaction_subtype=Trade.Type.BUY,
             trade_proposal=trade_proposal,
-            weighting=0.2,
+            weighting=Decimal(0.2),
             status=Trade.Status.EXECUTED,
         )
         target_portfolio = model.get_target_portfolio()

wbportfolio/viewsets/assets.py

@@ -478,9 +478,7 @@ class AssetPositionUnderlyingInstrumentChartViewSet(UserPortfolioRequestPermissi
     filterset_class = AssetPositionUnderlyingInstrumentChartFilter
 
     def get_queryset(self):
-        return AssetPosition.objects.filter(
-            underlying_instrument__in=self.instrument.get_descendants(include_self=True)
-        )
+        return AssetPosition.objects.filter(underlying_quote__in=self.instrument.get_descendants(include_self=True))
 
     def get_plotly(self, queryset):
         fig = make_subplots(specs=[[{"secondary_y": True}]])

wbportfolio/viewsets/configs/buttons/trade_proposals.py

@@ -1,7 +1,13 @@
+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.view_config import ButtonViewConfig
+from wbcore.metadata.configs.display import create_simple_display
+
+
+class NormalizeSerializer(wb_serializers.Serializer):
+    total_cash_weight = wb_serializers.FloatField(default=0, precision=4, percent=True)
 
 
 class TradeProposalButtonConfig(ButtonViewConfig):
@@ -41,10 +47,12 @@ class TradeProposalButtonConfig(ButtonViewConfig):
                         icon=WBIcon.EDIT.icon,
                         label="Normalize Trades",
                         description_fields="""
-                            <p>Make sure all trades normalize to a total target weight of 100%</p>
+                            <p>Make sure all trades normalize to a total target weight of (100 - {{total_cash_weight}})%</p>
                             """,
                         action_label="Normalize Trades",
                         title="Normalize Trades",
+                        serializer=NormalizeSerializer,
+                        instance_display=create_simple_display([["total_cash_weight"]]),
                     ),
                     bt.ActionButton(
                         method=RequestType.PATCH,

wbportfolio/viewsets/configs/display/trade_proposals.py

@@ -77,11 +77,12 @@ class TradeProposalDisplayConfig(DisplayViewConfig):
                     layouts={
                         default(): Layout(
                             grid_template_areas=[
-                                ["status", "status", "status"],
-                                ["trade_date", "rebalancing_model", "target_portfolio"]
+                                ["status", "status"],
+                                ["trade_date", "total_cash_weight"],
+                                ["rebalancing_model", "target_portfolio"]
                                 if self.view.new_mode
-                                else ["trade_date", "rebalancing_model", "rebalancing_model"],
-                                ["comment", "comment", "comment"],
+                                else ["rebalancing_model", "rebalancing_model"],
+                                ["comment", "comment"],
                             ],
                         ),
                     },

wbportfolio/viewsets/configs/display/trades.py

@@ -357,6 +357,42 @@ class TradeTradeProposalDisplayConfig(DisplayViewConfig):
                     ],
                 )
             )
+            fields.append(
+                dp.Field(
+                    label="Total Value",
+                    open_by_default=False,
+                    key=None,
+                    children=[
+                        dp.Field(
+                            key="effective_total_value_fx_portfolio",
+                            label="Effective Total Value",
+                            show="open",
+                            width=Unit.PIXEL(150),
+                        ),
+                        dp.Field(
+                            key="target_total_value_fx_portfolio",
+                            label="Target Total Value",
+                            show="open",
+                            width=Unit.PIXEL(150),
+                        ),
+                        dp.Field(
+                            key="total_value_fx_portfolio",
+                            label="Total Value",
+                            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",

wbportfolio/viewsets/transactions/trade_proposals.py

@@ -1,5 +1,6 @@
 from contextlib import suppress
 from datetime import date
+from decimal import Decimal
 
 from django.contrib.messages import info, warning
 from django.shortcuts import get_object_or_404
@@ -106,8 +107,9 @@ class TradeProposalModelViewSet(CloneMixin, RiskCheckViewSetMixin, InternalUserP
     @action(detail=True, methods=["PATCH"])
     def normalize(self, request, pk=None):
         trade_proposal = get_object_or_404(TradeProposal, pk=pk)
+        total_cash_weight = Decimal(request.data.get("total_cash_weight", Decimal("0.0")))
         if trade_proposal.status == TradeProposal.Status.DRAFT:
-            trade_proposal.normalize_trades()
+            trade_proposal.normalize_trades(total_target_weight=Decimal("1.0") - total_cash_weight)
             return Response({"send": True})
         return Response({"status": "Trade proposal is not Draft"}, status=status.HTTP_400_BAD_REQUEST)
 

wbportfolio/viewsets/transactions/trades.py

@@ -25,7 +25,6 @@ from wbcore.permissions.permissions import InternalUserPermissionMixin
 from wbcore.utils.strings import format_number
 from wbcore.viewsets.mixins import OrderableMixin
 from wbcrm.models import Account
-from wbfdm.models import Cash
 
 from wbportfolio.filters import (
     SubscriptionRedemptionFilterSet,
@@ -395,6 +394,10 @@ class TradeTradeProposalModelViewSet(
     def trade_proposal(self):
         return get_object_or_404(TradeProposal, pk=self.kwargs["trade_proposal_id"])
 
+    @cached_property
+    def portfolio_total_asset_value(self):
+        return self.trade_proposal.portfolio_total_asset_value
+
     def has_import_permission(self, request) -> bool:  # allow import only on draft trade proposal
         return super().has_import_permission(request) and self.trade_proposal.status == TradeProposal.Status.DRAFT
 
@@ -409,46 +412,36 @@ class TradeTradeProposalModelViewSet(
     def get_aggregates(self, queryset, *args, **kwargs):
         agg = {}
         if queryset.exists():
-            cash_target_position = self.trade_proposal.get_estimated_target_cash(
-                self.trade_proposal.portfolio.currency
-            )
-            cash_target_cash_weight, cash_target_cash_shares = (
-                cash_target_position.weighting,
-                cash_target_position.initial_shares,
-            )
-            extra_existing_cash_components = Cash.objects.filter(
-                id__in=self.trade_proposal.trades.filter(underlying_instrument__is_cash=True).values(
-                    "underlying_instrument"
-                )
-            ).exclude(currency=self.trade_proposal.portfolio.currency)
-
-            for cash_component in extra_existing_cash_components:
-                extra_cash_position = self.trade_proposal.get_estimated_target_cash(cash_component.currency)
-                cash_target_cash_weight += extra_cash_position.weighting
-                cash_target_cash_shares += extra_cash_position.initial_shares
             noncash_aggregates = queryset.filter(underlying_instrument__is_cash=False).aggregate(
                 sum_target_weight=Sum(F("target_weight")),
                 sum_effective_weight=Sum(F("effective_weight")),
-                sum_target_shares=Sum(F("target_shares")),
-                sum_effective_shares=Sum(F("effective_shares")),
-            )
-            cash_aggregates = queryset.filter(underlying_instrument__is_cash=True).aggregate(
-                sum_effective_weight=Sum(F("effective_weight")),
-                sum_effective_shares=Sum(F("effective_shares")),
+                sum_target_total_value_fx_portfolio=Sum(F("target_total_value_fx_portfolio")),
+                sum_effective_total_value_fx_portfolio=Sum(F("effective_total_value_fx_portfolio")),
             )
+
             # weights aggregates
-            cash_sum_effective_weight = cash_aggregates["sum_effective_weight"] or Decimal(0)
+            cash_sum_effective_weight = Decimal("1.0") - 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)
             sum_buy_weight = queryset.filter(weighting__gte=0).aggregate(s=Sum(F("weighting")))["s"] or Decimal(0)
             sum_sell_weight = queryset.filter(weighting__lt=0).aggregate(s=Sum(F("weighting")))["s"] or Decimal(0)
 
             # shares aggregates
-            cash_sum_effective_shares = cash_aggregates["sum_effective_shares"] or Decimal(0)
-            noncash_sum_effective_shares = noncash_aggregates["sum_effective_shares"] or Decimal(0)
-            noncash_sum_target_shares = noncash_aggregates["sum_target_shares"] or Decimal(0)
-            sum_buy_shares = queryset.filter(shares__gte=0).aggregate(s=Sum(F("shares")))["s"] or Decimal(0)
-            sum_sell_shares = queryset.filter(shares__lt=0).aggregate(s=Sum(F("shares")))["s"] or Decimal(0)
+            cash_sum_effective_total_value_fx_portfolio = cash_sum_effective_weight * self.portfolio_total_asset_value
+            cash_sum_target_total_value_fx_portfolio = cash_sum_target_cash_weight * self.portfolio_total_asset_value
+            noncash_sum_effective_total_value_fx_portfolio = noncash_aggregates[
+                "sum_effective_total_value_fx_portfolio"
+            ] or Decimal(0)
+            noncash_sum_target_total_value_fx_portfolio = noncash_aggregates[
+                "sum_target_total_value_fx_portfolio"
+            ] or Decimal(0)
+            sum_buy_total_value_fx_portfolio = queryset.filter(total_value_fx_portfolio__gte=0).aggregate(
+                s=Sum(F("total_value_fx_portfolio"))
+            )["s"] or Decimal(0)
+            sum_sell_total_value_fx_portfolio = queryset.filter(total_value_fx_portfolio__lt=0).aggregate(
+                s=Sum(F("total_value_fx_portfolio"))
+            )["s"] or Decimal(0)
 
             agg = {
                 "effective_weight": {
@@ -457,29 +450,38 @@ class TradeTradeProposalModelViewSet(
                     "Total": format_number(noncash_sum_effective_weight + cash_sum_effective_weight, decimal=6),
                 },
                 "target_weight": {
-                    "Cash": format_number(cash_target_cash_weight, decimal=6),
+                    "Cash": format_number(cash_sum_target_cash_weight, decimal=6),
                     "Non-Cash": format_number(noncash_sum_target_weight, decimal=6),
-                    "Total": format_number(cash_target_cash_weight + noncash_sum_target_weight, decimal=6),
+                    "Total": format_number(cash_sum_target_cash_weight + noncash_sum_target_weight, decimal=6),
                 },
-                "effective_shares": {
-                    "Cash": format_number(cash_sum_effective_shares, decimal=6),
-                    "Non-Cash": format_number(noncash_sum_effective_shares, decimal=6),
-                    "Total": format_number(cash_sum_effective_shares + noncash_sum_effective_shares, decimal=6),
+                "effective_total_value_fx_portfolio": {
+                    "Cash": format_number(cash_sum_effective_total_value_fx_portfolio, decimal=6),
+                    "Non-Cash": format_number(noncash_sum_effective_total_value_fx_portfolio, decimal=6),
+                    "Total": format_number(
+                        cash_sum_effective_total_value_fx_portfolio + noncash_sum_effective_total_value_fx_portfolio,
+                        decimal=6,
+                    ),
                 },
-                "target_shares": {
-                    "Cash": format_number(cash_target_cash_shares, decimal=6),
-                    "Non-Cash": format_number(noncash_sum_target_shares, decimal=6),
-                    "Total": format_number(cash_target_cash_shares + noncash_sum_target_shares, decimal=6),
+                "target_total_value_fx_portfolio": {
+                    "Cash": format_number(cash_sum_target_total_value_fx_portfolio, decimal=6),
+                    "Non-Cash": format_number(noncash_sum_target_total_value_fx_portfolio, decimal=6),
+                    "Total": format_number(
+                        cash_sum_target_total_value_fx_portfolio + noncash_sum_target_total_value_fx_portfolio,
+                        decimal=6,
+                    ),
                 },
                 "weighting": {
-                    "Cash Flow": format_number(cash_sum_effective_weight - cash_target_cash_weight, decimal=6),
+                    "Cash Flow": format_number(cash_sum_target_cash_weight - cash_sum_effective_weight, decimal=6),
                     "Buy": format_number(sum_buy_weight, decimal=6),
                     "Sell": format_number(sum_sell_weight, decimal=6),
                 },
-                "shares": {
-                    "Cash Flow": format_number(cash_sum_effective_shares - cash_target_cash_shares, decimal=6),
-                    "Buy": format_number(sum_buy_shares, decimal=6),
-                    "Sell": format_number(sum_sell_shares, decimal=6),
+                "total_value_fx_portfolio": {
+                    "Cash Flow": format_number(
+                        cash_sum_target_total_value_fx_portfolio - cash_sum_effective_total_value_fx_portfolio,
+                        decimal=6,
+                    ),
+                    "Buy": format_number(sum_buy_total_value_fx_portfolio, decimal=6),
+                    "Sell": format_number(sum_sell_total_value_fx_portfolio, decimal=6),
                 },
             }
 
@@ -509,6 +511,7 @@ class TradeTradeProposalModelViewSet(
             qs = super().get_queryset().filter(trade_proposal=self.kwargs["trade_proposal_id"]).annotate_base_info()
         else:
             qs = TradeProposal.objects.none()
+
         return qs.annotate(
             underlying_instrument_isin=F("underlying_instrument__isin"),
             underlying_instrument_ticker=F("underlying_instrument__ticker"),
@@ -520,4 +523,7 @@ class TradeTradeProposalModelViewSet(
                 ),
                 default=F("underlying_instrument__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"),
         )

{wbportfolio-1.52.4.dist-info → wbportfolio-1.52.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbportfolio
-Version: 1.52.4
+Version: 1.52.6
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 License-File: LICENSE
 Requires-Dist: cryptography==3.4.*

{wbportfolio-1.52.4.dist-info → wbportfolio-1.52.6.dist-info}/RECORD

@@ -250,11 +250,11 @@ wbportfolio/migrations/0077_remove_transaction_currency_and_more.py,sha256=Yf4a3
 wbportfolio/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/models/__init__.py,sha256=HSpa5xwh_MHQaBpNrq9E0CbdEE5Iq-pDLIsPzZ-TRTg,904
 wbportfolio/models/adjustments.py,sha256=osXWkJZOiansPWYPyHtl7Z121zDWi7u1YMtrBQtbHVo,10272
-wbportfolio/models/asset.py,sha256=MgEdE1AZQAxHDQX6iVCr1zD9QbsIn95OQzOHoTKjAEg,45446
+wbportfolio/models/asset.py,sha256=WwbLjpGHzz17yJxrkuTP4MbErqcTJMlKkDrQI92p5II,45490
 wbportfolio/models/custodians.py,sha256=owTiS2Vm5CRKzh9M_P9GOVg-s-ndQ9UvRmw3yZP7cw0,3815
 wbportfolio/models/exceptions.py,sha256=3ix0tWUO-O6jpz8f07XIwycw2x3JFRoWzjwil8FVA2Q,52
 wbportfolio/models/indexes.py,sha256=gvW4K9U9Bj8BmVCqFYdWiXvDWhjHINRON8XhNsZUiQY,639
-wbportfolio/models/portfolio.py,sha256=afk2XnVxMIiAmLPrDIGDbeOyhvdDzXs7K-MCaUKKKyc,56275
+wbportfolio/models/portfolio.py,sha256=yQ8cqAZLOMwsiejC9RzOLoqLDV5q5ZWYWMOc2BlcHdw,56281
 wbportfolio/models/portfolio_cash_flow.py,sha256=uElG7IJUBY8qvtrXftOoskX6EA-dKgEG1JJdvHeWV7g,7336
 wbportfolio/models/portfolio_cash_targets.py,sha256=WmgG-etPisZsh2yaFQpz7EkpvAudKBEzqPsO715w52U,1498
 wbportfolio/models/portfolio_relationship.py,sha256=ZGECiPZiLdlk4uSamOrEfuzO0hduK6OMKJLUSnh5_kc,5190
@@ -281,16 +281,16 @@ wbportfolio/models/transactions/claim.py,sha256=SF2FlwG6SRVmA_hT0NbXah5-fYejccWK
 wbportfolio/models/transactions/dividends.py,sha256=mmOdGWR35yndUMoCuG24Y6BdtxDhSk2gMQ-8LVguqzg,1890
 wbportfolio/models/transactions/fees.py,sha256=wJtlzbBCAq1UHvv0wqWTE2BEjCF5RMtoaSDS3kODFRo,7112
 wbportfolio/models/transactions/rebalancing.py,sha256=obzgewWKOD4kJbCoF5fhtfDk502QkbrjPKh8T9KDGew,7355
-wbportfolio/models/transactions/trade_proposals.py,sha256=b1VbgR91-3LFq08iNnafcTjvsDboimU7ZRpf5jtQk7w,32234
-wbportfolio/models/transactions/trades.py,sha256=wTOa0Wu4OejO3CeeJnwvPzoDUVWMsHRbyEA7QllaLRs,31231
+wbportfolio/models/transactions/trade_proposals.py,sha256=Jd7rfiE42Qtqp9VXQ448OF9m_DKoFR8ISjSh-1TDi8o,31592
+wbportfolio/models/transactions/trades.py,sha256=og8R4Sg7LCRQsuX09uYjZXq9q4VsUb0j8W8iCTyx0pQ,31571
 wbportfolio/models/transactions/transactions.py,sha256=XTcUeMUfkf5XTSZaR2UAyGqCVkOhQYk03_vzHLIgf8Q,3807
 wbportfolio/pms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbportfolio/pms/typing.py,sha256=b2pBWYt1E8ok-Kqm0lEFIakSnWJ6Ib57z-VX3C3gkQc,6081
+wbportfolio/pms/typing.py,sha256=qcqEs94HA7qNB631LErV7FVQ4ytYBLetuPDcilrnlW0,6798
 wbportfolio/pms/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/pms/analytics/portfolio.py,sha256=vE0KA6Z037bUdmBTkYuBqXElt80nuYObNzY_kWvxEZY,1360
 wbportfolio/pms/statistics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/pms/trading/__init__.py,sha256=R_yLKc54sCak8A1cW0O1Aszrcv5KV8mC_3h17Hr20e4,36
-wbportfolio/pms/trading/handler.py,sha256=EzvCP8NNzd0jjE3ilCupbmFBCaojKvlrbq7n_JirahU,7151
+wbportfolio/pms/trading/handler.py,sha256=ORvtwAG2VX1GvNvNE2HnDvS-4UNrgBwCMPydnfphtY0,5992
 wbportfolio/rebalancing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/rebalancing/base.py,sha256=NwTGZtBm1f35gj5Jp6iTyyFvDT1GSIztN990cKBvYzQ,637
 wbportfolio/rebalancing/decorators.py,sha256=JhQ2vkcIuGBTGvNmpkQerdw2-vLq-RAb0KAPjOrETkw,515
@@ -298,7 +298,7 @@ wbportfolio/rebalancing/models/__init__.py,sha256=AQjG7Tu5vlmhqncVoYOjpBKU2UIvgo
 wbportfolio/rebalancing/models/composite.py,sha256=XEgK3oMurrE_d_l5uN0stBKRrtvnKQzRWyXNXuBYfmc,1818
 wbportfolio/rebalancing/models/equally_weighted.py,sha256=FCpSKOs49ckNYVgoYIiHB0BqPT9OeCMuFoet4Ixbp-Y,1210
 wbportfolio/rebalancing/models/market_capitalization_weighted.py,sha256=6ZsR8iJg6l89CsxHqoxJSXlTaj8Pmb8_bFPrXhnxaRs,5295
-wbportfolio/rebalancing/models/model_portfolio.py,sha256=DNg9vEDYDUwXTOnIpk26FQSPHC0qxkuvW2sJWX0VodQ,1489
+wbportfolio/rebalancing/models/model_portfolio.py,sha256=Dk3tw9u3WG1jCP3V2-R05GS4-DmDBBtxH4h6p7pRe4g,1393
 wbportfolio/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/reports/monthly_position_report.py,sha256=e7BzjDd6eseUOwLwQJXKvWErQ58YnCsznHU2VtR6izM,2981
 wbportfolio/risk_management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -346,8 +346,8 @@ wbportfolio/serializers/transactions/__init__.py,sha256=oAfidhjjCKP0exeHbzJgGuBd
 wbportfolio/serializers/transactions/claim.py,sha256=kC4E2RZRrpd9i8tGfoiV-gpWDk3ikR5F1Wf0v_IGIvw,11599
 wbportfolio/serializers/transactions/dividends.py,sha256=ADXf9cXe8rq55lC_a8vIzViGLmQ-yDXkgR54k2m-N0w,1814
 wbportfolio/serializers/transactions/fees.py,sha256=3mBzs6vdfST9roeQB-bmLJhipY7i5jBtAXjoTTE-GOg,2388
-wbportfolio/serializers/transactions/trade_proposals.py,sha256=fiGpL6za5ERLtdbud5wrciCVXHX6-3SjeF8Zaa6Zhzg,3410
-wbportfolio/serializers/transactions/trades.py,sha256=Rhv0UezIpnDxWmj5v9dQECfS0un7yQUIpnkOtD6z6YY,15452
+wbportfolio/serializers/transactions/trade_proposals.py,sha256=ufYBYiSttz5KAlAaaXbnf98oUFT_qNfxF_VUM4ClXE8,4072
+wbportfolio/serializers/transactions/trades.py,sha256=JtL2jrvIjBVsmB2N5ngw_1UyzK7BbxGK5yuNTCRSfkU,16815
 wbportfolio/static/wbportfolio/css/macro_review.css,sha256=FAVVO8nModxwPXcTKpcfzVxBGPZGJVK1Xn-0dkSfGyc,233
 wbportfolio/static/wbportfolio/markdown/documentation/account_holding_reconciliation.md,sha256=MabxOvOne8s5gl6osDoow6-3ghaXLAYg9THWpvy6G5I,921
 wbportfolio/static/wbportfolio/markdown/documentation/aggregate_asset_position_liquidity.md,sha256=HEgXB7uqmqfty-GBCCXYxrAN-teqmxWuqDLK_liKWVc,1090
@@ -387,12 +387,12 @@ wbportfolio/tests/models/transactions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 wbportfolio/tests/models/transactions/test_claim.py,sha256=NG3BKB-FVcIDgHSJHCjImxgMM3ISVUMl24xUPmEcPec,5570
 wbportfolio/tests/models/transactions/test_fees.py,sha256=tAp18x2wCNQr11LUnLtHNbBDbbX0v1DZnmW7i-cEi5Q,2423
 wbportfolio/tests/models/transactions/test_rebalancing.py,sha256=fZ5tx6kByEGXD6nhapYdvk9HOjYlmjhU2w6KlQJ6QE4,4061
-wbportfolio/tests/models/transactions/test_trade_proposals.py,sha256=UB8Dvs7nT42D_uznuLyzni7PYiY-dabLCDXmV2W_yb4,18928
+wbportfolio/tests/models/transactions/test_trade_proposals.py,sha256=ERGDbniHctEnIG5yFLkrZX2Jw1jEew5rWceVKuKskto,18997
 wbportfolio/tests/models/transactions/test_trades.py,sha256=vqvOqUY_uXvBp8YOKR0Wq9ycA2oeeEBhO3dzV7sbXEU,9863
 wbportfolio/tests/pms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/tests/pms/test_analytics.py,sha256=fAuY1zcXibttFpBh2GhKVyzdYfi1kz_b7SPa9xZQXY0,1086
 wbportfolio/tests/rebalancing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbportfolio/tests/rebalancing/test_models.py,sha256=_gT_7UtpOWceDwT7FbTUW6P6ZpCVLBpgXWM0goIljWc,8090
+wbportfolio/tests/rebalancing/test_models.py,sha256=4rSb05xKH881ft12G0B8ZSeFgJvutKcW_7vFgVQa0DI,7813
 wbportfolio/tests/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/tests/serializers/test_claims.py,sha256=vQrg73xQXRFEgvx3KI9ivFre_wpBFzdO0p0J13PkvdY,582
 wbportfolio/tests/viewsets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -403,7 +403,7 @@ wbportfolio/tests/viewsets/transactions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 wbportfolio/tests/viewsets/transactions/test_claims.py,sha256=QEZfMAW07dyoZ63t2umSwGOqvaTULfYfbN_F4ZoSAcw,6368
 wbportfolio/viewsets/__init__.py,sha256=3kUaQ66ybvROwejd3bEcSt4XKzfOlPDaeoStMvlz7qY,2294
 wbportfolio/viewsets/adjustments.py,sha256=ugbX4aFRCaD4Yj1hxL-VIPaNI7GF_wt0FrkN6mq1YjU,1524
-wbportfolio/viewsets/assets.py,sha256=Gf5QKDM7QR9MC8GJhMNzaY7NzeKV_yOQw0wktKPEc9o,24661
+wbportfolio/viewsets/assets.py,sha256=nMMVh7P531KZ-zpFogIMFKbfvRD3KdG2oIAAHQ42lpc,24634
 wbportfolio/viewsets/assets_and_net_new_money_progression.py,sha256=Jl4vEQP4N2OFL5IGBXoKcj-0qaPviU0I8npvQLw4Io0,4464
 wbportfolio/viewsets/custodians.py,sha256=CTFqkqVP1R3AV7lhdvcdICxB5DfwDYCyikNSI5kbYEo,2322
 wbportfolio/viewsets/esg.py,sha256=27MxxdXQH3Cq_1UEYmcrF7htUOg6i81fUpbVQXAAKJI,6985
@@ -436,7 +436,7 @@ wbportfolio/viewsets/configs/buttons/products.py,sha256=bHOs2ftfaLbIbJ7E8yFqQqSu
 wbportfolio/viewsets/configs/buttons/reconciliations.py,sha256=lw4r22GHpqKPUF1MrB6P9dOkL-FHe5iiBJ0--f8D74E,3145
 wbportfolio/viewsets/configs/buttons/registers.py,sha256=aS89TsYHql83k-NHojOrLDqtBpnpsUUO8x63PiMfrXM,445
 wbportfolio/viewsets/configs/buttons/signals.py,sha256=6sKBQI_eDvZuZR5bUUwvur5R67A3oChAGxPfayWUelE,2739
-wbportfolio/viewsets/configs/buttons/trade_proposals.py,sha256=eZBfYk5ZhancCVcu7bvRKPGBKTl_tGlgz6BZrGPpPxQ,2953
+wbportfolio/viewsets/configs/buttons/trade_proposals.py,sha256=Os5jT-aL0jMNkdm2sJpGRZvY4OzreR6Ah7eHex_6zB4,3383
 wbportfolio/viewsets/configs/buttons/trades.py,sha256=bPOqqwdgadSUbU9l5aSirqr5UAMFe2AiFNsXLRsKwn8,2535
 wbportfolio/viewsets/configs/display/__init__.py,sha256=jJqSCCAfw_vjbcsIkzKr39LdAZA810LUBfSH1EA7MAI,2086
 wbportfolio/viewsets/configs/display/adjustments.py,sha256=jIOEc23OCYBguLaZRlZxC916kocYT35ZV9Jsiocs9nk,3334
@@ -456,8 +456,8 @@ wbportfolio/viewsets/configs/display/rebalancing.py,sha256=yw9X1Nf2-V_KP_mCX4pVK
 wbportfolio/viewsets/configs/display/reconciliations.py,sha256=YvMAuwmpX0HExvGsuf5UvcRQxe4eMo1iyNJX68GGC_k,6021
 wbportfolio/viewsets/configs/display/registers.py,sha256=1np75exIk5rfct6UkVN_RnfJ9ozvIkcWJgFV4_4rJns,3182
 wbportfolio/viewsets/configs/display/roles.py,sha256=SFUyCdxSlHZ3NsMrJmpVBSlg-XKGaEFteV89nyLMMAQ,1815
-wbportfolio/viewsets/configs/display/trade_proposals.py,sha256=sRLSUjKlarBhnTwg7tX_Juldor3beswJlyvZfFPvNEk,4315
-wbportfolio/viewsets/configs/display/trades.py,sha256=PbGI8Sjs8YMBLfeYdgXRbv_tvel2aV3dB-7oZXnLwz4,17587
+wbportfolio/viewsets/configs/display/trade_proposals.py,sha256=gM5CuUmNcVtwJHYE9Myg-RR_WmAc6VDJztwUqQ1uZ7g,4335
+wbportfolio/viewsets/configs/display/trades.py,sha256=ZYZ2ceE4Hyw2SpQjW00VDnzGz7Wlu3jjPoK_J2GZLyk,19181
 wbportfolio/viewsets/configs/endpoints/__init__.py,sha256=KR3AsSxl71VAVkYBRVowgs3PZB8vaKa34WHHUvC-2MY,2807
 wbportfolio/viewsets/configs/endpoints/adjustments.py,sha256=KRZLqv4ZeB27d-_s7Qlqj9LI3I9WFJkjc6Mw8agDueE,606
 wbportfolio/viewsets/configs/endpoints/assets.py,sha256=B8W6ATQQfT292TllE4sUDYv5wHUCo99HEqymJuMtFAc,1909
@@ -517,9 +517,9 @@ wbportfolio/viewsets/transactions/claim.py,sha256=Pb1WftoO-w-ZSTbLRhmQubhy7hgd68
 wbportfolio/viewsets/transactions/fees.py,sha256=WT2bWWfgozz4_rpyTKX7dgBBTXD-gu0nlsd2Nk2Zh1Q,7028
 wbportfolio/viewsets/transactions/mixins.py,sha256=WipvJoi5hylkpD0y9VATe30WAcwIHUIroVkK10FYw7k,636
 wbportfolio/viewsets/transactions/rebalancing.py,sha256=6rIrdK0rtKL1afJ-tYfAGdQVTN2MH1kG_yCeVkmyK8k,1263
-wbportfolio/viewsets/transactions/trade_proposals.py,sha256=rCJoJSL11qpjxciX25Q5ZU3ewELyyDBUPXcj4Z88Vdg,6037
-wbportfolio/viewsets/transactions/trades.py,sha256=wCyTTyVKjYuMRsrFcmwD3_yggWxCNm-mdoYzVnhGP0U,21727
-wbportfolio-1.52.4.dist-info/METADATA,sha256=D1NdVWFeugjXwTxXubD32oNp_T4AVzsAAXfkTXgUiR4,702
-wbportfolio-1.52.4.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.52.4.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.52.4.dist-info/RECORD,,
+wbportfolio/viewsets/transactions/trade_proposals.py,sha256=zdb9yqyAE1-hcMmxxN3CYePWoPVWIW3WP3v8agErDeY,6210
+wbportfolio/viewsets/transactions/trades.py,sha256=DcfiJReBnnR6oBgNKZyBYWhXurtxJG_DCzxq5WCionA,22025
+wbportfolio-1.52.6.dist-info/METADATA,sha256=9YI1D7f4Omg3dI2yJs8v_cUOHJ4cdzujpm3l7QfGh38,702
+wbportfolio-1.52.6.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.52.6.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.52.6.dist-info/RECORD,,