wbportfolio 1.49.0__py2.py3-none-any.whl → 1.49.2__py2.py3-none-any.whl

wbportfolio/factories/dividends.py

@@ -11,5 +11,6 @@ class DividendTransactionsFactory(TransactionFactory):
     class Meta:
         model = DividendTransaction
 
+    retrocession = 1.0
     shares = factory.LazyAttribute(lambda o: random.randint(10, 10000))
     price = factory.LazyAttribute(lambda o: random.randint(10, 10000))

wbportfolio/import_export/handlers/dividend.py

@@ -23,7 +23,7 @@ class DividendImportHandler(ImportExportHandler):
         data["value_date"] = datetime.strptime(data["value_date"], "%Y-%m-%d").date()
         from wbportfolio.models import Portfolio
 
-        data["portfolio"] = Portfolio.objects.get(id=data["portfolio"])
+        data["portfolio"] = Portfolio.all_objects.get(id=data["portfolio"])
         instrument = self.instrument_handler.process_object(
             data["underlying_instrument"], only_security=False, read_only=True
         )[0]

wbportfolio/import_export/handlers/fees.py

@@ -26,7 +26,7 @@ class FeesImportHandler(ImportExportHandler):
 
         data["linked_product"] = Product.objects.get(id=data["linked_product"])
         if "porfolio" in data:
-            data["portfolio"] = Portfolio.objects.get(id=data["portfolio"])
+            data["portfolio"] = Portfolio.all_objects.get(id=data["portfolio"])
         else:
             data["portfolio"] = data["linked_product"].primary_portfolio
         data["underlying_instrument"] = Cash.objects.filter(currency=data["portfolio"].currency).first()

wbportfolio/import_export/handlers/portfolio_cash_flow.py

@@ -19,7 +19,7 @@ class DailyPortfolioCashFlowImportHandler(ImportExportHandler):
 
     def _deserialize(self, data):
         data["value_date"] = datetime.strptime(data["value_date"], "%Y-%m-%d").date()
-        data["portfolio"] = Portfolio.objects.get(id=data["portfolio"])
+        data["portfolio"] = Portfolio.all_objects.get(id=data["portfolio"])
         if "cash" in data:
             data["cash"] = Decimal(data["cash"])
 

wbportfolio/import_export/handlers/trade.py

@@ -1,3 +1,4 @@
+import math
 from datetime import datetime
 from decimal import Decimal
 from typing import Any, Dict, Optional
@@ -71,7 +72,10 @@ class TradeImportHandler(ImportExportHandler):
 
         for field in self.model._meta.get_fields():
             if not (value := data.get(field.name, None)) is None and isinstance(field, models.DecimalField):
-                data[field.name] = Decimal(value)
+                q = (
+                    1 / (math.pow(10, 4))
+                )  # we need that convertion mechanism otherwise there is floating point approximation error while casting to decimal and get_instance does not work as expected
+                data[field.name] = Decimal(value).quantize(Decimal(str(q)))
 
     def _create_instance(self, data: Dict[str, Any], **kwargs) -> models.Model:
         if "transaction_date" not in data:  # we might get only book date and not transaction date
@@ -81,7 +85,6 @@ class TradeImportHandler(ImportExportHandler):
 
     def _get_instance(self, data: Dict[str, Any], history: Optional[models.QuerySet] = None, **kwargs) -> models.Model:
         self.import_source.log += "\nGet Trade Instance."
-
         if transaction_date := data.get("transaction_date"):
             dates_lookup = {"transaction_date": transaction_date}
         elif book_date := data.get("book_date"):

wbportfolio/import_export/parsers/sg_lux/custodian_positions.py

