wbportfolio 1.56.5__py2.py3-none-any.whl → 1.56.6__py2.py3-none-any.whl

wbportfolio/contrib/company_portfolio/configs/display.py

@@ -67,9 +67,15 @@ class CompanyModelDisplay(BaseCompanyModelDisplay):
         list_display = super().get_list_display()
         list_display.fields = (
             *list_display.fields[:5],
-            dp.Field(key="invested_assets_under_management_usd", label="AUM Invested"),
-            dp.Field(key="asset_under_management", label="AUM"),
-            dp.Field(key="potential", label="Potential"),
+            dp.Field(
+                key=None,
+                label=_("AUM"),
+                children=[
+                    dp.Field(key="invested_assets_under_management_usd", label="AUM Invested", width=100),
+                    dp.Field(key="asset_under_management", label="AUM", width=100),
+                    dp.Field(key="potential", label="Potential", width=100),
+                ],
+            ),
             *list_display.fields[5:],
         )
         return list_display
@@ -140,9 +146,15 @@ class PersonModelDisplay(BasePersonModelDisplay):
 
         list_display.fields = (
             *list_display.fields[:7],
-            dp.Field(key="invested_assets_under_management_usd", label="AUM Invested"),
-            dp.Field(key="asset_under_management", label="AUM"),
-            dp.Field(key="potential", label="Potential"),
+            dp.Field(
+                key=None,
+                label=_("AUM"),
+                children=[
+                    dp.Field(key="invested_assets_under_management_usd", label="AUM Invested", width=100),
+                    dp.Field(key="asset_under_management", label="AUM", width=100),
+                    dp.Field(key="potential", label="Potential", width=100),
+                ],
+            ),
             *list_display.fields[7:],
         )
         return list_display

wbportfolio/contrib/company_portfolio/serializers.py

@@ -103,22 +103,11 @@ class CompanyPortfolioDataMixin(serializers.ModelSerializer):
         read_only=True,
         **_get_assets_under_management_kwargs(field_name="invested_assets_under_management_usd"),
     )
-    investment_discretion = serializers.ChoiceField(**_get_investment_discretion_kwargs())
-    assets_under_management_currency = serializers.PrimaryKeyRelatedField(
-        required=False,
-        queryset=Currency.objects.all(),
-        default=None,
-        label=CompanyPortfolioData.assets_under_management_currency.field.verbose_name,
-    )
+
     assets_under_management_currency_repr = serializers.CharField(read_only=True, required=False)
-    _assets_under_management_currency = CurrencyRepresentationSerializer(source="assets_under_management_currency")
+
     potential = serializers.DecimalField(**_get_potential_kwargs())
