wbportfolio 1.46.2__py2.py3-none-any.whl → 1.46.4__py2.py3-none-any.whl

wbportfolio/import_export/handlers/trade.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from decimal import Decimal
 from typing import Any, Dict, Optional
 
 from django.db import models
@@ -66,6 +67,10 @@ class TradeImportHandler(ImportExportHandler):
 
             data["marked_for_deletion"] = data.get("marked_for_deletion", False)
 
+        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)
+
     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
             data["transaction_date"] = data["book_date"]

wbportfolio/models/portfolio.py

@@ -558,7 +558,7 @@ class Portfolio(DeleteToDisableMixin, WBModel):
         return Portfolio.get_contribution_df(qs, hedged_currency=hedged_currency)
 
     def check_related_portfolio_at_date(self, val_date: date, related_portfolio: "Portfolio"):
-        assets = AssetPosition.unannotated_objects.filter(
+        assets = AssetPosition.objects.filter(
             date=val_date, underlying_instrument__is_cash=False, underlying_instrument__is_cash_equivalent=False
         ).values("underlying_instrument", "shares")
         assets1 = assets.filter(portfolio=self)

{wbportfolio-1.46.2.dist-info → wbportfolio-1.46.4.dist-info}/METADATA

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

{wbportfolio-1.46.2.dist-info → wbportfolio-1.46.4.dist-info}/RECORD

@@ -115,7 +115,7 @@ wbportfolio/import_export/handlers/dividend.py,sha256=tftdVdAzNpKSSvouOtvJfzWL36
 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/register.py,sha256=sYyXkE8b1DPZ5monxylZn0kjxLVdNYYZR-p61dwEoDM,2271
-wbportfolio/import_export/handlers/trade.py,sha256=LIzXNEN7-tRWCUBvisgy8eTDL85JWO5c7iN06yJA-TI,10395
+wbportfolio/import_export/handlers/trade.py,sha256=Wvj7aFzc4UXYU5dZSxqBkA9hBozHiKzwGSmF6g2-Zss,10635
 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
@@ -246,7 +246,7 @@ wbportfolio/models/adjustments.py,sha256=osXWkJZOiansPWYPyHtl7Z121zDWi7u1YMtrBQt
 wbportfolio/models/asset.py,sha256=V-fSAF1bsfj_Td3VfdKyhCgcwB_xPS6vTI90Dh5iDx8,37502
 wbportfolio/models/custodians.py,sha256=owTiS2Vm5CRKzh9M_P9GOVg-s-ndQ9UvRmw3yZP7cw0,3815
 wbportfolio/models/indexes.py,sha256=iLYF2gzNzX4GLj_Nh3fybUcAQ1TslnT0wgQ6mN164QI,728
-wbportfolio/models/portfolio.py,sha256=NsgxZu32H7AfSHyn2Rwa65EkjvZt-YtQHzWhWlV6zf0,55513
+wbportfolio/models/portfolio.py,sha256=r_qTDNTeUu9QiJ6g_g1rIp5yOuUOwinqadJtykb9KE8,55501
 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
@@ -517,7 +517,7 @@ wbportfolio/viewsets/transactions/rebalancing.py,sha256=6rIrdK0rtKL1afJ-tYfAGdQV
 wbportfolio/viewsets/transactions/trade_proposals.py,sha256=fYTvvRk7k5xsBzbIgJvU4I4OrllF0VkhlrekD4GVgDk,4296
 wbportfolio/viewsets/transactions/trades.py,sha256=wdtEWN1V5wsmesR3mRxPmTJUIAmDmqaNsfIhOB57kqY,16330
 wbportfolio/viewsets/transactions/transactions.py,sha256=ixDp-nsNA8t_A06rBCT19hOMJHy0iRmdz1XKdV1OwAs,4450
-wbportfolio-1.46.2.dist-info/METADATA,sha256=bEYm3Lj9tFZ1b7iRLZKLFmRjfGKhl5HLDHXbJJIr7Eo,734
-wbportfolio-1.46.2.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.46.2.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.46.2.dist-info/RECORD,,
+wbportfolio-1.46.4.dist-info/METADATA,sha256=LBAxC3QZKE6WC_N1GU_qjaePjDQK7cKDct9pQqUaBKw,734
+wbportfolio-1.46.4.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.46.4.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.46.4.dist-info/RECORD,,