@@ -29,7 +29,7 @@ def get_portfolio_id(row: pd.Series) -> int:
     Raises: Portfolio.DoesNotExist: We raise an error intentionally if the portfolio does not exist to make the import fail
     """
     iban = str(IBAN.generate(BANK_COUNTRY_CODE, bank_code=BANK_CODE, account_code=str(row["account_number"])))
-    return Portfolio.objects.get(bank_accounts__iban=iban).id
+    return Portfolio.all_objects.get(bank_accounts__iban=iban).id
 
 
 def parse(import_source: "ImportSource") -> dict:

wbportfolio/import_export/parsers/sg_lux/portfolio_future_cash_flow.py

@@ -13,7 +13,7 @@ def parse(import_source):
 
     def get_portfolio_id(row) -> int | None:
         with suppress(Portfolio.DoesNotExist):
-            return Portfolio.objects.get(instruments__children__isin__in=[row["Isin"]]).pk
+            return Portfolio.all_objects.get(instruments__children__isin__in=[row["Isin"]]).pk
 
     df = df[~df["Isin"].isnull()]
     df["Trade date"] = df["Trade date"].ffill()

wbportfolio/migrations/0076_alter_dividendtransaction_price_and_more.py

@@ -0,0 +1,126 @@
+# Generated by Django 5.0.13 on 2025-03-21 12:30
+
+import django.db.models.expressions
+from decimal import Decimal
+from django.db import migrations, models
+
+def migrate_default_values(apps, schema_editor):
+    Transaction = apps.get_model("wbportfolio", "Transaction")
+    Trade = apps.get_model("wbportfolio", "Trade")
+    Expiry = apps.get_model("wbportfolio", "Expiry")
+    DividendTransaction = apps.get_model("wbportfolio", "DividendTransaction")
+    Transaction.objects.filter(book_date__isnull=True).update(book_date=models.F("transaction_date"))
+    Transaction.objects.filter(value_date__isnull=True).update(value_date=models.F("transaction_date"))
+    Trade.objects.filter(price_gross__isnull=True).update(price_gross=models.F("price"))
+    Expiry.objects.filter(price_gross__isnull=True).update(price_gross=models.F("price"))
+    DividendTransaction.objects.filter(price_gross__isnull=True).update(price_gross=models.F("price"))
+    Transaction.objects.filter(total_value_gross__isnull=True).update(total_value_gross=models.F("total_value"))
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wbportfolio', '0075_portfolio_initial_position_date_and_more'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_default_values),
+        migrations.AlterField(
+            model_name='transaction',
+            name='book_date',
+            field=models.DateField(help_text='The date that this transaction was booked.',
+                                   verbose_name='Trade Date'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='transaction',
+            name='value_date',
+            field=models.DateField(help_text='The date that this transaction was valuated.',
+                                   verbose_name='Value Date'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='dividendtransaction',
+            name='price',
+            field=models.DecimalField(decimal_places=4, default=Decimal('0.0'), help_text='The price per share.', max_digits=16, verbose_name='Price'),
+        ),
+        migrations.AlterField(
+            model_name='dividendtransaction',
+            name='price_gross',
+            field=models.DecimalField(decimal_places=4, default=Decimal('0.0'), help_text='The gross price per share.', max_digits=16, verbose_name='Gross Price'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='dividendtransaction',
+            name='shares',
+            field=models.DecimalField(decimal_places=4, default=Decimal('0.0'), help_text='The number of shares that were traded.', max_digits=15, verbose_name='Shares'),
+        ),
+        migrations.AlterField(
+            model_name='expiry',
+            name='price',
+            field=models.DecimalField(decimal_places=4, default=Decimal('0.0'), help_text='The price per share.', max_digits=16, verbose_name='Price'),
+        ),
+        migrations.AlterField(
+            model_name='expiry',
+            name='price_gross',
+            field=models.DecimalField(decimal_places=4, default=Decimal('0.0'), help_text='The gross price per share.', max_digits=16, verbose_name='Gross Price'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='expiry',
+            name='shares',
+            field=models.DecimalField(decimal_places=4, default=Decimal('0.0'), help_text='The number of shares that were traded.', max_digits=15, verbose_name='Shares'),
+        ),
+        migrations.AlterField(
+            model_name='trade',
+            name='price',
+            field=models.DecimalField(decimal_places=4, default=Decimal('0.0'), help_text='The price per share.', max_digits=16, verbose_name='Price'),
+        ),
+        migrations.AlterField(
+            model_name='trade',
+            name='price_gross',
+            field=models.DecimalField(decimal_places=4, default=Decimal('0.0'), help_text='The gross price per share.', max_digits=16, verbose_name='Gross Price'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='trade',
+            name='shares',
+            field=models.DecimalField(decimal_places=4, default=Decimal('0.0'), help_text='The number of shares that were traded.', max_digits=15, verbose_name='Shares'),
+        ),
+
+        migrations.AlterField(
+            model_name='transaction',
+            name='total_value',
+            field=models.DecimalField(decimal_places=4, default=Decimal('0.0'), max_digits=20, verbose_name='Total Value'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='transaction',
+            name='total_value_gross',
+            field=models.DecimalField(decimal_places=4, default=Decimal('0.0'), max_digits=20, verbose_name='Total Value Gross'),
+            preserve_default=False,
+        ),
+        migrations.RemoveField(
+            model_name='transaction',
+            name='total_value_fx_portfolio',
+        ),
+        migrations.RemoveField(
+            model_name='transaction',
+            name='total_value_gross_fx_portfolio',
+        ),
+        migrations.AddField(
+            model_name='transaction',
+            name='total_value_fx_portfolio',
+            field=models.GeneratedField(db_persist=True, expression=django.db.models.expressions.CombinedExpression(
+                models.F('currency_fx_rate'), '*', models.F('total_value')),
+                                        output_field=models.DecimalField(decimal_places=4, max_digits=20)),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='transaction',
+            name='total_value_gross_fx_portfolio',
+            field=models.GeneratedField(db_persist=True, expression=django.db.models.expressions.CombinedExpression(models.F('currency_fx_rate'), '*', models.F('total_value_gross')), output_field=models.DecimalField(decimal_places=4, max_digits=20)),
+            preserve_default=False,
+        ),
+
+    ]

wbportfolio/models/portfolio.py

@@ -411,7 +411,7 @@ class Portfolio(DeleteToDisableMixin, WBModel):
         )
 
     def __str__(self):
-        return f"{self.id:06} ({self.name})"
+        return f"{self.id:06}: {self.name}"
 
     class Meta:
         verbose_name = "Portfolio"
@@ -853,7 +853,6 @@ class Portfolio(DeleteToDisableMixin, WBModel):
             adjusted_weighting,
             adjusted_currency_fx_rate,
             adjusted_is_estimated,
-            portfolio_created=None,
             path=None,
         ):
             if not path:
@@ -866,7 +865,18 @@ class Portfolio(DeleteToDisableMixin, WBModel):
                 position.is_estimated = (adjusted_is_estimated or position.is_estimated) and not (
                     position.weighting == 1.0
                 )
-                position.portfolio_created = portfolio_created
+                # to get from which portfolio this position is created, we need to differantiate between:
+                # * Composition portfolio: where the portfolio created is the second encountered portfolio
+                # * Other: portfolio created is the last encountered portfolio
+                # If `path` is empty, we use None as portfolio_created
+                try:
+                    if self.is_composition:
+                        position.portfolio_created = path[1]
+                    else:
+                        position.portfolio_created = path[-1]
+                except IndexError:
+                    position.portfolio_created = None
+
                 setattr(position, "path", path)
                 position.initial_shares = None
                 if portfolio_total_asset_value:
@@ -881,7 +891,6 @@ class Portfolio(DeleteToDisableMixin, WBModel):
                         position.weighting,
                         position.currency_fx_rate,
                         position.is_estimated,
-                        portfolio_created=child_portfolio,
                         path=path.copy(),
                     )
                 elif position.weighting:  # we do not yield position with weight 0 because of issue with certain multi-thematic portfolios which contain duplicates
@@ -979,7 +988,11 @@ class Portfolio(DeleteToDisableMixin, WBModel):
             for position in positions:
                 position.portfolio = self
                 update_dates.add(position.date)
-            # self.assets.filter(date__in=update_dates, is_estimated=True).delete()
+
+            # we need to delete the existing estimated portfolio because otherwise we risk to have existing and not
+            # overlapping positions remaining (as they will not be updating by the bulk create). E.g. when someone
+            # change completely the trades of a portfolio model and drift it.
+            self.assets.filter(date__in=update_dates, is_estimated=True).delete()
             leftover_positions_ids = list(
                 self.assets.filter(date__in=update_dates).values_list("id", flat=True)
             )  # we need to get the ids otherwise the queryset is reevaluated later
@@ -1014,7 +1027,7 @@ class Portfolio(DeleteToDisableMixin, WBModel):
     @classmethod
     def _get_or_create_portfolio(cls, instrument_handler, portfolio_data):
         if isinstance(portfolio_data, int):
-            return Portfolio.objects.get(id=portfolio_data)
+            return Portfolio.all_objects.get(id=portfolio_data)
         instrument = portfolio_data
         if isinstance(portfolio_data, dict):
             instrument = instrument_handler.process_object(instrument, only_security=False, read_only=True)[0]

wbportfolio/models/transactions/claim.py

@@ -14,6 +14,7 @@ from django.db.models import (
 )
 from django.db.models.functions import Greatest
 from django.dispatch import receiver
+from django.utils.translation import gettext_lazy as _
 from django_fsm import FSMField, transition
 from wbcore.contrib.ai.llm.config import add_llm_prompt
 from wbcore.contrib.authentication.models import User
@@ -335,13 +336,13 @@ class Claim(ReferenceIDMixin, WBModel):
         errors = dict()
 
         if not self.trade:
-            errors["trade"] = ["With this status, this has to be provided."]
+            errors["trade"] = [_("With this status, this has to be provided.")]
 
         if not self.product:
-            errors["product"] = ["With this status, this has to be provided."]
+            errors["product"] = [_("With this status, this has to be provided.")]
 
         if not self.account:
-            errors["account"] = ["With this status, this has to be provided."]
+            errors["account"] = [_("With this status, this has to be provided.")]
 
         # check if the specified product have a valid nav at the specified date
         if (
@@ -350,13 +351,13 @@ class Claim(ReferenceIDMixin, WBModel):
             and not product.valuations.filter(date=claim_date).exists()
         ):
             if (prices_qs := product.valuations.filter(date__lt=claim_date)).exists():
-                errors["date"] = (
+                errors["date"] = [
                     f"For product {product.name}, the latest valid valuation date before {claim_date:%Y-%m-%d} is {prices_qs.latest('date').date:%Y-%m-%d}: Please select a valid date."
-                )
+                ]
             else:
-                errors["date"] = (
+                errors["date"] = [
                     f"There is no valuation before {claim_date:%Y-%m-%d} for product {product.name}: Please select a valid date."
-                )
+                ]
         return errors
 
     @transition(

wbportfolio/models/transactions/dividends.py

@@ -1,3 +1,5 @@
+from decimal import Decimal
+
 from django.db import models
 
 from wbportfolio.import_export.handlers.dividend import DividendImportHandler
@@ -10,23 +12,4 @@ class DividendTransaction(Transaction, ShareMixin, models.Model):
     retrocession = models.FloatField(default=1)
 
     def save(self, *args, **kwargs):
-        if (
-            self.shares is not None
-            and self.price is not None
-            and self.retrocession is not None
-            and self.total_value is None
-        ):
-            self.total_value = self.shares * self.price * self.retrocession
-
-        if self.price is not None and self.price_gross is None:
-            self.price_gross = self.price
-
-        if (
-            self.price_gross is not None
-            and self.retrocession is not None
-            and self.shares is not None
-            and self.total_value_gross is None
-        ):
-            self.total_value_gross = self.shares * self.price_gross * self.retrocession
-
-        super().save(*args, **kwargs)
+        super().save(*args, factor=Decimal(self.retrocession), **kwargs)

wbportfolio/models/transactions/trade_proposals.py

@@ -8,6 +8,7 @@ from celery import shared_task
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils.functional import cached_property
+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
@@ -166,7 +167,7 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
         Returns:
             The cloned trade proposal
         """
-        trade_date = kwargs.get("trade_date", self.trade_date)
+        trade_date = kwargs.get("clone_date", self.trade_date)
 
         # Find the next valid trade date
         while TradeProposal.objects.filter(portfolio=self.portfolio, trade_date=trade_date).exists():
@@ -174,7 +175,7 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
 
         trade_proposal_clone = TradeProposal.objects.create(
             trade_date=trade_date,
-            comment=kwargs.get("comment", self.comment),
+            comment=kwargs.get("clone_comment", self.comment),
             status=TradeProposal.Status.DRAFT,
             rebalancing_model=self.rebalancing_model,
             portfolio=self.portfolio,
@@ -228,8 +229,6 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
         """
         Will delete all existing trades and recreate them from the method `create_or_update_trades`
         """
-        if self.status != TradeProposal.Status.DRAFT:
-            raise ValueError("Cannot reset non-draft trade proposal. Revert this trade proposal first.")
         # delete all existing trades
         last_effective_date = self.last_effective_date
         # Get effective and target portfolio
@@ -303,7 +302,7 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
             )
             last_trade_proposal = overriding_trade_proposal or next_trade_proposal
 
