wbportfolio 1.56.3__tar.gz → 1.56.5__tar.gz

{wbportfolio-1.56.3 → wbportfolio-1.56.5}/PKG-INFO

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

{wbportfolio-1.56.3 → wbportfolio-1.56.5}/wbportfolio/api_clients/ubs.py

@@ -90,7 +90,7 @@ class UBSNeoAPIClient:
         isin = self._validate_isin(isin, test=test)
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/submit/{isin}"
         payload = {"items": items}
-        response = requests.post(url, json=payload, headers=self._get_headers(), timeout=10)
+        response = requests.post(url, json=payload, headers=self._get_headers(), timeout=60)
         self._raise_for_status(response)
         return self._get_json(response)
 
@@ -99,7 +99,7 @@ class UBSNeoAPIClient:
         isin = self._validate_isin(isin)
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/savedraft/{isin}"
         payload = {"items": items}
-        response = requests.post(url, json=payload, headers=self._get_headers(), timeout=10)
+        response = requests.post(url, json=payload, headers=self._get_headers(), timeout=60)
         self._raise_for_status(response)
         return self._get_json(response)
 
@@ -107,14 +107,14 @@ class UBSNeoAPIClient:
         """Cancel a rebalance request."""
         isin = self._validate_isin(isin)
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/cancel/{isin}"
-        response = requests.delete(url, headers=self._get_headers(), timeout=10)
+        response = requests.delete(url, headers=self._get_headers(), timeout=60)
         self._raise_for_status(response)
         return self._get_json(response)
 
     def get_current_rebalance_request(self, isin: str) -> dict:
         """Fetch the current rebalance request for a certificate."""
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/currentRebalanceRequest/{isin}"
-        response = requests.get(url, headers=self._get_headers(), timeout=10)
+        response = requests.get(url, headers=self._get_headers(), timeout=60)
         self._raise_for_status(response)
         return self._get_json(response)
 
@@ -130,7 +130,7 @@ class UBSNeoAPIClient:
             url,
             headers=self._get_headers(),
             params={"fromDate": from_date.strftime("%Y-%m-%d"), "toDate": to_date.strftime("%Y-%m-%d")},
-            timeout=10,
+            timeout=30,
         )
         self._raise_for_status(response)
         return self._get_json(response)
@@ -141,7 +141,7 @@ class UBSNeoAPIClient:
             url,
             headers=self._get_headers(),
             params={"fromDate": from_date.strftime("%Y-%m-%d"), "toDate": to_date.strftime("%Y-%m-%d")},
-            timeout=10,
+            timeout=30,
         )
         self._raise_for_status(response)
         return self._get_json(response)

{wbportfolio-1.56.3 → wbportfolio-1.56.5}/wbportfolio/contrib/company_portfolio/models.py

@@ -3,6 +3,7 @@ from datetime import date
 from decimal import Decimal
 
 from django.conf import settings
+from django.core.cache import cache
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
@@ -16,7 +17,12 @@ from wbportfolio.models import Claim, Product
 
 
 def get_total_assets_under_management(val_date: date) -> Decimal:
-    return sum([product.get_total_aum_usd(val_date) for product in Product.active_objects.all()])
+    cache_key = f"total_assets_under_management:{val_date.isoformat()}"
+    return cache.get_or_set(
+        cache_key,
+        lambda: sum([product.get_total_aum_usd(val_date) for product in Product.active_objects.all()]),
+        60 * 60 * 24,
+    )
 
 
 def get_lost_client_customer_status():
@@ -44,9 +50,8 @@ class Updater:
         self.val_date = val_date
         self.total_assets_under_management = get_total_assets_under_management(val_date)
 
-    def update_company_data(self, company):
+    def update_company_data(self, company_portfolio_data) -> tuple[str, str]:
         # save company portfolio data
