wbportfolio 1.54.13__py2.py3-none-any.whl → 1.54.14__py2.py3-none-any.whl

wbportfolio/models/portfolio.py

@@ -97,7 +97,7 @@ def get_returns(
     if df.empty:
         raise InvalidAnalyticPortfolio()
     df = (
-        df.pivot_table(index="valuation_date", columns="instrument_id", values=["fx_rate", "close"])
+        df.pivot_table(index="valuation_date", columns="instrument_id", values=["fx_rate", "close"], dropna=False)
         .astype(float)
         .sort_index()
     )

wbportfolio/models/transactions/trade_proposals.py

@@ -695,7 +695,7 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
             **kwargs,
         )
         if replay and self.portfolio.is_manageable:
-            replay_as_task.delay(self.id, user_id=by.id if by else None)
+            replay_as_task.delay(self.id, user_id=by.id if by else None, broadcast_changes_at_date=False)
         return warnings
 
     def can_approve(self):
@@ -845,9 +845,9 @@ def post_fail_trade_proposal(sender, instance: TradeProposal, created, raw, **kw
 
 
 @shared_task(queue="portfolio")
-def replay_as_task(trade_proposal_id, user_id: int | None = None):
+def replay_as_task(trade_proposal_id, user_id: int | None = None, **kwargs):
     trade_proposal = TradeProposal.objects.get(id=trade_proposal_id)
-    trade_proposal.replay()
+    trade_proposal.replay(**kwargs)
     if user_id:
         user = User.objects.get(id=user_id)
         send_notification(

wbportfolio/viewsets/configs/buttons/trade_proposals.py

@@ -35,7 +35,8 @@ class TradeProposalButtonConfig(ButtonViewConfig):
                         icon=WBIcon.REGENERATE.icon,
                         label="Reset Trades",
                         description_fields="""
-                            <p>Delete and recreate initial trades to from its associated model portfolio</p>
+                            <p><strong>Warning:</strong> This action will delete all current trades and recreate initial trades based on your last effective portfolio.</p>
+                            <p><strong>Note:</strong> All delta weights will be permanently removed. This operation cannot be undone.</p>
                             """,
                         action_label="Reset Trades",
                         title="Reset Trades",

wbportfolio/viewsets/transactions/trade_proposals.py

@@ -99,6 +99,7 @@ class TradeProposalModelViewSet(CloneMixin, RiskCheckViewSetMixin, InternalUserP
     def reset(self, request, pk=None):
         trade_proposal = get_object_or_404(TradeProposal, pk=pk)
         if trade_proposal.status == TradeProposal.Status.DRAFT:
+            trade_proposal.trades.all().update(weighting=0)
             trade_proposal.reset_trades()
             return Response({"send": True})
         return Response({"status": "Trade proposal is not Draft"}, status=status.HTTP_400_BAD_REQUEST)

{wbportfolio-1.54.13.dist-info → wbportfolio-1.54.14.dist-info}/METADATA

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

{wbportfolio-1.54.13.dist-info → wbportfolio-1.54.14.dist-info}/RECORD

@@ -258,7 +258,7 @@ wbportfolio/models/asset.py,sha256=b0vPt4LwNrxcMiK7UmBKViYnbNNlZzPTagvU5vFuyrc,4
 wbportfolio/models/custodians.py,sha256=owTiS2Vm5CRKzh9M_P9GOVg-s-ndQ9UvRmw3yZP7cw0,3815
 wbportfolio/models/exceptions.py,sha256=3ix0tWUO-O6jpz8f07XIwycw2x3JFRoWzjwil8FVA2Q,52
 wbportfolio/models/indexes.py,sha256=gvW4K9U9Bj8BmVCqFYdWiXvDWhjHINRON8XhNsZUiQY,639
-wbportfolio/models/portfolio.py,sha256=5CddquPvVp-ImPlteNMqwDeY_mCFwdWMy7ynMRDDxak,58578
+wbportfolio/models/portfolio.py,sha256=7obqQAd2_COwTABtkp43muMlDA77NX16bq4J0oib1AI,58592
 wbportfolio/models/portfolio_cash_flow.py,sha256=uElG7IJUBY8qvtrXftOoskX6EA-dKgEG1JJdvHeWV7g,7336
 wbportfolio/models/portfolio_cash_targets.py,sha256=WmgG-etPisZsh2yaFQpz7EkpvAudKBEzqPsO715w52U,1498
 wbportfolio/models/portfolio_relationship.py,sha256=ZGECiPZiLdlk4uSamOrEfuzO0hduK6OMKJLUSnh5_kc,5190
@@ -285,7 +285,7 @@ wbportfolio/models/transactions/claim.py,sha256=SF2FlwG6SRVmA_hT0NbXah5-fYejccWK
 wbportfolio/models/transactions/dividends.py,sha256=mmOdGWR35yndUMoCuG24Y6BdtxDhSk2gMQ-8LVguqzg,1890
 wbportfolio/models/transactions/fees.py,sha256=wJtlzbBCAq1UHvv0wqWTE2BEjCF5RMtoaSDS3kODFRo,7112
 wbportfolio/models/transactions/rebalancing.py,sha256=rwePcmTZOYgfSWnBQcBrZ3DQHRJ3w17hdO_hgrRbbhI,7696
-wbportfolio/models/transactions/trade_proposals.py,sha256=1xOxHVOUwgTKCcY7mN4u5SoFtdJrQkNg6xA3O2-f4Yw,38340
+wbportfolio/models/transactions/trade_proposals.py,sha256=SniW7jU74FUuZQLsA6i6MGu6vM1qj4IPZvWFDpFOQc0,38391
 wbportfolio/models/transactions/trades.py,sha256=1gmAdavuWu1Iko90s9prMxsK_NuDKIUBIKMDuHiKzow,34176
 wbportfolio/models/transactions/transactions.py,sha256=XTcUeMUfkf5XTSZaR2UAyGqCVkOhQYk03_vzHLIgf8Q,3807
 wbportfolio/pms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -440,7 +440,7 @@ wbportfolio/viewsets/configs/buttons/products.py,sha256=bHOs2ftfaLbIbJ7E8yFqQqSu
 wbportfolio/viewsets/configs/buttons/reconciliations.py,sha256=lw4r22GHpqKPUF1MrB6P9dOkL-FHe5iiBJ0--f8D74E,3145
 wbportfolio/viewsets/configs/buttons/registers.py,sha256=aS89TsYHql83k-NHojOrLDqtBpnpsUUO8x63PiMfrXM,445
 wbportfolio/viewsets/configs/buttons/signals.py,sha256=6sKBQI_eDvZuZR5bUUwvur5R67A3oChAGxPfayWUelE,2739
-wbportfolio/viewsets/configs/buttons/trade_proposals.py,sha256=Os5jT-aL0jMNkdm2sJpGRZvY4OzreR6Ah7eHex_6zB4,3383
+wbportfolio/viewsets/configs/buttons/trade_proposals.py,sha256=K9anDc6am0YOyr1zQo2DxVMbddFOjEJXUS6g8-aPZrc,3584
 wbportfolio/viewsets/configs/buttons/trades.py,sha256=bPOqqwdgadSUbU9l5aSirqr5UAMFe2AiFNsXLRsKwn8,2535
 wbportfolio/viewsets/configs/display/__init__.py,sha256=jJqSCCAfw_vjbcsIkzKr39LdAZA810LUBfSH1EA7MAI,2086
 wbportfolio/viewsets/configs/display/adjustments.py,sha256=jIOEc23OCYBguLaZRlZxC916kocYT35ZV9Jsiocs9nk,3334
@@ -521,9 +521,9 @@ wbportfolio/viewsets/transactions/claim.py,sha256=Pb1WftoO-w-ZSTbLRhmQubhy7hgd68
 wbportfolio/viewsets/transactions/fees.py,sha256=WT2bWWfgozz4_rpyTKX7dgBBTXD-gu0nlsd2Nk2Zh1Q,7028
 wbportfolio/viewsets/transactions/mixins.py,sha256=WipvJoi5hylkpD0y9VATe30WAcwIHUIroVkK10FYw7k,636
 wbportfolio/viewsets/transactions/rebalancing.py,sha256=6rIrdK0rtKL1afJ-tYfAGdQVTN2MH1kG_yCeVkmyK8k,1263
-wbportfolio/viewsets/transactions/trade_proposals.py,sha256=kQCojTNKBEyn2NcenL3a9auzBH4sIgLEx8rLAYCGLGg,6161
+wbportfolio/viewsets/transactions/trade_proposals.py,sha256=7A_4JpwSYLj341_bv5TPBpIDri9sAfqhB7mVmJa9V7Q,6221
 wbportfolio/viewsets/transactions/trades.py,sha256=Y8v2cM0vpspHysaAvu8qqhzt86dNtb2Q3puo4HCJsTI,22629
-wbportfolio-1.54.13.dist-info/METADATA,sha256=_ndN0PmfKx6Ro3nobejfixoQ24CM1gUlhn8OkG_vsX4,703
-wbportfolio-1.54.13.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.54.13.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.54.13.dist-info/RECORD,,
+wbportfolio-1.54.14.dist-info/METADATA,sha256=LioS7E1a2gSkTPYpGaxcjiRZVbaAnX1S8uvq-Gr4RFE,703
+wbportfolio-1.54.14.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.54.14.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.54.14.dist-info/RECORD,,