-    def get_estimated_shares(self, weight: Decimal, underlying_quote: Instrument) -> Decimal | None:
+    def get_estimated_shares(self, weight: Decimal, underlying_quote: Instrument) -> Decimal:
         """
         Estimates the number of shares for a trade based on the given weight and underlying quote.
 
@@ -332,8 +331,7 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
             if price_fx_portfolio:
                 return trade_total_value_fx_portfolio / price_fx_portfolio
         except Exception:
-            # Suppress any ValueError and return None if the calculation fails
-            return None
+            raise ValueError("We couldn't estimate the number of shares")
 
     def get_estimated_target_cash(self, currency: Currency) -> tuple[Decimal, Decimal]:
         """
@@ -373,7 +371,8 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
             )[0]
 
             # Estimate the target shares for the cash component
-            total_target_shares = self.get_estimated_shares(target_cash_weight, cash_component)
+            with suppress(ValueError):
+                total_target_shares = self.get_estimated_shares(target_cash_weight, cash_component)
 
         return target_cash_weight, total_target_shares
 
@@ -428,7 +427,7 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
         errors = dict()
         errors_list = []
         if self.trades.exists() and self.trades.exclude(status=Trade.Status.DRAFT).exists():
-            errors_list.append("All trades need to be draft before submitting")
+            errors_list.append(_("All trades need to be draft before submitting"))
         service = self.validated_trading_service
         try:
             service.is_valid(ignore_error=True)
@@ -437,7 +436,7 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
             #         "There is no change detected in this trade proposal. Please submit at last one valid trade"
             #     )
             if len(service.validated_trades) == 0:
-                errors_list.append("There is no valid trade on this proposal")
+                errors_list.append(_("There is no valid trade on this proposal"))
             if service.errors:
                 errors_list.extend(service.errors)
             if errors_list:
@@ -487,15 +486,17 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
     def can_approve(self):
         errors = dict()
         if not self.portfolio.can_be_rebalanced:
-            errors["non_field_errors"] = "The portfolio does not allow manual rebalanced"
+            errors["non_field_errors"] = [_("The portfolio does not allow manual rebalanced")]
         if self.trades.exclude(status=Trade.Status.SUBMIT).exists():
-            errors["non_field_errors"] = "At least one trade needs to be submitted to be able to approve this proposal"
+            errors["non_field_errors"] = [
+                _("At least one trade needs to be submitted to be able to approve this proposal")
+            ]
         if not self.portfolio.can_be_rebalanced:
-            errors["portfolio"] = (
-                "The portfolio needs to be a model portfolio in order to approve this trade proposal manually"
-            )
+            errors["portfolio"] = [
+                [_("The portfolio needs to be a model portfolio in order to approve this trade proposal manually")]
+            ]
         if self.has_non_successful_checks:
