wbcore 1.56.7__py2.py3-none-any.whl → 1.57.0__py2.py3-none-any.whl

wbcore/contrib/directory/models/entries.py

@@ -22,6 +22,7 @@ from slugify import slugify
 
 from wbcore.contrib.agenda.models import CalendarItem
 from wbcore.contrib.authentication.models import User
+from wbcore.contrib.currency.models import Currency
 from wbcore.contrib.directory.models.contacts import (
     AddressContact,
     BankingContact,
@@ -413,6 +414,14 @@ class Entry(ComplexToStringMixin, DeleteToDisableMixin, WBModel):
         if additional_field_key in self.additional_fields:
             del self.additional_fields[additional_field_key]
 
+    def get_banking_contact(self, currency: Currency) -> BankingContact | None:
+        bank_accounts = self.banking.all()
+        if bank_accounts.filter(currency=currency).exists():
+            bank_accounts = bank_accounts.filter(currency=currency)
+        if bank_accounts.filter(primary=True).exists():
+            bank_accounts = bank_accounts.filter(primary=True)
+        return bank_accounts.first()
+
     @classmethod
     def get_endpoint_basename(cls):
         return "wbcore:directory:entry"

wbcore/contrib/directory/tests/conftest.py

@@ -5,6 +5,7 @@ from django.db.models.signals import pre_migrate
 from pytest_factoryboy import register
 from wbcore.contrib.authentication.factories import InternalUserFactory, UserFactory
 from wbcore.contrib.geography.tests.signals import app_pre_migration
+from wbcore.contrib.currency.factories import CurrencyFactory
 from wbcore.tests.conftest import *
 
 from ..factories import (
@@ -45,6 +46,7 @@ register(RelationshipFactory)
 register(RelationshipTypeFactory)
 register(CustomerStatusFactory)
 register(CompanyTypeFactory)
+register(CurrencyFactory)
 
 
 @pytest.fixture(autouse=True, scope="session")

wbcore/contrib/directory/tests/test_models.py

@@ -405,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/filters/mixins.py

@@ -106,7 +106,6 @@ class WBCoreFilterMixin:
         if initial is not None or self.allow_empty_initial:
             lookup_expr["input_properties"]["initial"] = initial
 
-        if self.required:
-            lookup_expr["input_properties"]["required"] = True
+        lookup_expr["input_properties"]["required"] = self.required
         representation["depends_on"] = self.depends_on
         return representation, lookup_expr

wbcore/metadata/configs/fields.py

@@ -10,8 +10,13 @@ class FieldsViewConfig(WBCoreViewConfig):
     def get_metadata(self) -> dict:
         fields = defaultdict(dict)
         if (serializer_class := getattr(self.view, "get_serializer", None)) and (serializer := serializer_class()):
+            related_key_fields = []
             for field_name, field in serializer.fields.items():
                 field_key, field_representation = field.get_representation(self.request, field_name)
+                # we need to get the representation of the related field last so that the key update properly (priority to the related field values)
+                if "related_key" in field_representation:
+                    related_key_fields.append((field_key, field_representation))
+                fields[field_key].update(field_representation)
+            for field_key, field_representation in related_key_fields:
                 fields[field_key].update(field_representation)
-
         return fields

wbcore/serializers/fields/mixins.py

@@ -33,6 +33,8 @@ class WBCoreSerializerFieldMixin:
         read_only=False,
         copyable=None,
         related_key=None,
+        on_unsatisfied_deps="read_only",
+        clear_dependent_fields=True,
         **kwargs,
     ):
         if not decorators:
@@ -50,6 +52,8 @@ class WBCoreSerializerFieldMixin:
             self._callable_read_only = read_only
             read_only = True
         self.related_key = related_key
+        self.on_unsatisfied_deps = on_unsatisfied_deps
+        self.clear_dependent_fields = clear_dependent_fields
         super().__init__(*args, read_only=read_only, **kwargs)
 
     def _evaluate_read_only(self, field_name, parent):
@@ -131,6 +135,10 @@ class WBCoreSerializerFieldMixin:
             representation["math"] = self.math
         if self.copyable:
             representation["copyable"] = self.copyable
+        if self.on_unsatisfied_deps != "read_only":
+            representation["on_unsatisfied_deps"] = self.on_unsatisfied_deps
+        if self.clear_dependent_fields is not True:
+            representation["clear_dependent_fields"] = self.clear_dependent_fields
         return field_name, representation
 
     def validate_empty_values(self, data):

wbcore/serializers/fields/related.py

@@ -58,7 +58,7 @@ class PrimaryKeyRelatedField(WBCoreSerializerFieldMixin, serializers.PrimaryKeyR
     )
 
     def __init__(self, *args, queryset=None, read_only=False, **kwargs):
-        self.field_type = kwargs.pop("field_type", WBCoreType.SELECT.value)
+        self.field_type = kwargs.pop("field_type", WBCoreType.PRIMARY_KEY.value)
         if callable(read_only) and queryset is not None:
             self._queryset = queryset  # we unset any given queryset to be compliant with the RelatedField assertion
             queryset = None

wbcore/utils/reportlab.py

@@ -0,0 +1,7 @@
+from reportlab.platypus import Paragraph as BaseParagraph
+
+
+class FormattedParagraph(BaseParagraph):
+    def __init__(self, text, *args, **kwargs):
+        text = text.replace("<br>", "<br/>")  # convert the HTML line break into a compatible XML line break tag
+        super().__init__(text, *args, **kwargs)

wbcore/utils/strings.py

@@ -15,7 +15,7 @@ def enumerated_string_join(array):
     return ""
 
 
-def format_number(number, decimal: int = 2, **kwargs) -> float | None:
+def format_number(number, decimal: int = 2, **kwargs) -> float | str:
     """
     utility function used to serialize an aggregate to a json compatible value
     Args:
@@ -28,7 +28,7 @@ def format_number(number, decimal: int = 2, **kwargs) -> float | None:
     try:
         return float(round(number, decimal))
     except TypeError:
-        return None
+        return ""
 
 
 class ReferenceIDMixin:

{wbcore-1.56.7.dist-info → wbcore-1.57.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcore
-Version: 1.56.7
+Version: 1.57.0
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: boto3==1.35.*
 Requires-Dist: celery[redis]==5.*

{wbcore-1.56.7.dist-info → wbcore-1.57.0.dist-info}/RECORD

@@ -318,7 +318,7 @@ wbcore/contrib/directory/migrations/0013_alter_clientmanagerrelationship_options
 wbcore/contrib/directory/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcore/contrib/directory/models/__init__.py,sha256=XtnmU5YUr3SGig6PsSfGsWUaiBaX6kaHShBv3sbxZ14,526
 wbcore/contrib/directory/models/contacts.py,sha256=8KVCmzNARTzeQgRtXe78QKhJr0SvEJ-aZcsRuYaMIbE,18322
-wbcore/contrib/directory/models/entries.py,sha256=S53zghpS18sqZGquAEirMGVuenHhq2Yhdh8ijTScPCw,31904
+wbcore/contrib/directory/models/entries.py,sha256=XXEWJ3UOvs8CgN0AekY7FOy4sNOww5jTpPTdDedYYb0,32365
 wbcore/contrib/directory/models/relationships.py,sha256=7SZFo1tA7NRzS7_gv_fKwMsPPhawu90eWSrEvij_0rk,22108
 wbcore/contrib/directory/release_notes/1_0_0.md,sha256=Twbl9RMLO6dbbm5dVoKorw8BecRqAYsKeobcNmDWHu8,165
 wbcore/contrib/directory/release_notes/1_0_1.md,sha256=yHolV-HwBmIavaPn9pg0ABRgxQ-eKIuiAs-phKb_ix0,285
@@ -352,12 +352,12 @@ wbcore/contrib/directory/static/directory/markdown/documentation/userisclient.md
 wbcore/contrib/directory/static/directory/markdown/documentation/userismanager.md,sha256=I3ojIVTFZ_bEk8-67jO2Jrctk90kSzX-WrREDfplwpg,1037
 wbcore/contrib/directory/static/directory/markdown/documentation/website.md,sha256=n8VAXbgxQh9zslLfLB0UhRgliMCvNS2N6gR-K0oTrkY,1453
 wbcore/contrib/directory/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbcore/contrib/directory/tests/conftest.py,sha256=6Png5NaERN8WBcnpw3mM8F6Xg7erCHh0IO-6hdPyT6E,1738
+wbcore/contrib/directory/tests/conftest.py,sha256=54xK711IfBc6Cj7MweNOGNdkP-ojjMcfqjP1G2XrSn0,1826
 wbcore/contrib/directory/tests/disable_signals.py,sha256=kgVeTtzItEtLJ7MOVo9KdnRABsMvKBTub-vhHIMKO_M,1727
 wbcore/contrib/directory/tests/signals.py,sha256=DqQkJWnq2Y0wTTLh3ICY3qZJLUpGJqiTTSV6YypqsDQ,3217
 wbcore/contrib/directory/tests/test_configs.py,sha256=VouLg3TpDuxi_ljh8MtJGMhtW_h8OzCo15GyyApW16c,189
 wbcore/contrib/directory/tests/test_filters.py,sha256=tc4G0XoUoDoiisECXtaftYCG69fdE42-EmkmLcjbN78,2492
-wbcore/contrib/directory/tests/test_models.py,sha256=OhqzBiI6B3-yrdsKV1PS0LyJcWwayGPdR7OwU2BDi54,18323
+wbcore/contrib/directory/tests/test_models.py,sha256=L2029y7pTUznRYHXJOKFpy_jdTBZvvbx3KwHMEcNSAM,19304
 wbcore/contrib/directory/tests/test_permissions.py,sha256=lmGAiE0wtIDJkHEfNk_8NDwqN71FdPuu2qXvSMm0FbM,4231
 wbcore/contrib/directory/tests/test_serializers.py,sha256=AIa-Rktw4EG2eywMSCz-X1rYcBSmw7Zzx38CghBVGzo,9202
 wbcore/contrib/directory/tests/test_viewsets.py,sha256=pZJ-D-pxRP1IWNZDrKML_6j4iBcFzv8qpo59qX9MpOU,32624
@@ -966,7 +966,7 @@ wbcore/filters/backends.py,sha256=7XX5LcFrAFE5jvFj5qSjww4VMux8aKRlcQKmZxdIiKY,73
 wbcore/filters/defaults.py,sha256=poSD8Ww2NumwYjZ01zS0iBsNCmv6Bee1z3bDSYdX17A,1988
 wbcore/filters/filterset.py,sha256=TTk4mQq9DFCXdyzMq3Ig6e5uIbmjsr4HT2kswOgiuPc,11775
 wbcore/filters/lookups.py,sha256=IYuQqEcYutiXk9UpzY3qKSCaCR2vyllB0RXBj98o8Ao,1186
-wbcore/filters/mixins.py,sha256=_CT4Nrn8vwsANLrIRO4Ghal2aZD6XYTnFOubPPzGuSE,4508
+wbcore/filters/mixins.py,sha256=eIXW2Wq_VO3sXioQKcYdyTvZPHS06tytcGo4ZHEasvA,4487
 wbcore/filters/utils.py,sha256=wSs0g7mKF6n_ziSEDItfFYcuHwZTXyu78D6LHxzY2Bk,786
 wbcore/filters/fields/__init__.py,sha256=ZucwBossNTlvcUfRullicg0ovghQEGO0jxY5eQ3UaEs,546
 wbcore/filters/fields/booleans.py,sha256=6BrK3p1Bv_KIlVCeMOgJ7V8_P8tWQKBnxTOBOBSsGvE,175
@@ -1009,7 +1009,7 @@ wbcore/metadata/configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 wbcore/metadata/configs/base.py,sha256=jxOuuisAAEMjvdvQY_1WSruEaNR9onmXn7W6NN95ogw,2790
 wbcore/metadata/configs/documentations.py,sha256=Wv6vToaalOFkCY_KU8HOddpkfeMKsBoGlla_4LTbJ40,348
 wbcore/metadata/configs/endpoints.py,sha256=peGTXR53IpOYcm0kBqDwMuIxxjjLYHRhDv0XWt6-OYQ,7143
-wbcore/metadata/configs/fields.py,sha256=t_GFdQUUDiCUkk7i9TffFEBDBhRCuD_yaoyUIu9tCMQ,634
+wbcore/metadata/configs/fields.py,sha256=4R-C_wzz9R5BttzfiWH0MeCDF5_tkvJUGo8sk4XaWPI,1091
 wbcore/metadata/configs/filter_fields.py,sha256=1jZyZHU8rBse2P69xFFRAn8VitEdevz5bPeniMk0vKs,2000
 wbcore/metadata/configs/identifiers.py,sha256=4cntC5IarkENLrBnFf26uyfrZY3b4QDXtugvNc_VRhI,1025
 wbcore/metadata/configs/ordering_fields.py,sha256=9ww1zwCFfL6XKGxMI2RKCcMhRS-dkFi3pYbQVbuKN_A,878
@@ -1103,11 +1103,11 @@ wbcore/serializers/fields/file.py,sha256=tDDK2bITiP7zxl9Ilzja2_gWae_lf9CkO1rDEBP
 wbcore/serializers/fields/fsm.py,sha256=xUYxDj166PDnmDLggI4fShXdSunJVzbc8quFQioM3Yc,700
 wbcore/serializers/fields/json.py,sha256=8SmEOW2hXnTTfuCztaxA8AA3qtTxhCZtft7BJm1yO6o,2225
 wbcore/serializers/fields/list.py,sha256=cYmMBg9M10Qb_5z98CeP3SjE2bV-u7Z0xkzXr-C3xoA,4178
-wbcore/serializers/fields/mixins.py,sha256=_KbdxJDGWFMAH_y6MX_7bXICZ-MXH9ZXV0QAi4uegWk,7155
+wbcore/serializers/fields/mixins.py,sha256=sP1mEiD5tMZ4yCr-X0IkIY3RZwJcT0JokvontvRsDKw,7613
 wbcore/serializers/fields/number.py,sha256=Lxhiy8KBMA8dzv2nKsHVtAaPgjZMNt0TQTgVujh_2BI,3473
 wbcore/serializers/fields/other.py,sha256=3r_70JH_A_daS99LuwQWwa0LNtyosKW7QKJzZgQA-zo,1131
 wbcore/serializers/fields/primary_key.py,sha256=yTbs5B2QlUX-XKEtop3JpwIPeP-FhM8u-2qDXM5q6u0,676
-wbcore/serializers/fields/related.py,sha256=7LYfPLz-7Kfs4b_tlRdIJGKp34UcfK3M4TbwyD5LjO8,6350
+wbcore/serializers/fields/related.py,sha256=mq7QhcjSG273G400ZueYJnNVNDlGgnUHLoAHaKRjW_Q,6355
 wbcore/serializers/fields/text.py,sha256=8cmRiH1RpCDGzuUmO1zMmm8uiybXDMqyuBkjFblNMmQ,5060
 wbcore/serializers/fields/types.py,sha256=eiSOajWwlZjFfXnMGjIakAa7WGzXHjtRQwT0LH-2_oA,983
 wbcore/shares/__init__.py,sha256=uhHkbgHoFgbcsxHUPxNNzNs11oIjjQ7zIxG8FzsREAI,32
@@ -1211,12 +1211,13 @@ wbcore/utils/numbers.py,sha256=KaC2yNmaVMwe05uRvGvC_ayWJW_1dOgjswlqsB-QeoM,2289
 wbcore/utils/prettytable.py,sha256=RnZ9VZpSZBaOVPyvcbdD17PeKp6pNN57PDfyILy1nlg,877
 wbcore/utils/print.py,sha256=_CBbuAf2ZbjXQBedcvhe6jZAfNq2kjC_ImWlWDbeRCc,725
 wbcore/utils/renderers.py,sha256=2q1ATrmzFFe03ofuKn2WZ3hK53aFwyEwCVbK0YxkdDM,520
+wbcore/utils/reportlab.py,sha256=gAvcZqpsx0-M9DxW_GvnXQbPFilmf18tQKhK3DqU-9Q,309
 wbcore/utils/rrules.py,sha256=oqg1eY_X7CLN--UkTjPsKuF_FrtKi1no9-ITvYerrXM,2743
 wbcore/utils/serializers.py,sha256=fn__UYJolYjg063OHmAt7zC9zxMxsqrVERpGhLzUK3o,418
 wbcore/utils/settings.py,sha256=MCt48ZJO9nOzGPAFYJ-_o0uRCDUt3_yzEek6m4oZTYg,198
 wbcore/utils/signals.py,sha256=sNDbYKcjTsACpod50dB_TgYC-f37aN0N_M_DMJgTiMA,1132
 wbcore/utils/string_loader.py,sha256=AWmn40nM8A1cxoVwpO2lF6YidEfL3JC1du2cank4Dw4,1169
-wbcore/utils/strings.py,sha256=_7IzcjOQqPVbqxnRwGI4PAJrwJa7NmnXqXWxMuw5kew,1859
+wbcore/utils/strings.py,sha256=DvMm2vrEjfxH6Hjf7XvRSo-3eAnLf4oLzxki8xonmNs,1856
 wbcore/utils/task.py,sha256=HlPyALx78lSprsY_ICeI-SrXTPBmRpx8nyVIIrRtKb4,84
 wbcore/utils/urls.py,sha256=BjmavE84QYECWDKyV3dENn8GQqwdBmX6MqXyCjmwmbA,2137
 wbcore/utils/views.py,sha256=XnWQqMjAi6dXTF-ZYF9FHU1a7cDpAymcuZRt8g_cEqI,8541
@@ -1229,6 +1230,6 @@ wbcore/viewsets/generics.py,sha256=lKDq9UY_Tyc56u1bqaIEvHGgoaXwXxpZ1c3fLVteptI,1
 wbcore/viewsets/mixins.py,sha256=IdHd_uixOv3ExKoHxTgL5Bt8OELIwfYwhBZm0nsvZfc,12054
 wbcore/viewsets/utils.py,sha256=4520Ij3ASM8lOa8QZkCqbBfOexVRiZu688eW-PGqMOA,882
 wbcore/viewsets/viewsets.py,sha256=FPPESunEjlunDr5VFsjTfsquTS3iDSQkw0H6QjMKPqk,6574
-wbcore-1.56.7.dist-info/METADATA,sha256=wUZw8P3Rfudayh6ulfJYieR4lWeV-w62wavr1ocxJDk,2332
-wbcore-1.56.7.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbcore-1.56.7.dist-info/RECORD,,
+wbcore-1.57.0.dist-info/METADATA,sha256=S2Im_-ZfGaGiK-1IaNBNvJUXbQuMDoR0jGNSOc7UDgQ,2332
+wbcore-1.57.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbcore-1.57.0.dist-info/RECORD,,