-        company_portfolio_data = CompanyPortfolioData.objects.get_or_create(company=company)[0]
         if (
             invested_assets_under_management_usd := company_portfolio_data.get_assets_under_management_usd(
                 self.val_date
@@ -55,19 +60,11 @@ class Updater:
             company_portfolio_data.invested_assets_under_management_usd = invested_assets_under_management_usd
         if (potential := company_portfolio_data.get_potential(self.val_date)) is not None:
             company_portfolio_data.potential = potential
-        company_portfolio_data.save()
 
         # update the company object itself
-        if (tier := company_portfolio_data.get_tiering(self.total_assets_under_management)) is not None:
-            company.tier = tier
-        company.customer_status = company_portfolio_data.get_customer_status()
-        company.save()
-
-    # def update_all_companies(self, val_date: date):
-    #     for company in tqdm(qs, total=qs.count()):
-    #         with suppress(CompanyPortfolioData.DoesNotExist):
-    #             company_portfolio = CompanyPortfolioData.objects.get(company=company)
-    #             company_portfolio.update_data(date.today())
+        tier = company_portfolio_data.get_tiering(self.total_assets_under_management)
+        customer_status = company_portfolio_data.get_customer_status()
+        return customer_status, tier
 
 
 class CompanyPortfolioData(models.Model):
@@ -104,14 +101,6 @@ class CompanyPortfolioData(models.Model):
         verbose_name="AUM",
         help_text="The Assets under Management (AUM) that is managed by this company or this person's primary employer.",
     )
-    invested_assets_under_management_usd = models.DecimalField(
-        max_digits=17,
-        decimal_places=2,
-        null=True,
-        blank=True,
-        help_text="The invested Assets under Management (AUM).",
-        verbose_name="Invested AUM ($)",
-    )
 
     investment_discretion = models.CharField(
         max_length=21,
@@ -120,10 +109,6 @@ class CompanyPortfolioData(models.Model):
         help_text="What discretion this company or this person's primary employer has to invest its assets.",
         verbose_name="Investment Discretion",
     )
-
-    potential = models.DecimalField(
-        decimal_places=2, max_digits=19, null=True, blank=True, help_text=potential_help_text
-    )
     potential_currency = models.ForeignKey(
         to="currency.Currency",
         related_name="wbportfolio_potential_currencies",
@@ -132,6 +117,25 @@ class CompanyPortfolioData(models.Model):
         on_delete=models.PROTECT,
     )
 
+    # Dynamic fields
+    invested_assets_under_management_usd = models.DecimalField(
+        max_digits=17,
+        decimal_places=2,
+        null=True,
+        blank=True,
+        help_text="The invested Assets under Management (AUM).",
+        verbose_name="Invested AUM ($)",
+    )
+
+    potential = models.DecimalField(
+        decimal_places=2, max_digits=19, null=True, blank=True, help_text=potential_help_text
+    )
+
+    def update(self):
+        with suppress(CurrencyFXRates.DoesNotExist):
+            val_date = CurrencyFXRates.objects.latest("date").date
+            self.company.customer_status, self.company.tier = Updater(val_date).update_company_data(self)
+
     def get_assets_under_management_usd(self, val_date: date) -> Decimal:
         return Claim.objects.filter(status=Claim.Status.APPROVED).filter_for_customer(
             self.company
@@ -140,16 +144,17 @@ class CompanyPortfolioData(models.Model):
         )["invested_aum_usd"] or Decimal(0)
 
     def _get_default_potential(self, val_date: date) -> Decimal:
-        with suppress(CurrencyFXRates.DoesNotExist):
-            fx = CurrencyFXRates.objects.get(currency=self.assets_under_management_currency, date=val_date).value
+        if self.assets_under_management:
+            with suppress(CurrencyFXRates.DoesNotExist):
+                fx = CurrencyFXRates.objects.get(currency=self.assets_under_management_currency, date=val_date).value
 
-            aum_usd = self.assets_under_management / fx
-            aum_potential = Decimal(0)
-            for asset_allocation in self.company.asset_allocations.all():
-                aum_potential += aum_usd * asset_allocation.percent * asset_allocation.max_investment
-            invested_aum = self.invested_assets_under_management_usd or Decimal(0.0)
+                aum_usd = self.assets_under_management / fx
+                aum_potential = Decimal(0)
+                for asset_allocation in self.company.asset_allocations.all():
+                    aum_potential += aum_usd * asset_allocation.percent * asset_allocation.max_investment
+                invested_aum = self.invested_assets_under_management_usd or Decimal(0.0)
 
-            return aum_potential - invested_aum
+                return aum_potential - invested_aum
 
     def get_potential(self, val_date: date) -> Decimal:
         if module_path := getattr(settings, "PORTFOLIO_COMPANY_DATA_POTENTIAL_METHOD", None):
@@ -225,11 +230,6 @@ class CompanyPortfolioData(models.Model):
         verbose_name_plural = "Company Portfolio Data"
 
 
-@receiver(post_save, sender="directory.Company")
-def create_company_portfolio_data(sender, instance, created, **kwargs):
-    CompanyPortfolioData.objects.get_or_create(company=instance)
-
-
 class AssetAllocationType(WBModel):
     name = models.CharField(max_length=255)
     default_max_investment = models.DecimalField(
@@ -329,3 +329,33 @@ class GeographicFocus(models.Model):
     @classmethod
     def get_representation_label_key(cls):
         return "{{company}}: {{percent}} {{country}}"
+
+
+@receiver(post_save, sender=AssetAllocation)
+@receiver(post_save, sender=GeographicFocus)
+def post_save_company_data(sender, instance, created, **kwargs):
+    company = instance.company
+    portfolio_data, created = CompanyPortfolioData.objects.get_or_create(company=company)
+    if not created:
+        portfolio_data.update()
+        portfolio_data.save()
+        portfolio_data.company.save()
+
+
+@receiver(post_save, sender="directory.Company")
+def handle_company_portfolio_data(sender, instance, created, **kwargs):
+    # create default asset allocation type (equity 50/50)
+    if not instance.asset_allocations.exists():
+        equity_asset_type = AssetAllocationType.objects.get_or_create(name="Equity")[0]
+        AssetAllocation.objects.create(
+            company=instance,
+            asset_type=equity_asset_type,
+            percent=0.5,
+            max_investment=0.5,
+        )
+    if created:
+        portfolio_data, created = CompanyPortfolioData.objects.get_or_create(company=instance)
+        if not created:
+            portfolio_data.update()
+            portfolio_data.save()
+            portfolio_data.company.save()

{wbportfolio-1.56.3 → wbportfolio-1.56.5}/wbportfolio/contrib/company_portfolio/serializers.py

@@ -91,7 +91,7 @@ def update_portfolio_data(company_portfolio_data, portfolio_data):
 
     if investment_discretion := portfolio_data["investment_discretion"]:
         company_portfolio_data.investment_discretion = investment_discretion
-
+    company_portfolio_data.update()
     company_portfolio_data.save()
 
 
@@ -243,11 +243,9 @@ class PersonModelListSerializer(CompanyPortfolioDataMixin, BasePersonModelListSe
 
 
 class AssetAllocationTypeRepresentationSerializer(serializers.RepresentationSerializer):
-    _detail = serializers.HyperlinkField(reverse_name="company_portfolio:assetallocationtyperepresentation-detail")
-
     class Meta:
         model = AssetAllocationType
-        fields = ("id", "name", "_detail")
+        fields = ("id", "name")
 
 
 class AssetAllocationTypeModelSerializer(serializers.ModelSerializer):

{wbportfolio-1.56.3 → wbportfolio-1.56.5}/wbportfolio/contrib/company_portfolio/tasks.py

@@ -19,5 +19,16 @@ def update_all_portfolio_data(val_date: date | None = None):
         has_account=Exists(Account.objects.filter(owner=OuterRef("pk"))),
         has_portfolio_data=Exists(CompanyPortfolioData.objects.filter(company=OuterRef("pk"))),
     )
+    company_objs = []
+    portfolio_data_objs = []
     for company in tqdm(qs, total=qs.count()):
-        updater.update_company_data(company)
+        portfolio_data = CompanyPortfolioData.objects.get_or_create(company=company)[0]
+        company.customer_status, company.tier = updater.update_company_data(portfolio_data)
+        portfolio_data_objs.append(portfolio_data)
+        company_objs.append(company)
+    if company_objs:
+        Company.objects.bulk_update(company_objs, ["customer_status", "tier"])
+    if portfolio_data_objs:
+        CompanyPortfolioData.objects.bulk_update(
+            portfolio_data_objs, ["invested_assets_under_management_usd", "potential"]
+        )

{wbportfolio-1.56.3 → wbportfolio-1.56.5}/wbportfolio/import_export/handlers/asset_position.py

@@ -1,6 +1,6 @@
 from collections import defaultdict
 from contextlib import suppress
-from datetime import datetime
+from datetime import datetime, timedelta
 from decimal import Decimal
 from itertools import chain
 from typing import Any, Dict, List, Optional
@@ -31,7 +31,7 @@ class AssetPositionImportHandler(ImportExportHandler):
         self.instrument_price_handler = InstrumentPriceImportHandler(self.import_source)
         self.currency_handler = CurrencyImportHandler(self.import_source)
 
-    def _deserialize(self, data: Dict[str, Any]):
+    def _deserialize(self, data: Dict[str, Any]):  # noqa: C901
         from wbportfolio.models import Portfolio
 
         portfolio_data = data.pop("portfolio", None)
@@ -45,6 +45,10 @@ class AssetPositionImportHandler(ImportExportHandler):
                     data["initial_price"] /= 1000
             data["currency"] = currency
         data["date"] = datetime.strptime(data["date"], "%Y-%m-%d").date()
+
+        # ensure that the position falls into a weekday
+        if data["date"].weekday() == 5:
+            data["date"] -= timedelta(days=1)
         if data.get("asset_valuation_date", None):
             data["asset_valuation_date"] = datetime.strptime(data["asset_valuation_date"], "%Y-%m-%d").date()
         else:

{wbportfolio-1.56.3 → wbportfolio-1.56.5}/wbportfolio/import_export/parsers/natixis/equity.py

@@ -43,16 +43,16 @@ def parse(import_source):
             df = pd.read_excel(import_source.file, engine="openpyxl", sheet_name="Basket Valuation")
         except BadZipFile:
             df = pd.read_excel(import_source.file, engine="xlrd", sheet_name="Basket Valuation")
-        xx, yy = np.where(df == "Ticker")
-        if not xx and not yy:
-            xx, yy = np.where(df == "Code")
-        df = df.iloc[xx[0] :, yy[0] :]
-        df = df.rename(columns=df.iloc[0]).drop(df.index[0]).dropna(how="all")
-        df["Quotity/Adj. factor"] = 1.0
-        df = df.rename(columns={"Code": "Ticker"})
-
+        xx, yy = np.where(df.isin(["Ticker", "Code"]))
+        if xx.size > 0 and yy.size > 0:
+            df = df.iloc[xx[0] :, yy[0] :]
+            df = df.rename(columns=df.iloc[0]).drop(df.index[0]).dropna(how="all")
+            df["Quotity/Adj. factor"] = 1.0
+            df = df.rename(columns={"Code": "Ticker"})
+        else:
+            return {}
     df = df.rename(columns=FIELD_MAP)
-    df = df.dropna(subset=["initial_price"])
+    df = df.dropna(subset=["initial_price", "Name"], how="any")
     df["initial_price"] = df["initial_price"].astype("str").str.replace(" ", "").astype("float")
     df["underlying_quote"] = df[["Ticker", "Name", "currency__key"]].apply(
         lambda x: _get_underlying_instrument(*x), axis=1

{wbportfolio-1.56.3 → wbportfolio-1.56.5}/wbportfolio/models/asset.py

@@ -448,7 +448,10 @@ class AssetPosition(ImportMixin, models.Model):
                     net_value = self.initial_price
                     # in case the position currency and the linked underlying_quote currency don't correspond, we convert the rate accordingly
                     if self.currency != self.underlying_quote.currency:
-                        net_value *= self.currency.convert(self.asset_valuation_date, self.underlying_quote.currency)
+                        with suppress(CurrencyFXRates.DoesNotExist):
+                            net_value *= self.currency.convert(
+                                self.asset_valuation_date, self.underlying_quote.currency
+                            )
                     self.underlying_quote_price = InstrumentPrice.objects.create(
                         calculated=False,
                         instrument=self.underlying_quote,

{wbportfolio-1.56.3 → wbportfolio-1.56.5}/wbportfolio/models/orders/order_proposals.py

@@ -20,7 +20,7 @@ from django.db.models.functions import Coalesce, Round
 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.utils.translation import gettext_lazy
 from django_fsm import FSMField, transition
 from pandas._libs.tslibs.offsets import BDay
 from wbcompliance.models.risk_management.mixins import RiskCheckMixin
@@ -172,7 +172,7 @@ class OrderProposal(CloneMixin, RiskCheckMixin, WBModel):
 
     @cached_property
     def portfolio_total_asset_value(self) -> Decimal:
-        return self.portfolio.get_total_asset_value(self.last_effective_date)
+        return self.get_portfolio_total_asset_value()
 
     @cached_property
     def validated_trading_service(self) -> TradingService:
@@ -248,6 +248,25 @@ class OrderProposal(CloneMixin, RiskCheckMixin, WBModel):
         # TODO make this dynamically configurable
         return "MARKET_ON_CLOSE"
 
+    def get_portfolio_total_asset_value(self):
+        return self.portfolio.get_total_asset_value(self.last_effective_date)
+        # return self.orders.annotate(
+        #     effective_shares=Coalesce(
+        #         Subquery(
+        #             AssetPosition.objects.filter(
+        #                 underlying_quote=OuterRef("underlying_instrument"),
+        #                 date=self.last_effective_date,
+        #                 portfolio=self.portfolio,
+        #             )
+        #             .values("portfolio")
+        #             .annotate(s=Sum("shares"))
+        #             .values("s")[:1]
+        #         ),
+        #         Decimal(0),
+        #     ),
+        #     effective_total_value_fx_portfolio=F("effective_shares") * F("currency_fx_rate") * F("price"),
+        # ).aggregate(s=Sum("effective_total_value_fx_portfolio"))["s"] or Decimal(0.0)
+
     def get_orders(self):
         # TODO Issue here: the cash is subqueried on the portfolio, on portfolio such as the fund, there is multiple cash component, that we exclude in the orders (and use a unique cash position instead)
         # so the subquery returns the previous position (probably USD), but is missing the other cash aggregation. We need to find a way to handle that properly
@@ -428,7 +447,6 @@ class OrderProposal(CloneMixin, RiskCheckMixin, WBModel):
 
         # 3. Prepare a mapping from instrument IDs to weights for analytic calculations.
         previous_weights = {instrument.id: float(info["weighting"]) for instrument, info in portfolio.items()}
-
         # 4. Attempt to fetch analytic returns and portfolio contribution. Default on error.
         try:
             last_returns, contribution = self.portfolio.get_analytic_portfolio(
@@ -437,7 +455,6 @@ class OrderProposal(CloneMixin, RiskCheckMixin, WBModel):
             last_returns = last_returns.to_dict()
         except ValueError:
             last_returns, contribution = {}, 1
-
         positions = []
         total_weighting = Decimal("0")
 
@@ -458,6 +475,27 @@ class OrderProposal(CloneMixin, RiskCheckMixin, WBModel):
                 weighting = drifted_weight + row["delta_weight"]
 
             # Assemble the position object
+            trade_date = self.last_effective_date if use_effective else self.trade_date
+            price_data = {}
+            with suppress(InstrumentPrice.DoesNotExist):
+                instrument_price = instrument.valuations.get(date=trade_date)
+                if fx_rate := instrument_price.currency_fx_rate_to_usd:
+                    price_data = {
+                        "volume_usd": instrument_price.volume
+                        * float(instrument_price.net_value)
+                        / float(fx_rate.value)
+                    }
+                    if instrument_price.market_capitalization:
+                        price_data["market_capitalization_usd"] = instrument_price.market_capitalization / float(
+                            fx_rate.value
+                        )
+                    if row["shares"] is not None:
+                        if instrument_price.market_capitalization:
+                            price_data["market_share"] = (
+                                float(row["shares"]) * float(row["price"]) / instrument_price.market_capitalization
+                            )
+                        if instrument_price.volume_50d:
+                            price_data["daily_liquidity"] = float(row["shares"]) / instrument_price.volume_50d / 0.33
             positions.append(
                 PositionDTO(
                     underlying_instrument=instrument.id,
@@ -466,10 +504,14 @@ class OrderProposal(CloneMixin, RiskCheckMixin, WBModel):
                     daily_return=daily_return if use_effective else Decimal("0"),
                     shares=row["shares"],
                     currency=instrument.currency.id,
-                    date=self.last_effective_date if use_effective else self.trade_date,
+                    date=trade_date,
+                    asset_valuation_date=trade_date,
                     is_cash=instrument.is_cash or instrument.is_cash_equivalent,
                     price=row["price"],
                     currency_fx_rate=row["currency_fx_rate"],
+                    exchange=instrument.exchange.id if instrument.exchange else None,
+                    country=instrument.country.id if instrument.country else None,
+                    **price_data,
                 )
             )
             total_weighting += weighting
@@ -584,12 +626,16 @@ class OrderProposal(CloneMixin, RiskCheckMixin, WBModel):
             target_portfolio = self._get_default_target_portfolio(use_desired_target_weight=use_desired_target_weight)
         if not effective_portfolio:
             effective_portfolio = self._get_default_effective_portfolio()
+        if use_desired_target_weight:
+            total_target_weight = target_portfolio.total_weight
+        else:
+            total_target_weight = self.total_expected_target_weight
         if target_portfolio:
             service = TradingService(
                 self.trade_date,
                 effective_portfolio=effective_portfolio,
                 target_portfolio=target_portfolio,
-                total_target_weight=self.total_expected_target_weight,
+                total_target_weight=total_target_weight,
             )
             if validate_order:
                 service.is_valid()
@@ -601,15 +647,11 @@ class OrderProposal(CloneMixin, RiskCheckMixin, WBModel):
             portfolio_value = self.portfolio_total_asset_value
             for order_dto in orders:
                 instrument = Instrument.objects.get(id=order_dto.underlying_instrument)
-                currency_fx_rate = instrument.currency.convert(
-                    self.value_date, self.portfolio.currency, exact_lookup=True
-                )
                 # we cannot do a bulk-create because Order is a multi table inheritance
                 weighting = round(order_dto.delta_weight, Order.ORDER_WEIGHTING_PRECISION)
                 daily_return = order_dto.daily_return
                 try:
                     order = self.orders.get(underlying_instrument=instrument)
-                    order.currency_fx_rate = currency_fx_rate
                     order.daily_return = daily_return
                 except Order.DoesNotExist:
                     order = Order(
@@ -618,18 +660,18 @@ class OrderProposal(CloneMixin, RiskCheckMixin, WBModel):
                         value_date=self.trade_date,
                         weighting=weighting,
                         daily_return=daily_return,
-                        currency_fx_rate=currency_fx_rate,
                     )
-                order.pre_save()
-                order.set_weighting(weighting, portfolio_value)
-                order.desired_target_weight = order_dto.target_weight
                 order.order_type = Order.get_type(
                     weighting, round(order_dto.previous_weight, 8), round(order_dto.target_weight, 8)
                 )
-                # # if we cannot automatically find a price, we consider the stock is invalid and we sell it
-                # if not order.price and order.weighting > 0:
-                #     order.price = Decimal("0.0")
-                #     order.weighting = -order_dto.effective_weight
+                order.pre_save()
+                order.set_weighting(weighting, portfolio_value)
+                order.desired_target_weight = order_dto.target_weight
+
+                # if we cannot automatically find a price, we consider the stock is invalid and we sell it
+                if not order.price and order.weighting > 0:
+                    order.price = Decimal("0.0")
+                    order.weighting = -order_dto.effective_weight
                 objs.append(order)
             Order.objects.bulk_create(
                 objs,
@@ -916,7 +958,7 @@ class OrderProposal(CloneMixin, RiskCheckMixin, WBModel):
             #         "There is no change detected in this order proposal. Please submit at last one valid order"
             #     )
             if len(service.validated_trades) == 0:
-                errors_list.append(_("There is no valid order on this proposal"))
+                errors_list.append(gettext_lazy("There is no valid order on this proposal"))
             if service.errors:
                 errors_list.extend(service.errors)
             if errors_list:
@@ -1043,22 +1085,26 @@ class OrderProposal(CloneMixin, RiskCheckMixin, WBModel):
         errors = dict()
         orders = self.get_orders()
         if not self.portfolio.can_be_rebalanced:
-            errors["non_field_errors"] = [_("The portfolio does not allow manual rebalanced")]
+            errors["non_field_errors"] = [gettext_lazy("The portfolio does not allow manual rebalanced")]
         if not orders.exists():
             errors["non_field_errors"] = [
-                _("At least one order needs to be submitted to be able to apply this proposal")
+                gettext_lazy("At least one order needs to be submitted to be able to apply this proposal")
             ]
         if not self.portfolio.can_be_rebalanced:
             errors["portfolio"] = [
-                [_("The portfolio needs to be a model portfolio in order to apply this order proposal manually")]
+                [
+                    gettext_lazy(
+                        "The portfolio needs to be a model portfolio in order to apply this order proposal manually"
+                    )
+                ]
             ]
         if self.has_non_successful_checks:
-            errors["non_field_errors"] = [_("The pre orders rules did not passed successfully")]
+            errors["non_field_errors"] = [gettext_lazy("The pre orders rules did not passed successfully")]
         if orders.filter(has_warnings=True).filter(
             underlying_instrument__is_cash=False, underlying_instrument__is_cash_equivalent=False
         ):
             errors["non_field_errors"] = [
-                _("There is warning that needs to be addresses on the orders before approval.")
+                gettext_lazy("There is warning that needs to be addresses on the orders before approval.")
             ]
         return errors
 
@@ -1122,7 +1168,9 @@ class OrderProposal(CloneMixin, RiskCheckMixin, WBModel):
         errors = dict()
         if not self.portfolio.can_be_rebalanced:
             errors["portfolio"] = [
-                _("The portfolio needs to be a model portfolio in order to revert this order proposal manually")
+                gettext_lazy(
+                    "The portfolio needs to be a model portfolio in order to revert this order proposal manually"
+                )
             ]
         return errors