-            errors["non_field_errors"] = "The pre trades rules did not passed successfully"
+            errors["non_field_errors"] = [_("The pre trades rules did not passed successfully")]
         return errors
 
     @transition(
@@ -526,7 +527,9 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
     def can_deny(self):
         errors = dict()
         if self.trades.exclude(status=Trade.Status.SUBMIT).exists():
-            errors["non_field_errors"] = "At least one trade needs to be submitted to be able to deny this proposal"
+            errors["non_field_errors"] = [
+                _("At least one trade needs to be submitted to be able to deny this proposal")
+            ]
         return errors
 
     @transition(
@@ -589,9 +592,9 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
     def can_revert(self):
         errors = dict()
         if not self.portfolio.can_be_rebalanced:
-            errors["portfolio"] = (
-                "The portfolio needs to be a model portfolio in order to revert this trade proposal manually"
-            )
+            errors["portfolio"] = [
+                _("The portfolio needs to be a model portfolio in order to revert this trade proposal manually")
+            ]
         return errors
 
     # End FSM logics

wbportfolio/models/transactions/trades.py

@@ -20,6 +20,7 @@ from django.db.models.functions import Coalesce
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.utils.functional import cached_property
+from django.utils.translation import gettext_lazy as _
 from django_fsm import GET_STATE, FSMField, transition
 from ordered_model.models import OrderedModel, OrderedModelManager, OrderedModelQuerySet
 from wbcore.contrib.icons import WBIcon
@@ -320,9 +321,11 @@ class Trade(ShareMixin, Transaction, OrderedModel, WBModel):
 
     def can_execute(self):
         if not self.last_underlying_quote_price:
-            return {"underlying_instrument": "Cannot execute a trade without a valid quote price"}
+            return {"underlying_instrument": [_("Cannot execute a trade without a valid quote price")]}
         if not self.portfolio.is_manageable:
-            return {"portfolio": "The portfolio needs to be a model portfolio in order to execute this trade manually"}
+            return {
+                "portfolio": [_("The portfolio needs to be a model portfolio in order to execute this trade manually")]
+            }
 
     @transition(
         field=status,
@@ -498,22 +501,16 @@ class Trade(ShareMixin, Transaction, OrderedModel, WBModel):
             self.transaction_date = self.trade_proposal.trade_date
             self.value_date = self.trade_proposal.last_effective_date
             if not self.portfolio.only_weighting:
-                self.shares = self.trade_proposal.get_estimated_shares(self.weighting, self.underlying_instrument)
+                with suppress(ValueError):
+                    self.shares = self.trade_proposal.get_estimated_shares(self.weighting, self.underlying_instrument)
 
         if not self.custodian and self.bank:
             self.custodian = Custodian.get_by_mapping(self.bank)
         if self.price is None:
             # we try to get the price if not provided directly from the underlying instrument
-            with suppress(InstrumentPrice.DoesNotExist):
-                self.price = self.underlying_instrument.valuations.get(date=self.value_date).net_value
-        if self.price is not None and self.price_gross is None:
-            self.price_gross = self.price
-
-        if self.price is not None and self.shares is not None and self.total_value is None:
-            self.total_value = self.price * self.shares
+            with suppress(Exception):
+                self.price = self.underlying_instrument.get_price(self.value_date)
 
-        if self.price_gross is not None and self.shares is not None and self.total_value_gross is None:
-            self.total_value_gross = self.price_gross * self.shares
         self.transaction_type = Transaction.Type.TRADE
 
         if self.transaction_subtype is None or self.trade_proposal:

wbportfolio/models/transactions/transactions.py

@@ -13,16 +13,16 @@ class ShareMixin(models.Model):
     shares = models.DecimalField(
         max_digits=15,
         decimal_places=4,
-        null=True,
-        blank=True,
+        default=Decimal("0.0"),
         help_text="The number of shares that were traded.",
         verbose_name="Shares",
     )
     price = models.DecimalField(
         max_digits=16,
         decimal_places=4,
-        null=True,
-        blank=True,
+        default=Decimal(
+            "0.0"
+        ),  # we shouldn't default to anything but we have trade with price=None. Needs to be handled carefully
         help_text="The price per share.",
         verbose_name="Price",
     )
@@ -30,12 +30,23 @@ class ShareMixin(models.Model):
     price_gross = models.DecimalField(
         max_digits=16,
         decimal_places=4,
-        null=True,
-        blank=True,
         help_text="The gross price per share.",
         verbose_name="Gross Price",
     )
 
+    def save(
+        self,
+        *args,
+        factor: Decimal = Decimal("1.0"),
+        **kwargs,
+    ):
+        if self.price_gross is None:
+            self.price_gross = self.price
+
+        self.total_value = self.price * self.shares * factor
+        self.total_value_gross = self.price_gross * self.shares * factor
+        super().save(*args, **kwargs)
+
     class Meta:
         abstract = True
 
@@ -68,14 +79,10 @@ class Transaction(ImportMixin, models.Model):
         help_text="The date that this transaction was traded.",
     )
     book_date = models.DateField(
-        null=True,
-        blank=True,
         verbose_name="Trade Date",
         help_text="The date that this transaction was booked.",
     )
     value_date = models.DateField(
-        null=True,
-        blank=True,
         verbose_name="Value Date",
         help_text="The date that this transaction was valuated.",
     )
@@ -89,17 +96,23 @@ class Transaction(ImportMixin, models.Model):
     currency_fx_rate = models.DecimalField(
         max_digits=14, decimal_places=8, default=Decimal(1.0), verbose_name="FOREX rate"
     )
-    total_value = models.DecimalField(
-        max_digits=20, decimal_places=4, null=True, blank=True, verbose_name="Total Value"
-    )
-    total_value_fx_portfolio = models.DecimalField(
-        max_digits=20, decimal_places=4, null=True, blank=True, verbose_name="Total Value Fx Portfolio"
-    )
-    total_value_gross = models.DecimalField(
-        max_digits=20, decimal_places=4, null=True, blank=True, verbose_name="Total Value Gross"
-    )
-    total_value_gross_fx_portfolio = models.DecimalField(
-        max_digits=20, decimal_places=4, null=True, blank=True, verbose_name="Total Value Gross Fx Portfolio"
+    total_value = models.DecimalField(max_digits=20, decimal_places=4, verbose_name="Total Value")
+    total_value_gross = models.DecimalField(max_digits=20, decimal_places=4, verbose_name="Total Value Gross")
+    total_value_fx_portfolio = models.GeneratedField(
+        expression=models.F("currency_fx_rate") * models.F("total_value"),
+        output_field=models.DecimalField(
+            max_digits=20,
+            decimal_places=4,
+        ),
+        db_persist=True,
+    )
+    total_value_gross_fx_portfolio = models.GeneratedField(
+        expression=models.F("currency_fx_rate") * models.F("total_value_gross"),
+        output_field=models.DecimalField(
+            max_digits=20,
+            decimal_places=4,
+        ),
+        db_persist=True,
     )
     external_id = models.CharField(
         max_length=255,
@@ -118,28 +131,15 @@ class Transaction(ImportMixin, models.Model):
 
         if not getattr(self, "currency", None) and self.underlying_instrument:
             self.currency = self.underlying_instrument.currency
-        if not self.currency_fx_rate:
+        if self.currency_fx_rate is None:
             self.currency_fx_rate = self.underlying_instrument.currency.convert(
                 self.value_date, self.portfolio.currency, exact_lookup=True
             )
         if not self.transaction_type:
             self.transaction_type = self.__class__.__name__
-        if (
-            self.total_value is not None
-            and self.currency_fx_rate is not None
-            and self.total_value_fx_portfolio is None
-        ):
-            self.total_value_fx_portfolio = self.total_value * self.currency_fx_rate
-
-        if self.total_value is not None and self.total_value_gross is None and self.total_value_gross is None:
-            self.total_value_gross = self.total_value
 
-        if (
-            self.currency_fx_rate is not None
-            and self.total_value_gross is not None
-            and self.total_value_gross_fx_portfolio is None
-        ):
-            self.total_value_gross_fx_portfolio = self.total_value_gross * self.currency_fx_rate
+        if self.total_value_gross is None:
+            self.total_value_gross = self.total_value
 
         super().save(*args, **kwargs)
 

wbportfolio/rebalancing/models/market_capitalization_weighted.py

@@ -2,13 +2,12 @@ from decimal import Decimal
 
 import numpy as np
 import pandas as pd
-from django.db.models import Q, QuerySet
+from django.db.models import QuerySet
 from wbfdm.enums import MarketData
 from wbfdm.models import (
     Classification,
     Exchange,
     Instrument,
-    InstrumentClassificationThroughModel,
     InstrumentListThroughModel,
 )
 
@@ -31,9 +30,11 @@ class MarketCapitalizationRebalancing(AbstractRebalancingModel):
                 target_currency=self.TARGET_CURRENCY,
             )
         )
-        self.exchange_df = pd.DataFrame(
-            instruments.values_list("id", "exchange"), columns=["id", "exchange"]
-        ).set_index("id")
+        self.exchange_df = (
+            pd.DataFrame(instruments.values_list("id", "exchange"), columns=["id", "exchange"])
+            .set_index("id")
+            .replace({np.nan: None})
+        )
         instrument_ids = list(instruments.values_list("id", flat=True))
         try:
             self.market_cap_df = (
@@ -41,6 +42,7 @@ class MarketCapitalizationRebalancing(AbstractRebalancingModel):
                 .set_index("instrument_id")["market_capitalization"]
                 .reindex(instrument_ids)
             )
+            self.market_cap_df = self.market_cap_df
         except (IndexError, KeyError):
             self.market_cap_df = pd.Series(dtype="float64", index=instrument_ids)
 
@@ -59,17 +61,10 @@ class MarketCapitalizationRebalancing(AbstractRebalancingModel):
         if not instrument_ids:
             instrument_ids = []
         if classification_ids:
-            classifications = set()
             for classification in Classification.objects.filter(id__in=classification_ids):
                 for children in classification.get_descendants(include_self=True):
-                    classifications.add(children)
-            instrument_ids.extend(
-                list(
-                    InstrumentClassificationThroughModel.objects.filter(
-                        classification__in=classifications
-                    ).values_list("id", flat=True)
-                )
-            )
+                    for company in children.instruments.all():
+                        instrument_ids.append(company.get_primary_quote().id)
         if instrument_list_id:
             instrument_ids.extend(
                 list(
@@ -84,8 +79,10 @@ class MarketCapitalizationRebalancing(AbstractRebalancingModel):
                 self.portfolio.assets.filter(date=self.trade_date).values_list("underlying_instrument", flat=True)
             )
 
-        return Instrument.objects.filter(id__in=instrument_ids).filter(
-            (Q(delisted_date__isnull=True) | Q(delisted_date__gt=self.trade_date))
+        return (
+            Instrument.objects.filter(id__in=instrument_ids)
+            .filter(exchange__isnull=False)
+            .filter_active_at_date(self.trade_date)
         )
 
     def is_valid(self) -> bool:

wbportfolio/serializers/portfolios.py

@@ -85,7 +85,7 @@ class PortfolioModelSerializer(wb_serializers.ModelSerializer):
                 request=request,
             )
         if user.profile.is_internal:
-            additional_resources["instruments"] = reverse(
+            additional_resources["instruments_list"] = reverse(
                 "wbportfolio:portfolio-instrument-list",
                 args=[instance.id],
                 request=request,

wbportfolio/tests/models/test_portfolios.py

@@ -33,7 +33,7 @@ class TestPortfolioModel(PortfolioTestMixin):
         assert portfolio.id is not None
 
     def test_str(self, portfolio):
-        assert str(portfolio) == f"{portfolio.id:06} ({portfolio.name})"
+        assert str(portfolio) == f"{portfolio.id:06}: {portfolio.name}"
 
     def test_get_assets(self, portfolio, product, cash, asset_position_factory):
         asset_position_factory.create_batch(4, portfolio=portfolio, underlying_instrument=product)

wbportfolio/tests/rebalancing/test_models.py

@@ -136,8 +136,8 @@ class TestMarketCapitalizationRebalancing:
 
         last_effective_date = (weekday - BDay(1)).date()
 
-        i1 = instrument_factory()
-        i2 = instrument_factory()
+        i1 = instrument_factory(inception_date=weekday)
+        i2 = instrument_factory(inception_date=weekday)
         instrument_price_factory.create(instrument=i1, date=weekday)
         instrument_price_factory.create(instrument=i2, date=weekday)
         return MarketCapitalizationRebalancing(portfolio, weekday, last_effective_date, instrument_ids=[i1.id, i2.id])

wbportfolio/viewsets/assets.py

@@ -323,7 +323,7 @@ class CashPositionPortfolioPandasAPIView(
                 val_date = datetime.strptime(date_str, "%Y-%m-%d").date()
             else:
                 val_date = date.today()
-            active_products = Product.active_objects.get_queryset_at_date(val_date)
+            active_products = Product.active_objects.filter_active_at_date(val_date)
             return (
                 super()
                 .get_queryset()

wbportfolio/viewsets/configs/display/assets.py

@@ -148,17 +148,6 @@ class AssetPositionInstrumentDisplayConfig(DisplayViewConfig):
                     items=[dp.LegendItem(icon=WBIcon.UNFILTER.icon, label="Not Invested", value=True)],
                 )
             ],
-            formatting=[
-                dp.Formatting(
-                    column="is_invested",
-                    formatting_rules=[
-                        dp.FormattingRule(
-                            icon=WBIcon.UNFILTER.icon,
-                            condition=("==", False),
-                        )
-                    ],
-                )
-            ],
         )
 
 

wbportfolio/viewsets/configs/display/portfolios.py

@@ -103,8 +103,8 @@ class PortfolioDisplayConfig(DisplayViewConfig):
                                 create_simple_section(
                                     "instruments_section",
                                     _("Linked Instruments"),
-                                    [["instruments"]],
-                                    "instruments",
+                                    [["instruments_list"]],
+                                    "instruments_list",
                                     collapsed=True,
                                 ),
                                 create_simple_section(

wbportfolio/viewsets/configs/display/products.py

@@ -1,7 +1,6 @@
 from typing import Optional
 
 from django.utils.translation import gettext_lazy as _
-from wbcore.contrib.icons import WBIcon
 from wbcore.enums import Unit
 from wbcore.metadata.configs import display as dp
 from wbcore.metadata.configs.display.formatting import Condition, Operator
@@ -27,18 +26,6 @@ class ProductDisplayConfig(DisplayViewConfig):
                     label=_("Information"),
                     open_by_default=False,
                     children=[
-                        dp.Field(
-                            key="is_invested",
-                            label="",
-                            formatting_rules=[
-                                dp.FormattingRule(
-                                    icon=WBIcon.UNFILTER.icon,
-                                    condition=Condition(Operator("=="), False),
-                                ),
-                            ],
-                            width=30,
-                            show="open",
-                        ),
                         dp.Field(key="name_repr", label="Name", width=250),
                         dp.Field(key="parent", label="Parent"),
                         dp.Field(key="isin", label="ISIN"),

wbportfolio/viewsets/configs/display/trades.py

@@ -267,15 +267,6 @@ class SubscriptionRedemptionDisplayConfig(TradeDisplayConfig):
                         )
                     ],
                 ),
-                dp.Formatting(
-                    column="pending",
-                    formatting_rules=[
-                        dp.FormattingRule(
-                            icon=WBIcon.FOLDERS_ADD.icon,
-                            condition=("==", True),
-                        )
-                    ],
-                ),
             ],
         )
 
@@ -311,6 +302,7 @@ class TradeTradeProposalDisplayConfig(DisplayViewConfig):
                     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(

wbportfolio/viewsets/configs/endpoints/transactions.py

@@ -3,6 +3,12 @@ from wbcore.metadata.configs.endpoints import EndpointViewConfig
 
 
 class TransactionEndpointConfig(EndpointViewConfig):
+    def get_endpoint(self, **kwargs):
+        return None
+
+    def get_list_endpoint(self, **kwargs):
+        return reverse("wbportfolio:transaction-list", request=self.request)
+
     def get_instance_endpoint(self, **kwargs):
         model = "{{transaction_url_type}}"
         return f"{self.request.scheme}://{self.request.get_host()}/api/portfolio/{model}/"

wbportfolio/viewsets/portfolios.py

@@ -67,7 +67,23 @@ class PortfolioModelViewSet(UserPortfolioRequestPermissionMixin, InternalUserPer
     queryset = Portfolio.objects.all()
 
     search_fields = ("currency__key", "name")
-    ordering_fields = search_fields
+    ordering_fields = (
+        "name",
+        "currency",
+        "hedged_currency",
+        "updated_at",
+        "initial_position_date",
+        "last_position_date",
+        "last_asset_under_management_usd",
+        "last_positions",
+        "automatic_rebalancer",
+        "last_trade_proposal_date",
+        "is_manageable",
+        "is_tracked",
+        "only_weighting",
+        "is_lookthrough",
+        "is_composition",
+    )
     ordering = ["name"]
 
     display_config_class = PortfolioDisplayConfig

wbportfolio/viewsets/transactions/trade_proposals.py

@@ -65,16 +65,18 @@ class TradeProposalModelViewSet(CloneMixin, RiskCheckViewSetMixin, InternalUserP
     # 2 methods to parametrize the clone button functionality
     def get_clone_button_serializer_class(self, instance):
         class CloneSerializer(wb_serializers.Serializer):
-            trade_date = wb_serializers.DateField(default=(instance.trade_date + BDay(1)).date(), label="Trade Date")
-            comment = wb_serializers.TextField(label="Comment")
+            clone_date = wb_serializers.DateField(
+                default=(instance.trade_date + BDay(1)).date(), label="Trade Date"
+            )  # we need to change the field name from the trade proposa fields, otherwise fontend conflicts
+            clone_comment = wb_serializers.TextField(label="Comment")
 
         return CloneSerializer
 
     def get_clone_button_instance_display(self) -> Display:
         return create_simple_display(
             [
-                ["comment"],
-                ["trade_date"],
+                ["clone_comment"],
+                ["clone_date"],
             ]
         )
 

wbportfolio/viewsets/transactions/trades.py

@@ -367,10 +367,22 @@ class TradeTradeProposalModelViewSet(
         "trade_proposal",
         "order",
     )
-    ordering_fields = ("target_weight", "effective_weight", "effective_shares", "target_shares", "shares", "weighting")
+    ordering_fields = (
+        "underlying_instrument__name",
+        "underlying_instrument_isin",
+        "underlying_instrument_ticker",
+        "underlying_instrument_refinitiv_identifier_code",
+        "underlying_instrument_instrument_type",
+        "target_weight",
+        "effective_weight",
+        "effective_shares",
+        "target_shares",
+        "shares",
+        "weighting",
+    )
     IDENTIFIER = "wbportfolio:tradeproposal"
     search_fields = ("underlying_instrument__name",)
-    filterset_fields = {}
+    filterset_fields = {"status": ["exact"]}
     queryset = Trade.objects.all()
 
     display_config_class = TradeTradeProposalDisplayConfig
@@ -497,5 +509,11 @@ class TradeTradeProposalModelViewSet(
             underlying_instrument_isin=F("underlying_instrument__isin"),
             underlying_instrument_ticker=F("underlying_instrument__ticker"),
             underlying_instrument_refinitiv_identifier_code=F("underlying_instrument__refinitiv_identifier_code"),
-            underlying_instrument_instrument_type=F("underlying_instrument__instrument_type__short_name"),
+            underlying_instrument_instrument_type=Case(
+                When(
+                    underlying_instrument__parent__is_security=True,
+                    then=F("underlying_instrument__parent__instrument_type__short_name"),
+                ),
+                default=F("underlying_instrument__instrument_type__short_name"),
+            ),
         )

{wbportfolio-1.49.0.dist-info → wbportfolio-1.49.2.dist-info}/METADATA

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

{wbportfolio-1.49.0.dist-info → wbportfolio-1.49.2.dist-info}/RECORD

@@ -58,7 +58,7 @@ wbportfolio/factories/adjustments.py,sha256=aOHXJLy7DW4k1hcRBZteEe2mKe_wQg7z0bVn
 wbportfolio/factories/assets.py,sha256=1i7xDT6bpvnYQiEJpmukWadSvS1asQC-QuUJ1PCll0U,3173
 wbportfolio/factories/claim.py,sha256=LQzz8EbIveOYpMY-JOMR8ba-taoX3u53zjBwxiydtrM,1629
 wbportfolio/factories/custodians.py,sha256=XrNcpNhE4Rbv0y159E_MbP1TAQwe9POab-_RHOHy1Uk,311
-wbportfolio/factories/dividends.py,sha256=QqZy-Spdjv9I-dnFAuJUaWFZ5uEuWP-bkZMZ_RMuy64,381
+wbportfolio/factories/dividends.py,sha256=ET2kp0A7U1x8WhNVUn6FM1GF4jfr5NwdULBiIQkSLh0,404
 wbportfolio/factories/fees.py,sha256=2B2ebj06a0ZI1ra2-TXtW5e0aQ9sXT-Plw6CzV-3_1c,400
 wbportfolio/factories/indexes.py,sha256=sInyNARyfUNbScxr_ng1HhxtJXIsK3awFf9BF1gr9zU,440
 wbportfolio/factories/portfolio_cash_flow.py,sha256=e8LWkk5Gy0FU4HoCL9xPseCtLlVIkMrvAmey5swqcfc,727
@@ -111,11 +111,11 @@ wbportfolio/import_export/backends/wbfdm/mixin.py,sha256=JNtjgqGLson1nu_Chqb8MWy
 wbportfolio/import_export/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/import_export/handlers/adjustment.py,sha256=6bdTIYFmc8_HFxcdwtnYwglMyCfAD8XrTIrEb2zWY0g,1757
 wbportfolio/import_export/handlers/asset_position.py,sha256=5wFnHcbq_zGp9rBUec_JEpzjCA0_v17VrV9F8Ps1ETs,8645
-wbportfolio/import_export/handlers/dividend.py,sha256=tftdVdAzNpKSSvouOtvJfzWL362HUPIC94F6Noha8CE,3998
-wbportfolio/import_export/handlers/fees.py,sha256=XYH752IkNGYhhhwatp8nYa1zG1-YZFDkYW15dyQgOIg,2824
-wbportfolio/import_export/handlers/portfolio_cash_flow.py,sha256=2ODaquuC83RfmNwmQ-8TdhiASObfIems_B1g0yqaYTs,2733
+wbportfolio/import_export/handlers/dividend.py,sha256=aIayzCn0n3h17_uHcNMLQK_QndRJSU5FHaEewD8jH9U,4002
+wbportfolio/import_export/handlers/fees.py,sha256=phNZ3zc_RKxryj0IE81HUdiFJ8AFiWnVyZ_xtB_x3xY,2828
+wbportfolio/import_export/handlers/portfolio_cash_flow.py,sha256=W7QPNqEvvsq0RS016EAFBp1ezvc6G9Rk-hviRZh8o6Y,2737
 wbportfolio/import_export/handlers/register.py,sha256=sYyXkE8b1DPZ5monxylZn0kjxLVdNYYZR-p61dwEoDM,2271
-wbportfolio/import_export/handlers/trade.py,sha256=KMYnaEUGWyrft0l7OuPKHcy6WKdIr8I_wefoA8pzgjY,11297
+wbportfolio/import_export/handlers/trade.py,sha256=Vp3nkeg5VvK3oTOiI0V8e0aBg5B2MySypuRx_fMd1VM,11575
 wbportfolio/import_export/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/import_export/parsers/default_mapping.py,sha256=KrO-X5CvQCeQoBYzFDxavoQGriyUSeI2QDx5ar_zo7A,1405
 wbportfolio/import_export/parsers/jpmorgan/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -145,7 +145,7 @@ wbportfolio/import_export/parsers/natixis/valuation.py,sha256=mLjIw1GBlPPlzHJkxg
 wbportfolio/import_export/parsers/refinitiv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/import_export/parsers/refinitiv/adjustment.py,sha256=64AQoLOZQWn5HCLpflJ4OgQB3gCB3w_6Y4YLhcmuClg,819
 wbportfolio/import_export/parsers/sg_lux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbportfolio/import_export/parsers/sg_lux/custodian_positions.py,sha256=pdrVQcehF1xF5fJCom78Y5kjtjYUCTM_qQ0Cjanl83Y,2479
+wbportfolio/import_export/parsers/sg_lux/custodian_positions.py,sha256=hl-LqJbwojQOe0zGEH7W31i4hNTVme5L7nwXwyk6XBY,2483
 wbportfolio/import_export/parsers/sg_lux/customer_trade.py,sha256=gTEUIaxlZvXXCgYyg9FD3D3aQhffhruYmeZlaAghrK8,2617
 wbportfolio/import_export/parsers/sg_lux/customer_trade_pending_slk.py,sha256=4KSxUGyflf3kY5BVJqMAF1aFkeSWEJegfDtLiA1BM6c,5065
 wbportfolio/import_export/parsers/sg_lux/customer_trade_slk.py,sha256=24e-vonaBAkvX-F_Gw4hLg4FBjgbpCTUbiFC_dZ-czw,2958
@@ -154,7 +154,7 @@ wbportfolio/import_export/parsers/sg_lux/equity.py,sha256=w13LAMNWReZzqmdFyXdazV
 wbportfolio/import_export/parsers/sg_lux/fees.py,sha256=xyPO9sYQyJW5w-1XhUMizY2RbH1Pr4n7LAUE-E67Yj4,1911
 wbportfolio/import_export/parsers/sg_lux/perf_fees.py,sha256=lH1gyswfefwo3Lxi0syydhJYl9EDGsrL_a6fLmpHh8w,1691
 wbportfolio/import_export/parsers/sg_lux/portfolio_cash_flow.py,sha256=ftLKWukUl9AcGWHQmJZnShVZpkO4rOl04PGlLcalDdQ,889
-wbportfolio/import_export/parsers/sg_lux/portfolio_future_cash_flow.py,sha256=wm0yTgCVYRw738y9DPRUP0ygIwCLHa29pbNzd6EUNjg,1070
+wbportfolio/import_export/parsers/sg_lux/portfolio_future_cash_flow.py,sha256=2kkEOwZz1hwiPB9rlMp_vkv5azMrJUfyWl7GMaAwGUc,1074
 wbportfolio/import_export/parsers/sg_lux/registers.py,sha256=5Zaum-6XuQL8-p1MkwA0sN3z8MCymSz4nNzB8MPQDCA,6112
 wbportfolio/import_export/parsers/sg_lux/sylk.py,sha256=1ThyjneFFe_gNLDHeXQFdWIyanyktxm62P-Ta5Sm1v4,7656
 wbportfolio/import_export/parsers/sg_lux/utils.py,sha256=YzYIEDQ3CpkOuRWh2eEFRm-0SERu3SRAmx0nnqQS_og,1301
@@ -241,6 +241,7 @@ wbportfolio/migrations/0072_trade_diff_shares.py,sha256=aTKa1SbIiwmlXaFtBg-ENrSx
 wbportfolio/migrations/0073_remove_product_price_computation_and_more.py,sha256=J4puisDFwnbnfv2VLWaiCQ7ost6PCOkin9qKVQoLIWM,18725
 wbportfolio/migrations/0074_alter_rebalancer_frequency_and_more.py,sha256=o01rBj-ADgwCRtAai3e5z27alPGEzaiNxUqCwWm6peY,918
 wbportfolio/migrations/0075_portfolio_initial_position_date_and_more.py,sha256=rXRpsraVlmueAlO2UpBZV4qMf7dtPuptrhfLblZcJDo,1099
+wbportfolio/migrations/0076_alter_dividendtransaction_price_and_more.py,sha256=4g3ok79nw8mTAxHFAqBAdpGKetaPAjv06YSywywt4aU,6106
 wbportfolio/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/models/__init__.py,sha256=IIS_PNRxyX2Dcvyk1bcQOUzFt0B9SPC0WlM88CXqj04,881
 wbportfolio/models/adjustments.py,sha256=osXWkJZOiansPWYPyHtl7Z121zDWi7u1YMtrBQtbHVo,10272
@@ -248,7 +249,7 @@ wbportfolio/models/asset.py,sha256=yf4vBPfN1eZlWXG9SowQwr5-goG8rO1yYDitHDLZCBs,3
 wbportfolio/models/custodians.py,sha256=owTiS2Vm5CRKzh9M_P9GOVg-s-ndQ9UvRmw3yZP7cw0,3815
 wbportfolio/models/exceptions.py,sha256=3ix0tWUO-O6jpz8f07XIwycw2x3JFRoWzjwil8FVA2Q,52
 wbportfolio/models/indexes.py,sha256=iLYF2gzNzX4GLj_Nh3fybUcAQ1TslnT0wgQ6mN164QI,728
-wbportfolio/models/portfolio.py,sha256=dCLrGVIKqpIdQi78CF58S0GD7sSuzuHjpavKBZgTCm4,58775
+wbportfolio/models/portfolio.py,sha256=KtuPMWtYoKrIOwp9T_REnOjT9CI2kjtEijF3uA0Twsc,59595
 wbportfolio/models/portfolio_cash_flow.py,sha256=2blPiXSw7dbhUVd-7LcxDBb4v0SheNOdvRK3MFYiChA,7273
 wbportfolio/models/portfolio_cash_targets.py,sha256=WmgG-etPisZsh2yaFQpz7EkpvAudKBEzqPsO715w52U,1498
 wbportfolio/models/portfolio_relationship.py,sha256=mMb18UMRWg9kx_9uIPkMktwORuXXLjKdgRPQQvB6fVE,5486
@@ -270,14 +271,14 @@ wbportfolio/models/reconciliations/account_reconciliation_lines.py,sha256=QP6M7h
 wbportfolio/models/reconciliations/account_reconciliations.py,sha256=_teOTNePxua9C894auy8CvdOFsmUnQiOM2_TZAHvzY4,3955
 wbportfolio/models/reconciliations/reconciliations.py,sha256=kF-BNhUoT4TCn1RIgPSkdEk1iX4NQeZlGGFd_ZulAZU,686
 wbportfolio/models/transactions/__init__.py,sha256=R-4fHylrUf3773kGSEt09vtYj3LUlia5yf7rxHXjvHA,295
-wbportfolio/models/transactions/claim.py,sha256=agdpGqxpO0FSzYDWV-Gv1tQY46k0LN9CY6hpqvnhPH8,25826
-wbportfolio/models/transactions/dividends.py,sha256=naL5xeDQfUBf5KyGt7y-tTcHL22nzZumT8DV6AaG8Bg,1064
+wbportfolio/models/transactions/claim.py,sha256=hcx_tJ9luf2-s1qqsUZXtoDEuxFyty2A1rXSDkljoQo,25890
+wbportfolio/models/transactions/dividends.py,sha256=92-jG8bZN9nU9oDubpu-UDH43Ri7kVjhqE_esOSmOzo,471
 wbportfolio/models/transactions/expiry.py,sha256=vnNHdcC1hf2HP4rAbmoGgOfagBYKNFytqOwzOI0MlVI,144
 wbportfolio/models/transactions/fees.py,sha256=ffvqo8I4A0l5rLi00jJ6sGot0jmnkoxaNsbDzdPLwCg,5712
 wbportfolio/models/transactions/rebalancing.py,sha256=nrBi6x6PssCtkLtOpV-2OoAHDUKnnYyrM6xH1PmnjSo,7240
-wbportfolio/models/transactions/trade_proposals.py,sha256=iZb0LHqWSqbWf3Rmyhb5igGGKoT3JN52O2Db8j3J_1g,26727
-wbportfolio/models/transactions/trades.py,sha256=zoqWsDpbUKbvdW60ytNg27kRFlH1N0rUz6mf0o6DdR4,28337
-wbportfolio/models/transactions/transactions.py,sha256=4THsE4xqdigZAwWKYfTNRLPJlkmAmsgE70Ribp9Lnrk,7127
+wbportfolio/models/transactions/trade_proposals.py,sha256=9ggUkwzDgMKa8cC8dNZ4IHlleiGpRN0WU-oXGDSiuaw,26730
+wbportfolio/models/transactions/trades.py,sha256=P9cSTEpZBsqKBvw25XY_RNctTiOBEzCvcuy0r8IkedE,28013
+wbportfolio/models/transactions/transactions.py,sha256=fWoDf0TSV0L0gLUDOQpCRLzjMt1H4MUvUHGEaMsilCc,7027
 wbportfolio/pms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/pms/typing.py,sha256=b2pBWYt1E8ok-Kqm0lEFIakSnWJ6Ib57z-VX3C3gkQc,6081
 wbportfolio/pms/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -291,7 +292,7 @@ wbportfolio/rebalancing/decorators.py,sha256=JhQ2vkcIuGBTGvNmpkQerdw2-vLq-RAb0KA
 wbportfolio/rebalancing/models/__init__.py,sha256=AQjG7Tu5vlmhqncVoYOjpBKU2UIvgo9FuP2_jD2w-UI,232
 wbportfolio/rebalancing/models/composite.py,sha256=uyF1n3NAFprnAZ3Gl5pNJl0GajelqJspC2NufZ7Tf0s,1636
 wbportfolio/rebalancing/models/equally_weighted.py,sha256=U29MOHJMQMIg7Y7W_8t5K3nXjaznzt4ArIxQSiv0Xok,863
-wbportfolio/rebalancing/models/market_capitalization_weighted.py,sha256=LvzV7a8fNbpsRahysvKbE6oNSQccWpnnne-rlDj3uzU,4928
+wbportfolio/rebalancing/models/market_capitalization_weighted.py,sha256=7vdr7SMNswi3Emc8RpLPJQqQw39xrznp3Ps9Pf9YEZ4,4789
 wbportfolio/rebalancing/models/model_portfolio.py,sha256=XQdvs03-0M9YUnL4DidwZC4E6k-ANCNcZ--T_aaOXTQ,1233
 wbportfolio/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/reports/monthly_position_report.py,sha256=e7BzjDd6eseUOwLwQJXKvWErQ58YnCsznHU2VtR6izM,2981
@@ -327,7 +328,7 @@ wbportfolio/serializers/portfolio_cash_flow.py,sha256=vBRZnUKq4XAqcvjyk-xMsw5v4x
 wbportfolio/serializers/portfolio_cash_targets.py,sha256=_GdsFXoBda1JHJnfZbaVlNFdnXlvGuy_FEcEZH-UThY,605
 wbportfolio/serializers/portfolio_relationship.py,sha256=UR_GIF2LHw82a8mv6L8OXYvoCp5-QWtubt33Y4mqFow,1933
 wbportfolio/serializers/portfolio_swing_pricing.py,sha256=a21st7MmcugbAO_xc90QWSeXwU1ivk-y2PWlMGKySJY,655
-wbportfolio/serializers/portfolios.py,sha256=ZowvB0T38tuXVQI-O9pEsPdLfG1hrW6aMZ1DBVnPbuE,7679
+wbportfolio/serializers/portfolios.py,sha256=qEbrTAVepeVIPcs9XaWCDJ0ZxSQX8-M9HmRh6ky4KuY,7684
 wbportfolio/serializers/positions.py,sha256=UK9dvE1wiILw2E209InrsUhme52vfUYDDERBeKCcn_k,2415
 wbportfolio/serializers/product_group.py,sha256=klPGmAb1MvJpyiKKMRb8uYFIMm6SCZkMFQDu5EH-mkY,3680
 wbportfolio/serializers/products.py,sha256=BDMizM77Iohe7JEUncll2ET4GtU8hicQ6c4Vm0srqd4,12374
@@ -373,7 +374,7 @@ wbportfolio/tests/models/test_merge.py,sha256=sdsjiZsmR6vsUKwTa5kkvL6QTeAZqtd_EP
 wbportfolio/tests/models/test_portfolio_cash_flow.py,sha256=X8dsXexsb1b0lBiuGzu40ps_Az_1UmmKT0eo1vbXH94,5792
 wbportfolio/tests/models/test_portfolio_cash_targets.py,sha256=q8QWAwt-kKRkLC0E05GyRhF_TTQXIi8bdHjXVU0fCV0,965
 wbportfolio/tests/models/test_portfolio_swing_pricings.py,sha256=kr2AOcQkyg2pX3ULjU-o9ye-NVpjMrrfoe-DVbYCbjs,1656
-wbportfolio/tests/models/test_portfolios.py,sha256=DbOanYdyLEfnHqgmz0jckxnJRo4msiaaDjKWD4dQy4o,52208
+wbportfolio/tests/models/test_portfolios.py,sha256=IxJy0fLkUx3m4qKzvkqixYl_0lR7TU-cQJ_DhTkh8V8,52207
 wbportfolio/tests/models/test_product_groups.py,sha256=AcdxhurV-n_bBuUsfD1GqVtwLFcs7VI2CRrwzsIUWbU,3337
 wbportfolio/tests/models/test_products.py,sha256=nBEgyUoY-4F_pfHYnAr7KXdNYvdIkSu-PWJrqp5tPHg,9482
 wbportfolio/tests/models/test_roles.py,sha256=4Cn7WyrA2ztJNeWLk5cy9kYo5XLWMbFSvo1O-9JYxeA,3323
@@ -388,7 +389,7 @@ wbportfolio/tests/models/transactions/test_trades.py,sha256=vqvOqUY_uXvBp8YOKR0W
 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=mhhuIWPZF2SQHzVdotp90eIrfmnMGQNu5YTGcMDjlIY,7505
+wbportfolio/tests/rebalancing/test_models.py,sha256=qyZkNG1WF1lZdYwvjUElkkNey8b5ZMGSlWpzxujCuNg,7549
 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
@@ -399,7 +400,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=5hWCjxSgUIsrPOmJKoDYK3gywdMTI0aYDorEj1FXRVc,1429
-wbportfolio/viewsets/assets.py,sha256=vwfrJaws7aVOUd-4FTlZVahpiMGgIEt1rcUumvWIKss,22734
+wbportfolio/viewsets/assets.py,sha256=CrAMuyJDyUcSZlckrhy5D6-vVRXD7I4EG9C3ZKA5Z08,22735
 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
@@ -408,7 +409,7 @@ wbportfolio/viewsets/portfolio_cash_flow.py,sha256=jkBfdZRQ3KsxGMJpltRjmdrZ2qEFJ
 wbportfolio/viewsets/portfolio_cash_targets.py,sha256=CvHlrDE8qnnnfRpTYnFu-Uu15MDbF5d5gTmEKth2S24,322
 wbportfolio/viewsets/portfolio_relationship.py,sha256=RGyvxd8NfFEs8YdqEvVD3VbrISvAO5UtCTlocSIuWQw,2109
 wbportfolio/viewsets/portfolio_swing_pricing.py,sha256=-57l3WLQZRslIV67OT0ucHE5JXTtTtLvd3t7MppdVn8,357
-wbportfolio/viewsets/portfolios.py,sha256=eUty1gVN0hLKMmW0IGe_l8u6CFSTJW9ruSPlZbZnU7E,14050
+wbportfolio/viewsets/portfolios.py,sha256=1POzE9jrt2iLVMnIY_BWDr0A_zpOlO3Z8tM80TaXkhk,14454
 wbportfolio/viewsets/positions.py,sha256=MDf_0x9La2qE6qjaIqBtfV5VC0RfJ1chZIim45Emk10,13198
 wbportfolio/viewsets/product_groups.py,sha256=YvmuXPPy98K1J_rz6YPsx9gNK-tCS2P-wc1uRYgfyo0,2399
 wbportfolio/viewsets/product_performance.py,sha256=dRfRgifjGS1RgZSu9uJRM0SmB7eLnNUkPuqARMO4gyo,28371
@@ -436,24 +437,24 @@ wbportfolio/viewsets/configs/buttons/trade_proposals.py,sha256=eZBfYk5ZhancCVcu7
 wbportfolio/viewsets/configs/buttons/trades.py,sha256=X2B1l0iEIdHb3ZMf9rLVoiX_H8lSyLD12wopgumOIX4,2318
 wbportfolio/viewsets/configs/display/__init__.py,sha256=SmazY-YEp-Xf8G08Uz1-CzePZRCRtHrziRMIYYIGpCk,2176
 wbportfolio/viewsets/configs/display/adjustments.py,sha256=jIOEc23OCYBguLaZRlZxC916kocYT35ZV9Jsiocs9nk,3334
-wbportfolio/viewsets/configs/display/assets.py,sha256=8yLAXyrZLl7L1m1rhBnkh4uaqVpSQJhRVkcM7_AHBsc,10943
+wbportfolio/viewsets/configs/display/assets.py,sha256=SkWwzvrn4gOVbCThGJMV63V-iJh517qfUs4f4Wt3dBA,10573
 wbportfolio/viewsets/configs/display/claim.py,sha256=MRtEdxWjsDjt1k6O-ltM-SpPmHWBk85sCycsRgzd9jI,12041
 wbportfolio/viewsets/configs/display/custodians.py,sha256=R-tnktfY48K-8Zz-Fg_M6IXKHv42J1ZeSpom7lvYVS8,801
 wbportfolio/viewsets/configs/display/esg.py,sha256=W8uetCPN2TjHtU2kvQjKOmkq7uoaYvzX2iLN6Nz78Pk,3111
 wbportfolio/viewsets/configs/display/fees.py,sha256=_8HDJADh5bA5VMVPkhKObPmNNdPHWR8Oz23PEgd04F0,5834
 wbportfolio/viewsets/configs/display/portfolio_cash_flow.py,sha256=CS_UGhKZSXnX-0SZ0RXzbG1WMJm6NX3GUljwIa4RWBk,5025
 wbportfolio/viewsets/configs/display/portfolio_relationship.py,sha256=8DvsYWFCX29qj5wUf1wCtjlPwzKRd_E7JDuo_CopaJ0,1294
-wbportfolio/viewsets/configs/display/portfolios.py,sha256=ke60jc2yUjEHjkyt4yruM3LXnKC63oO2RMmaj_4ljks,10716
+wbportfolio/viewsets/configs/display/portfolios.py,sha256=HFUFYajD7l-7WhwsxEeBp8QvJ5ZZY03EA8Am-DQ6f6w,10726
 wbportfolio/viewsets/configs/display/positions.py,sha256=yolWLxzGPIpSQSiVhVQChURqbomPt5kSjkYrmXT1Mik,3123
 wbportfolio/viewsets/configs/display/product_groups.py,sha256=PwI-A0_ofShT2pub9-C1HqreiqpHxKMHd51JYwEzvbM,2500
 wbportfolio/viewsets/configs/display/product_performance.py,sha256=6Mme48JBn_okwClR44dBK2OK26ejvdasDvBa5DI33_0,10070
-wbportfolio/viewsets/configs/display/products.py,sha256=KRDAaDIBYFkC4mYgiBR0_7E-jK8DwxjNsQuUjf_p_GE,11251
+wbportfolio/viewsets/configs/display/products.py,sha256=WraPeMIS87Vd3wstA4Vt3zi41vgLUxK5eoqCIQLyr8k,10679
 wbportfolio/viewsets/configs/display/rebalancing.py,sha256=yw9X1Nf2-V_KP_mCX4pVKnJSjSstHMoocMkyO73KpkU,1112
 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=_J60o7s1gQ-2Jg3JvWLDWgfsobIy60kzYWdJ8ea0Fn8,16823
+wbportfolio/viewsets/configs/display/trades.py,sha256=3rvIYMCe3IOyDw5HTrXcPvstdDg6Zt13oskh1yKQyRY,16613
 wbportfolio/viewsets/configs/display/transactions.py,sha256=DOM3eV1DxBwX6Iiw3C2sJamWh6A_3ZSYC9447Jc3Wmo,2586
 wbportfolio/viewsets/configs/endpoints/__init__.py,sha256=E13AYY3CIW4CZtmqwBVMPDYA5zNyKJeRZtiXKtad68Y,2871
 wbportfolio/viewsets/configs/endpoints/adjustments.py,sha256=9CcnfNuFcxsZ8YvfUitSeyCvpLxY-jU-gIw3GG0mIp4,697
@@ -473,7 +474,7 @@ wbportfolio/viewsets/configs/endpoints/reconciliations.py,sha256=xriq1KSctxQa6AE
 wbportfolio/viewsets/configs/endpoints/roles.py,sha256=5Nwi2sdUYc85YL0wJ7SUtt87ZBTOVdFnEexUgVrmcX4,367
 wbportfolio/viewsets/configs/endpoints/trade_proposals.py,sha256=sno7SOHWjKvvF_YdgYx5KthntM--F3DX-9hsrY5vRTM,783
 wbportfolio/viewsets/configs/endpoints/trades.py,sha256=5NKMSYaGWDd8OcV16HLRSlAgYYXObLikLf2w4ix2DoE,3483
-wbportfolio/viewsets/configs/endpoints/transactions.py,sha256=HQDuQ_wrnkCGTNhnx1zKsPifcDCnlpaOD2NYYiNYd54,633
+wbportfolio/viewsets/configs/endpoints/transactions.py,sha256=6u2GWm67o4g1PoAtZXLdLyu3J4qhyOA1dm9Otu1i9f8,813
 wbportfolio/viewsets/configs/menu/__init__.py,sha256=gzUpv5f8FAK1Bdhn0AhcMLJR3r9RXHRXcHg21vuvGxs,1184
 wbportfolio/viewsets/configs/menu/adjustments.py,sha256=sQ25Jp2N8nsLSUOEJTJUBE0Y7bIPHK4Y6LE0e1OzX38,316
 wbportfolio/viewsets/configs/menu/assets.py,sha256=FkddF1_mu01e1mnkJkXPQcE0izI0Q3wU7VBFIkeT-Qw,340
@@ -517,10 +518,10 @@ wbportfolio/viewsets/transactions/claim.py,sha256=m_Fy4J_QZSve1VlR_sPQrVBDopgCqq
 wbportfolio/viewsets/transactions/fees.py,sha256=7VUXIogmRrXCz_D9tvDiiTae0t5j09W9zPUzxXzBGTE,7031
 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=nZsomopPfeLg1owPpOdIbhdHfCFa3-Qh-uyqoSATOjw,5821
-wbportfolio/viewsets/transactions/trades.py,sha256=2w6c5ExZNmyMBGTWR3_3SEuuJ727AjKr_HgZE3sDt1Y,20950
+wbportfolio/viewsets/transactions/trade_proposals.py,sha256=iQpC_Thbj56SmM05vPRsF1JZguGBDaTUH3I-_iCHCV0,5958
+wbportfolio/viewsets/transactions/trades.py,sha256=xeEzx7GP34aBNPlDmiUmT86labsbb8_f1U2RCN1Jatg,21494
 wbportfolio/viewsets/transactions/transactions.py,sha256=ixDp-nsNA8t_A06rBCT19hOMJHy0iRmdz1XKdV1OwAs,4450
-wbportfolio-1.49.0.dist-info/METADATA,sha256=4ie6HSvXOoA_xHCciE716QeJG61w5Y93BDzIYvuOeVw,734
-wbportfolio-1.49.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.49.0.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.49.0.dist-info/RECORD,,
+wbportfolio-1.49.2.dist-info/METADATA,sha256=cFNyn_eGy7Dwxdfb_oqZH6Z2zj79fYUOsKj6cTy5XNo,734
+wbportfolio-1.49.2.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.49.2.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.49.2.dist-info/RECORD,,