wbcore 1.54.10__py2.py3-none-any.whl → 1.58.2__py2.py3-none-any.whl

wbcore/contrib/directory/tests/test_models.py

@@ -1,5 +1,3 @@
-from unittest.mock import MagicMock
-
 import pytest
 from django.db import models
 from django_fsm import TransitionNotAllowed
@@ -7,16 +5,16 @@ from dynamic_preferences.registries import global_preferences_registry
 from pytest_mock import MockerFixture
 
 from wbcore.contrib.authentication.factories import InternalUserFactory
-from wbcore.contrib.directory.factories import ClientManagerRelationshipFactory as CMRF
 from wbcore.contrib.directory.factories import (
+    ClientManagerRelationshipFactory,
     CompanyFactory,
     EmailContactFactory,
     EntryFactory,
     PersonFactory,
     TelephoneContactFactory,
 )
-from wbcore.contrib.directory.models import ClientManagerRelationship as CMR
 from wbcore.contrib.directory.models import (
+    ClientManagerRelationship,
     Company,
     EmailContact,
     Entry,
@@ -206,37 +204,46 @@ class TestUserDeactivation:
 
     def test_no_substitute_person(self, test_internal_profile):
         # Arrange
-        relationship = CMRF(relationship_manager=test_internal_profile)
+        relationship = ClientManagerRelationshipFactory(relationship_manager=test_internal_profile)
         # Act
         handle_user_deactivation(sender=None, instance=test_internal_profile, substitute_profile=None)
         # Assert
-        assert CMR.objects.get(id=relationship.id).status == CMR.Status.REMOVED
+        assert (
+            ClientManagerRelationship.objects.get(id=relationship.id).status
+            == ClientManagerRelationship.Status.REMOVED
+        )
 
     @pytest.mark.parametrize("exists", [True, False])
     def test_not_approved_substitute_relationships(self, test_internal_profile, test_person, exists):
         # Arrange
-        old_relationship = CMRF(relationship_manager=test_internal_profile, status=CMR.Status.PENDINGADD)
+        old_relationship = ClientManagerRelationshipFactory(
+            relationship_manager=test_internal_profile, status=ClientManagerRelationship.Status.PENDINGADD
+        )
         substitute_relationship = (
-            CMRF(client=old_relationship.client, relationship_manager=test_person) if exists else None
+            ClientManagerRelationshipFactory(client=old_relationship.client, relationship_manager=test_person)
+            if exists
+            else None
         )
         # Act
         message = handle_user_deactivation(
             sender=None, instance=test_internal_profile, substitute_profile=test_person
         )[1]
         relationship_id = substitute_relationship.id if exists else old_relationship.id
-        relationship_exists = CMR.objects.filter(id=old_relationship.id).exists()
+        relationship_exists = ClientManagerRelationship.objects.filter(id=old_relationship.id).exists()
         # Assert
         assert message == f"Assigned 1 manager role(s) to {test_person.computed_str}"
         assert (not relationship_exists) if exists else relationship_exists
-        assert CMR.objects.get(id=relationship_id).client.id == old_relationship.client.id
-        assert CMR.objects.get(id=relationship_id).relationship_manager.id == test_person.id
+        assert ClientManagerRelationship.objects.get(id=relationship_id).client.id == old_relationship.client.id
+        assert ClientManagerRelationship.objects.get(id=relationship_id).relationship_manager.id == test_person.id
 
     def test_approved_with_substitute_relationships(self, test_internal_profile, test_person):
         # Arrange
-        old_relationship = CMRF(relationship_manager=test_internal_profile, primary=True)
-        CMRF(relationship_manager=test_internal_profile)
-        substitute_relationship = CMRF(
-            client=old_relationship.client, relationship_manager=test_person, status=CMR.Status.PENDINGADD
+        old_relationship = ClientManagerRelationshipFactory(relationship_manager=test_internal_profile, primary=True)
+        ClientManagerRelationshipFactory(relationship_manager=test_internal_profile)
+        substitute_relationship = ClientManagerRelationshipFactory(
+            client=old_relationship.client,
+            relationship_manager=test_person,
+            status=ClientManagerRelationship.Status.PENDINGADD,
         )
         # Act
         message = handle_user_deactivation(
@@ -247,65 +254,67 @@ class TestUserDeactivation:
         assert message == f"Assigned 2 manager role(s) to {test_person.computed_str}"
         assert substitute_relationship.client.id == old_relationship.client.id
         assert substitute_relationship.relationship_manager.id == test_person.id
-        assert substitute_relationship.status == CMR.Status.APPROVED
+        assert substitute_relationship.status == ClientManagerRelationship.Status.APPROVED
         assert substitute_relationship.primary is True
 
     def test_approved_without_substitute_relationships_needs_primary(self, test_internal_profile, test_person):
         # Arrange
-        old_relationship = CMRF(relationship_manager=test_internal_profile, primary=True)
+        old_relationship = ClientManagerRelationshipFactory(relationship_manager=test_internal_profile, primary=True)
         # Act
         message = handle_user_deactivation(
             sender=None, instance=test_internal_profile, substitute_profile=test_person
         )[1]
-        relationship_exists = CMR.objects.filter(
-            relationship_manager=test_person, client=old_relationship.client, primary=True, status=CMR.Status.APPROVED
+        relationship_exists = ClientManagerRelationship.objects.filter(
+            relationship_manager=test_person,
+            client=old_relationship.client,
+            primary=True,
+            status=ClientManagerRelationship.Status.APPROVED,
         ).exists()
         old_relationship.refresh_from_db()
         # Assert
         assert message == f"Assigned 1 manager role(s) to {test_person.computed_str}"
         assert relationship_exists
-        assert old_relationship.status == CMR.Status.REMOVED
+        assert old_relationship.status == ClientManagerRelationship.Status.REMOVED
 
     def test_approved_without_substitute_relationships_doesnt_need_primary(self, test_internal_profile, test_person):
         # Arrange
-        old_relationship = CMRF(relationship_manager=test_internal_profile)
-        CMRF(client=old_relationship.client, primary=True)
+        old_relationship = ClientManagerRelationshipFactory(relationship_manager=test_internal_profile)
+        ClientManagerRelationshipFactory(client=old_relationship.client, primary=True)
         # Act
         message = handle_user_deactivation(
             sender=None, instance=test_internal_profile, substitute_profile=test_person
         )[1]
-        relationship_exists = CMR.objects.filter(
-            relationship_manager=test_person, client=old_relationship.client, primary=False, status=CMR.Status.APPROVED
+        relationship_exists = ClientManagerRelationship.objects.filter(
+            relationship_manager=test_person,
+            client=old_relationship.client,
+            primary=False,
+            status=ClientManagerRelationship.Status.APPROVED,
         ).exists()
         old_relationship.refresh_from_db()
         # Assert
         assert message == f"Assigned 1 manager role(s) to {test_person.computed_str}"
         assert relationship_exists
-        assert old_relationship.status == CMR.Status.REMOVED
+        assert old_relationship.status == ClientManagerRelationship.Status.REMOVED
 
 
 @pytest.mark.directory_model_tests
 class TestSpecificModelsClientManagerRelationship:
-    def _mock_relationship_query(self, is_primary: bool, mocker: MockerFixture, mock_path: str) -> MagicMock:
-        mock_filter = mocker.patch(f"{mock_path}.objects.filter")
-        mock_exists = mock_filter.return_value.exists
-        mock_exists.return_value = is_primary
-        mock_update = mock_filter.return_value.update
-        mock_update.return_value = None
-        return mock_update
-
     @pytest.fixture
     def test_cmr(self):
-        return CMR()
+        return ClientManagerRelationship()
 
     @pytest.mark.parametrize(
         "method_name, initial_status, expected_status",
         [
-            ("submit", CMR.Status.DRAFT, CMR.Status.PENDINGADD),
-            ("deny", CMR.Status.PENDINGADD, CMR.Status.DRAFT),
-            ("denyremoval", CMR.Status.PENDINGREMOVE, CMR.Status.APPROVED),
-            ("approveremoval", CMR.Status.PENDINGREMOVE, CMR.Status.REMOVED),
-            ("reinstate", CMR.Status.REMOVED, CMR.Status.PENDINGADD),
+            ("submit", ClientManagerRelationship.Status.DRAFT, ClientManagerRelationship.Status.PENDINGADD),
+            ("deny", ClientManagerRelationship.Status.PENDINGADD, ClientManagerRelationship.Status.DRAFT),
+            ("denyremoval", ClientManagerRelationship.Status.PENDINGREMOVE, ClientManagerRelationship.Status.APPROVED),
+            (
+                "approveremoval",
+                ClientManagerRelationship.Status.PENDINGREMOVE,
+                ClientManagerRelationship.Status.REMOVED,
+            ),
+            ("reinstate", ClientManagerRelationship.Status.REMOVED, ClientManagerRelationship.Status.PENDINGADD),
         ],
     )
     def test_status_transitions(self, test_cmr, mocker: MockerFixture, method_name, initial_status, expected_status):
@@ -318,42 +327,34 @@ class TestSpecificModelsClientManagerRelationship:
         # Assert
         assert test_cmr.status == expected_status
 
-    @pytest.mark.parametrize("method_name", ["approve", "mngapprove"])
-    @pytest.mark.parametrize("is_primary", [True, False])
-    def test_approval_methods(self, test_cmr, method_name, is_primary, mocker: MockerFixture):
-        # Arrange
-        status = CMR.Status.PENDINGADD if method_name == "approve" else CMR.Status.DRAFT
-        mock_path = "wbcore.contrib.directory.models.ClientManagerRelationship"
-        mocker.patch(f"{mock_path}.client", new_callable=mocker.PropertyMock)  # Mock client property
-        mock_update = self._mock_relationship_query(is_primary, mocker, mock_path)
-        mocker.patch("django_fsm.transition", return_value=None)
-        mocker.patch.object(test_cmr, "primary", is_primary)
-        mocker.patch.object(test_cmr, "status", status)
-        # Act
-        method = getattr(test_cmr, method_name)
-        method()
-        # Assert
-        assert test_cmr.status == CMR.Status.APPROVED
-        assert test_cmr.primary
-        if is_primary:
-            mock_update.assert_called_once_with(primary=False)
-        else:
-            mock_update.assert_not_called()
+    # @pytest.mark.parametrize("method_name", ["approve", "mngapprove"])
+    # @pytest.mark.parametrize("is_primary", [True, False])
+    # def test_approval_methods(self, client_manager_relationship_factory, method_name, is_primary):
+    #     # Arrange
+    #     status = ClientManagerRelationship.Status.PENDINGADD if method_name == "approve" else ClientManagerRelationship.Status.DRAFT
+    #     test_cmr = client_manager_relationship_factory.create(status=status, primary=False)
+    #     # Act
+    #     method = getattr(test_cmr, method_name)
+    #     method()
+    #     test_cmr.save() # we need to call save because the logic of handling primary happens in the parent save method (primarymixin)
+    #     # Assert
+    #     assert test_cmr.status == ClientManagerRelationship.Status.APPROVED
+    #     assert test_cmr.primary
 
     @pytest.mark.parametrize("is_primary", [True, False])
     def test_make_primary(self, is_primary, test_cmr, mocker: MockerFixture):
         # Arrange
         mocker.patch.object(test_cmr, "primary", is_primary)
-        mocker.patch.object(test_cmr, "status", CMR.Status.APPROVED)
+        mocker.patch.object(test_cmr, "status", ClientManagerRelationship.Status.APPROVED)
         mocker.patch("django_fsm.transition", return_value=None)
         # Act & Assert
         if is_primary:
             with pytest.raises(TransitionNotAllowed):
                 test_cmr.makeprimary()
-                assert test_cmr.status == CMR.Status.APPROVED
+                assert test_cmr.status == ClientManagerRelationship.Status.APPROVED
         else:
             test_cmr.makeprimary()
-            assert test_cmr.status == CMR.Status.PENDINGADD
+            assert test_cmr.status == ClientManagerRelationship.Status.PENDINGADD
         assert test_cmr.primary
 
     @pytest.mark.parametrize("is_primary", [True, False])
@@ -367,16 +368,16 @@ class TestSpecificModelsClientManagerRelationship:
         mock_exclude.return_value = mock_queryset
         mocker.patch(f"{mock_path}.client", new_callable=mocker.PropertyMock)  # Mock client property
         mocker.patch.object(test_cmr, "primary", is_primary)
-        mocker.patch.object(test_cmr, "status", CMR.Status.APPROVED)
+        mocker.patch.object(test_cmr, "status", ClientManagerRelationship.Status.APPROVED)
         mocker.patch("django_fsm.transition", return_value=None)
         # Act & Assert
         if not is_primary and exists:
             test_cmr.remove()
-            assert test_cmr.status == CMR.Status.PENDINGREMOVE
+            assert test_cmr.status == ClientManagerRelationship.Status.PENDINGREMOVE
         else:
             with pytest.raises(TransitionNotAllowed):
                 test_cmr.remove()
-                assert test_cmr.status == CMR.Status.APPROVED
+                assert test_cmr.status == ClientManagerRelationship.Status.APPROVED
 
 
 @pytest.mark.directory_model_tests
@@ -404,3 +405,24 @@ class TestSpecificModelsRelationships:
             to_entry=to_entry,
         )
         assert rel.__str__() == "John Doe is Type of Jane Doe"
+
+
+@pytest.mark.django_db
+class TestEntry:
+    def test_get_banking_contact(self, entry, banking_contact_factory, currency_factory):
+        eur = currency_factory.create()
+        usd = currency_factory.create()
+
+        euro_banking_contact = banking_contact_factory.create(entry=entry, currency=eur)
+        assert entry.get_banking_contact(eur) == euro_banking_contact
+        assert (
+            entry.get_banking_contact(usd) == euro_banking_contact
+        )  # even if usd does not exist, we need to return at least a banking contact
+
+        usd_banking_contact = banking_contact_factory.create(entry=entry, currency=usd, primary=True)
+
+        assert entry.get_banking_contact(eur) == euro_banking_contact
+        assert entry.get_banking_contact(usd) == usd_banking_contact
+
+        new_primary_usd_banking_contact = banking_contact_factory.create(entry=entry, currency=usd, primary=True)
+        assert entry.get_banking_contact(usd) == new_primary_usd_banking_contact

wbcore/contrib/directory/tests/test_serializers.py

@@ -110,7 +110,7 @@ class TestContactSerializersValidation:
         return IBAN("AD1400080001001234567890")
 
     @pytest.fixture
-    def contact_data(iban, mocker: MockerFixture):
+    def contact_data(self, mocker: MockerFixture):
         return {
             "AddressContact": {
                 "serializer": AddressContactSerializer(),

wbcore/contrib/directory/tests/test_viewsets.py

@@ -7,7 +7,7 @@ from rest_framework.test import APIRequestFactory
 
 from wbcore.contrib.authentication.factories import SuperUserFactory, UserFactory
 from wbcore.contrib.authentication.models import User
-from wbcore.contrib.directory.models import ClientManagerRelationship as CMR
+from wbcore.contrib.directory.models import ClientManagerRelationship
 from wbcore.test.utils import (
     get_data_from_factory,
     get_kwargs,
@@ -580,15 +580,15 @@ class TestRelationshipViewSets:
     def test_relationship_partial_update(self, api_request_factory, super_user, relationship_factory, person_factory):
         # Arrange
         relationship = relationship_factory()
-        new_Person = person_factory()
-        request = api_request_factory.patch("", data={"to_entry": new_Person.id})
+        new_person = person_factory()
+        request = api_request_factory.patch("", data={"to_entry": new_person.id})
         request.user = super_user
         view = RelationshipModelViewSet.as_view({"patch": "partial_update"})
         # Act
         response = view(request, pk=relationship.id).render()
         # Assert
         assert response.status_code == status.HTTP_200_OK
-        assert response.data["instance"]["to_entry"] == new_Person.id
+        assert response.data["instance"]["to_entry"] == new_person.id
 
 
 # =====================================================================================================================
@@ -601,7 +601,7 @@ class TestRelationshipViewSets:
 @pytest.mark.django_db
 class TestClientManagerViewSet:
     @pytest.mark.parametrize("mvs", [ClientManagerViewSet])
-    def test_None_qs(self, api_request_factory, normal_user, mvs):
+    def test_none_qs(self, api_request_factory, normal_user, mvs):
         request = api_request_factory.get("")
         request.user = normal_user
         obj = ClientManagerRelationshipFactory()
@@ -615,7 +615,7 @@ class TestClientManagerViewSet:
         request = api_request_factory.delete("")
         request.user = super_user
         obj1 = ClientManagerRelationshipFactory()
-        obj2 = ClientManagerRelationshipFactory(client=obj1.client, status=CMR.Status.DRAFT)
+        obj2 = ClientManagerRelationshipFactory(client=obj1.client, status=ClientManagerRelationship.Status.DRAFT)
         view = mvs.as_view({"delete": "destroy"})
         response = view(request, pk=obj2.id).render()
         assert response.status_code == status.HTTP_204_NO_CONTENT
@@ -645,7 +645,7 @@ class TestClientManagerViewSet:
 
     @pytest.mark.parametrize("mvs", [ClientManagerViewSet])
     def test_put(self, api_request_factory, super_user, mvs):
-        obj_old = ClientManagerRelationshipFactory(status=CMR.Status.DRAFT)
+        obj_old = ClientManagerRelationshipFactory(status=ClientManagerRelationship.Status.DRAFT)
         obj_new = ClientManagerRelationshipFactory()
         user = super_user
         data = get_data_from_factory(obj_new, mvs, superuser=user, delete=True)
@@ -822,7 +822,7 @@ class TestContactViewsets:
             SocialMediaContactEntryViewSet,
         ],
     )
-    def test_primary_DeleteEndpointMixin(self, api_request_factory, super_user, mvs):
+    def test_primary_deleteendpointmixin(self, api_request_factory, super_user, mvs):
         request = api_request_factory.delete("")
         request.user = super_user
         factory = get_model_factory(mvs.queryset.model)

wbcore/contrib/directory/viewsets/buttons/__init__.py

@@ -4,4 +4,4 @@ from .entries import (
     EntryModelButtonConfig,
     PersonModelButtonConfig,
 )
-from .relationships import EmployerEmployeeRelationshipButtonConfig
+from .relationships import EmployerEmployeeRelationshipButtonConfig, ClientManagerRelationshipButtonConfig

wbcore/contrib/directory/viewsets/buttons/relationships.py

@@ -1,7 +1,10 @@
 from django.utils.translation import gettext as _
 from rest_framework.reverse import reverse
 
+from wbcore.contrib.directory.models import ClientManagerRelationship
+from wbcore.contrib.directory.permissions import IsClientManagerRelationshipAdmin
 from wbcore.contrib.icons import WBIcon
+from wbcore.enums import RequestType
 from wbcore.metadata.configs import buttons as bt
 from wbcore.metadata.configs.buttons.view_config import ButtonViewConfig
 
@@ -30,3 +33,32 @@ class EmployerEmployeeRelationshipButtonConfig(ButtonViewConfig):
                     )
                 }
         return {}
+
+
+class ClientManagerRelationshipButtonConfig(ButtonViewConfig):
+    def get_custom_buttons(self):
+        buttons = set()
+        if (
+            IsClientManagerRelationshipAdmin().has_permission(self.request, self.view)
+            and ClientManagerRelationship.objects.filter(
+                status__in=[
+                    ClientManagerRelationship.Status.PENDINGADD,
+                    ClientManagerRelationship.Status.PENDINGREMOVE,
+                ]
+            ).exists()
+        ):
+            buttons.add(
+                bt.ActionButton(
+                    method=RequestType.PATCH,
+                    identifiers=("directory:clientmanagerrelationship",),
+                    endpoint=reverse("wbcore:directory:clientmanagerrelationship-approveallpendingrequests"),
+                    label=_("Approve All Pending Requests"),
+                    icon=WBIcon.APPROVE.icon,
+                    description_fields=_(
+                        "<p> Are you sure you want to approve all pending (add and remove) requests ? </p>"
+                    ),
+                    title=_("Approve All Pending Requests"),
+                    action_label=_("Approved"),
+                )
+            )
+        return buttons

wbcore/contrib/directory/viewsets/contacts.py

@@ -11,13 +11,13 @@ from wbcore.contrib.directory.models import (
     BankingContact,
     Company,
     EmailContact,
+    EmployerEmployeeRelationship,
     Entry,
     Person,
     SocialMediaContact,
     TelephoneContact,
     WebsiteContact,
 )
-from wbcore.contrib.directory.models import EmployerEmployeeRelationship as EER
 
 from ..filters import (
     AddressContactCompanyFilter,
@@ -129,16 +129,16 @@ class ContactModelMixin(_Base):
             if not entry.is_company:
                 person = entry.get_casted_entry()
                 if (
-                    EER.objects.filter(employee=person, primary=True).exists()
-                    and EER.objects.filter(employee=person).count() > 1
+                    EmployerEmployeeRelationship.objects.filter(employee=person, primary=True).exists()
+                    and EmployerEmployeeRelationship.objects.filter(employee=person).count() > 1
                 ):
                     return (
                         super()
                         .get_queryset()
                         .exclude(
-                            entry__in=EER.objects.filter(employee=person, primary=False).values_list(
-                                "employer", flat=True
-                            )
+                            entry__in=EmployerEmployeeRelationship.objects.filter(
+                                employee=person, primary=False
+                            ).values_list("employer", flat=True)
                         )
                     )
         return super().get_queryset()

wbcore/contrib/directory/viewsets/display/__init__.py

@@ -19,7 +19,7 @@ from .entries import (
 )
 from .relationships import (
     ClientManagerModelDisplay,
-    CMR_Color,
+    ClientManagerRelationshipColor,
     EmployerEmployeeRelationshipDisplayConfig,
     EmployeeEmployerDisplayConfig,
     EmployerEmployeeDisplayConfig,

wbcore/contrib/directory/viewsets/display/entries.py

@@ -285,13 +285,23 @@ class PersonModelDisplay(EntryModelDisplay):
         return dp.ListDisplay(
             fields=[
                 dp.Field(key="name", label=_("Name")),
-                dp.Field(key="primary_employer_repr", label=_("Primary Employer")),
                 dp.Field(key="customer_status", label=_("Status")),
                 dp.Field(key="position_in_company", label=_("Position")),
                 dp.Field(key="cities", label=_("City")),
-                dp.Field(key="primary_telephone", label=_("Primary Phone Number")),
                 dp.Field(key="tier", label=_("Tier")),
-                dp.Field(key="primary_manager_repr", label=_("Primary Relationship Manager")),
+                dp.Field(
+                    key=None,
+                    label=_("Primary Contacts"),
+                    children=[
+                        dp.Field(key="primary_employer_repr", label=_("Primary Employer")),
+                        dp.Field(key="primary_manager_repr", label=_("Relationship Manager")),
+                        dp.Field(key="primary_telephone", label=_("Telephone")),
+                        dp.Field(key="primary_email", label=_("Email")),
+                        dp.Field(key="primary_address", label=_("Address"), show="open"),
+                        dp.Field(key="primary_website", label=_("Website"), show="open"),
+                        dp.Field(key="primary_social", label=_("Social"), show="open"),
+                    ],
+                ),
                 dp.Field(
                     key=None,
                     label=_("Last Event"),
@@ -347,19 +357,36 @@ class CompanyModelDisplay(EntryModelDisplay):
             ),
         )
 
-        display = Display(
+        grid_template_areas = [
+            ["profile_image", "name", "customer_status", "activity_table"],
+            ["profile_image", "primary_telephone", "primary_telephone", "activity_table"],
+            ["profile_image", "type", "tier", "activity_table"],
+            ["profile_image", "activity_heat", "activity_heat", "activity_table"],
+            ["employees_section", "employees_section", "employees_section", "employees_section"],
+        ]
+        sections = [employees_section]
+        if portfolio_fields:
+            grid_template_areas.insert(
+                4,
+                [
+                    portfolio_fields.key,
+                    portfolio_fields.key,
+                    portfolio_fields.key,
+                    "activity_table",
+                ],
+            )
+            sections.append(portfolio_fields)
+        if aum_table:
+            grid_template_areas[-1][-1] = aum_table.key
+            sections.append(aum_table)
+
+        return Display(
             pages=[
                 Page(
                     title=_("Main Information"),
                     layouts={
                         default(): Layout(
-                            grid_template_areas=[
-                                ["profile_image", "name", "customer_status", "activity_table"],
-                                ["profile_image", "primary_telephone", "primary_telephone", "activity_table"],
-                                ["profile_image", "type", "tier", "activity_table"],
-                                ["profile_image", "activity_heat", "activity_heat", "activity_table"],
-                                ["employees_section", "employees_section", "employees_section", "employees_section"],
-                            ],
+                            grid_template_areas=grid_template_areas,
                             grid_template_columns=[
                                 Style.MIN_CONTENT,
                                 "minmax(min-content, 1fr)",
@@ -368,7 +395,7 @@ class CompanyModelDisplay(EntryModelDisplay):
                             ],
                             grid_template_rows=[Style.rem(6), Style.rem(6), Style.rem(6)],
                             grid_auto_rows=Style.MIN_CONTENT,
-                            sections=[employees_section],
+                            sections=sections,
                             inlines=[
                                 Inline(
                                     key="activity_table",
@@ -393,29 +420,6 @@ class CompanyModelDisplay(EntryModelDisplay):
             ]
         )
 
-        # Need to insert the portfolio fields into the display
-        for page in display.pages:
-            if page.title == "Main Information":
-                for layout_key in page.layouts.keys():
-                    if portfolio_fields:
-                        # Insert the section with the AUM fields below the profile picture at the left
-                        page.layouts[layout_key].grid_template_areas.insert(
-                            4,
-                            [
-                                portfolio_fields.key,
-                                portfolio_fields.key,
-                                portfolio_fields.key,
-                                "activity_table",
-                            ],
-                        )
-                        page.layouts[layout_key].sections.append(portfolio_fields)
-                    if aum_table:
-                        # Insert the section with the AUM table at the bottom right
-                        page.layouts[layout_key].grid_template_areas[-1][-1] = aum_table.key
-                        page.layouts[layout_key].sections.append(aum_table)
-                break
-        return display
-
     @classmethod
     def _get_new_company_instance_display(cls) -> Display:
         """Returns the display for creating a new company
@@ -468,7 +472,18 @@ class CompanyModelDisplay(EntryModelDisplay):
                 dp.Field(key="type", label=_("Type")),
                 dp.Field(key="tier", label=_("Tier")),
                 dp.Field(key="customer_status", label=_("Status")),
-                dp.Field(key="primary_manager_repr", label=_("Primary Relationship Manager")),
+                dp.Field(
+                    key=None,
+                    label=_("Primary Contacts"),
+                    children=[
+                        dp.Field(key="primary_manager_repr", label=_("Relationship Manager")),
+                        dp.Field(key="primary_telephone", label=_("Telephone")),
+                        dp.Field(key="primary_email", label=_("Email")),
+                        dp.Field(key="primary_address", label=_("Address"), show="open"),
+                        dp.Field(key="primary_website", label=_("Website"), show="open"),
+                        dp.Field(key="primary_social", label=_("Social"), show="open"),
+                    ],
+                ),
                 dp.Field(
                     key=None,
                     label=_("Last Event"),