-    potential_currency = serializers.PrimaryKeyRelatedField(
-        required=False,
-        queryset=Currency.objects.all(),
-        label=CompanyPortfolioData.potential_currency.field.verbose_name,
-    )
-    _potential_currency = CurrencyRepresentationSerializer(source="potential_currency")
+    investment_discretion = serializers.ChoiceField(**_get_investment_discretion_kwargs())
 
     # Not sure why read_only_fields does not work...
     tier = serializers.ChoiceField(
@@ -144,10 +133,6 @@ class CompanyPortfolioDataMixin(serializers.ModelSerializer):
             "asset_under_management",  # TODO: add an s after asset - After removing this field from the base model
             "assets_under_management_currency_repr",
             "invested_assets_under_management_usd",
-            "potential_currency",
-            "_potential_currency",
-            "assets_under_management_currency",
-            "_assets_under_management_currency",
             "investment_discretion",
             "potential",
             "tier",
@@ -156,6 +141,19 @@ class CompanyPortfolioDataMixin(serializers.ModelSerializer):
 
 class CompanyModelSerializer(CompanyPortfolioDataMixin, BaseCompanyModelSerializer):
     SERIALIZER_CLASS_FOR_REMOTE_ADDITIONAL_RESOURCES = BasePersonModelSerializer
+    assets_under_management_currency = serializers.PrimaryKeyRelatedField(
+        required=False,
+        queryset=Currency.objects.all(),
+        default=None,
+        label=CompanyPortfolioData.assets_under_management_currency.field.verbose_name,
+    )
+    _assets_under_management_currency = CurrencyRepresentationSerializer(source="assets_under_management_currency")
+    potential_currency = serializers.PrimaryKeyRelatedField(
+        required=False,
+        queryset=Currency.objects.all(),
+        label=CompanyPortfolioData.potential_currency.field.verbose_name,
+    )
+    _potential_currency = CurrencyRepresentationSerializer(source="potential_currency")
 
     def update(self, instance, validated_data):
         validated_data, portfolio_data = get_portfolio_data(validated_data)
@@ -209,6 +207,20 @@ class CompanyModelListSerializer(CompanyPortfolioDataMixin, BaseCompanyModelList
 class PersonModelSerializer(CompanyPortfolioDataMixin, BasePersonModelSerializer):
     SERIALIZER_CLASS_FOR_REMOTE_ADDITIONAL_RESOURCES = BasePersonModelSerializer
 
+    assets_under_management_currency = serializers.PrimaryKeyRelatedField(
+        required=False,
+        queryset=Currency.objects.all(),
+        default=None,
+        label=CompanyPortfolioData.assets_under_management_currency.field.verbose_name,
+    )
+    _assets_under_management_currency = CurrencyRepresentationSerializer(source="assets_under_management_currency")
+    potential_currency = serializers.PrimaryKeyRelatedField(
+        required=False,
+        queryset=Currency.objects.all(),
+        label=CompanyPortfolioData.potential_currency.field.verbose_name,
+    )
+    _potential_currency = CurrencyRepresentationSerializer(source="potential_currency")
+
     asset_under_management = serializers.DecimalField(
         **_get_assets_under_management_kwargs(field_name="assets_under_management"),
         read_only=True,

wbportfolio/serializers/orders/orders.py

@@ -155,6 +155,9 @@ class OrderOrderProposalListModelSerializer(wb_serializers.ModelSerializer):
             "currency_fx_rate",
             "price",
         )
+        extra_kwargs = {
+            "price": {"required": False},
+        }
         fields = (
             "id",
             "shares",

{wbportfolio-1.56.5.dist-info → wbportfolio-1.56.6.dist-info}/METADATA

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

{wbportfolio-1.56.5.dist-info → wbportfolio-1.56.6.dist-info}/RECORD

@@ -42,12 +42,12 @@ wbportfolio/contrib/company_portfolio/filters.py,sha256=jLDo3PRhofuqR2EA7G2R2aiA
 wbportfolio/contrib/company_portfolio/management.py,sha256=CofBifGGGKfA06uWRDWXY_9y7y-PGNRz3VhsVaDeAz8,857
 wbportfolio/contrib/company_portfolio/models.py,sha256=0YlWZfpBTUy4nCE0FYY6Kqcx3H28-AbeIVXgxcF6hM0,13963
 wbportfolio/contrib/company_portfolio/scripts.py,sha256=wFfc1L-it0UTaBwNFs8hhGARbJoaNzmnlsXh6KEbslU,2497
-wbportfolio/contrib/company_portfolio/serializers.py,sha256=i4lXu79Mkr_b4zOO4iQ73Tl6DucLK7Aj9npaG8ox7js,12067
+wbportfolio/contrib/company_portfolio/serializers.py,sha256=-ewPrtu8Z1WT2iU3MzDm1BfdFa75GJ8JpS2dTw25CY4,12570
 wbportfolio/contrib/company_portfolio/tasks.py,sha256=nIBTqC36JCakCug7YVt1aBqai5bKDsgZd2HS7Jwpf5U,1384
 wbportfolio/contrib/company_portfolio/urls.py,sha256=eyq6IpaDPG1oL8-AqPS5nC5BeFewKPA1BN_HI7M3i1c,1118
 wbportfolio/contrib/company_portfolio/viewsets.py,sha256=o-_D_bEt283xngDbsMwdRQxFyuK7rfSChI8u5dGYyLM,8312
 wbportfolio/contrib/company_portfolio/configs/__init__.py,sha256=AVH0v-uOJBPRKggz7fO7IpRyVJ1YlQiF-if_cMsOvvM,72
-wbportfolio/contrib/company_portfolio/configs/display.py,sha256=wuscS82RDL5uTfXOmpAp_4EyTUyDAgmvUlEHg4ro7_Q,6372
+wbportfolio/contrib/company_portfolio/configs/display.py,sha256=BfQgIltW128ee3-8BdirIxDc6e6jBfDvBdBoAFn2ssA,6768
 wbportfolio/contrib/company_portfolio/configs/endpoints.py,sha256=QWkxvGOjCyPtB9cIc9hQHcqkeZv_KEvfGue-JgAn2p4,1662
 wbportfolio/contrib/company_portfolio/configs/previews.py,sha256=pSZTESST-s8yBhKDcnpB_eGjufrp4NYAqlIGxEN8TOM,1395
 wbportfolio/contrib/company_portfolio/migrations/0001_initial.py,sha256=WAB7FJL4PdMhQAB-k_tZcMZ2SjAOmqHKj86NrzxWbXE,9856
@@ -376,7 +376,7 @@ wbportfolio/serializers/roles.py,sha256=T-9NqTldpvaEMFy-Bib5MB6MeboygEOqcMP61mzz
 wbportfolio/serializers/signals.py,sha256=hD6R4oFtwhvnsJPteytPKy2JwEelmxrapdfoLSnluaE,7053
 wbportfolio/serializers/orders/__init__.py,sha256=PKJRksA1pWsh8nVfGASoB0m3LyUzVRnq1m9VPp90J7k,271
 wbportfolio/serializers/orders/order_proposals.py,sha256=Jxea2-Ze8Id5URv4UV-vTfCQGt11tjR27vRRfCs0gXU,4791
-wbportfolio/serializers/orders/orders.py,sha256=7FOjeT-YAACzKjnJ2Ki2ads7wMq2Td8Zy7ot4TvJ8qs,10014
+wbportfolio/serializers/orders/orders.py,sha256=wLAlgRnMzsqsvfz0aCevMpOtK5O9hU9PJFrzz8bbPqE,10091
 wbportfolio/serializers/transactions/__init__.py,sha256=-7Pan4n7YI3iDvGXff6okzk4ycEURRxp5n_SHCY_g_I,493
 wbportfolio/serializers/transactions/claim.py,sha256=mEt67F2v8HC6roemDT3S0dD0cZIVl1U9sASbLW3Vpyo,11611
 wbportfolio/serializers/transactions/dividends.py,sha256=ADXf9cXe8rq55lC_a8vIzViGLmQ-yDXkgR54k2m-N0w,1814
@@ -567,7 +567,7 @@ 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/trades.py,sha256=xBgOGaJ8aEg-2RxEJ4FDaBs4SGwuLasun3nhpis0WQY,12363
-wbportfolio-1.56.5.dist-info/METADATA,sha256=RROv2cPMXS4c5q03yrXpQTM5ncGQRYdjH8PR-i62Hfw,751
-wbportfolio-1.56.5.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.56.5.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.56.5.dist-info/RECORD,,
+wbportfolio-1.56.6.dist-info/METADATA,sha256=fQghqDSt3WiAimoU8VXsx1V2vQpbEIAsARN_L3bW39c,751
+wbportfolio-1.56.6.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.56.6.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.56.6.dist-info/RECORD,,