wbaccounting 1.59.16__py2.py3-none-any.whl → 1.60.0__py2.py3-none-any.whl

wbaccounting/models/booking_entry.py

@@ -5,6 +5,7 @@ from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
 from wbcore.contrib.authentication.models import User
 from wbcore.models import WBModel
+from wbcore.signals import pre_merge
 
 
 class BookingEntryDefaultQuerySet(models.QuerySet):
@@ -165,3 +166,8 @@ def booking_entry_changed(sender, instance: BookingEntry, created: bool, raw: bo
 def booking_entry_deleted(sender, instance, **kwargs):
     if instance.invoice:
         instance.invoice.save()
+
+
+@receiver(pre_merge, sender="directory.Entry")
+def pre_merge_entry_bookinentry(sender: models.Model, merged_object, main_object, **kwargs):
+    BookingEntry.objects.filter(counterparty=merged_object).update(counterparty=main_object)

wbaccounting/models/entry_accounting_information.py

@@ -9,6 +9,7 @@ from django.utils.module_loading import import_string
 from dynamic_preferences.registries import global_preferences_registry as gpr
 from wbcore.contrib.authentication.models import User
 from wbcore.contrib.currency.models import Currency
+from wbcore.signals import pre_merge
 
 from wbaccounting.models.model_tasks import generate_booking_entries_as_task
 
@@ -156,3 +157,14 @@ def post_save_entry(sender, instance, **kwargs):
     """If the EAI does not have any email_to, then we add the entries primary email address to it (if it exists)"""
     if not instance.email_to.exists() and (email := instance.entry.primary_email_contact()):
         instance.email_to.add(email)
+
+
+@receiver(pre_merge, sender="directory.Entry")
+def pre_merge_entry_entryaccountinginformation(sender: models.Model, merged_object, main_object, **kwargs):
+    with suppress(EntryAccountingInformation.DoesNotExist):
+        rel = EntryAccountingInformation.objects.get(entry=merged_object)
+        if not EntryAccountingInformation.objects.filter(entry=main_object).exists():
+            rel.entry = main_object
+            rel.save()
+        else:
+            rel.delete()

wbaccounting/models/invoice.py

@@ -3,7 +3,6 @@ from decimal import Decimal
 from io import BytesIO
 from typing import TYPE_CHECKING
 
-from django.contrib.auth import get_user_model
 from django.core.files import File
 from django.db import models, transaction
 from django.db.models import Max, Q, QuerySet, Sum
@@ -15,7 +14,7 @@ from django.utils.translation import gettext_lazy as _
 from django_fsm import FSMField, transition
 from dynamic_preferences.registries import global_preferences_registry
 from slugify import slugify
-from wbcore.contrib.authentication.models import User
+from wbcore.contrib.authentication.models.users import User
 from wbcore.contrib.directory.models import Company, Entry
 from wbcore.contrib.documents.models import Document, DocumentType
 from wbcore.contrib.icons import WBIcon
@@ -24,6 +23,7 @@ from wbcore.contrib.notifications.utils import create_notification_type
 from wbcore.enums import RequestType
 from wbcore.metadata.configs.buttons import ActionButton, ButtonDefaultColor
 from wbcore.models import WBModel
+from wbcore.signals import pre_merge
 
 from wbaccounting.dynamic_preferences_registry import format_invoice_number
 from wbaccounting.files.invoice_document_file import generate_file
@@ -248,7 +248,7 @@ class Invoice(WBModel):
         },
     )
     def submit(self, by=None, description=None, **kwargs):
-        for user in get_user_model().objects.filter(
+        for user in User.objects.filter(
             Q(user_permissions__codename="administrate_invoice")
             | Q(groups__permissions__codename="administrate_invoice")
         ):
@@ -475,3 +475,8 @@ def post_save_handle_processor(sender, instance, **kwargs):
             processor = import_string(processor_path)
             processor(instance)
             instance.status = instance.Status.SENT
+
+
+@receiver(pre_merge, sender="directory.Entry")
+def pre_merge_entry_invoice(sender: models.Model, merged_object, main_object, **kwargs):
+    Invoice.objects.filter(counterparty=merged_object).update(counterparty=main_object)

{wbaccounting-1.59.16.dist-info → wbaccounting-1.60.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbaccounting
-Version: 1.59.16
+Version: 1.60.0
 Summary: A workbench module for managing invoicing and simple accounting.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: wbcore

{wbaccounting-1.59.16.dist-info → wbaccounting-1.60.0.dist-info}/RECORD

@@ -34,9 +34,9 @@ wbaccounting/migrations/0011_transaction.py,sha256=CAFDQiZFIP-xJ__GqCyvsmMUazgMU
 wbaccounting/migrations/0012_entryaccountinginformation_external_invoice_users.py,sha256=4uGToqhfM5VGMgHNnBgvASjoVTox1sYvjx0RY_mgbDA,815
 wbaccounting/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbaccounting/models/__init__.py,sha256=qk2F9CHovzTR-opHJpPpp9HbblLX95izFNfL0FnQCts,263
-wbaccounting/models/booking_entry.py,sha256=usKjt_g_4Y9dfS7-7DYzB7zxJ1eQ3UW5PwIFOSruBtQ,6655
-wbaccounting/models/entry_accounting_information.py,sha256=FFz4hySajryxDqQfVeDOlr5ExBR9ni6bvvcVXc6PZ9A,5779
-wbaccounting/models/invoice.py,sha256=1yTggRNvzLOY_9g8rj3-yKR9xMEH--jH-f9FhcN2sOE,19048
+wbaccounting/models/booking_entry.py,sha256=7apQyTySBU-vILPyMIOJlNCuPLYy4jgMnneJehOrHpk,6927
+wbaccounting/models/entry_accounting_information.py,sha256=jU-WVhxjBPtOVQhcenmrPUdQtSipZO12AHqU9ACH-vs,6291
+wbaccounting/models/invoice.py,sha256=ILaUC3lWG6oM4GpNpEVuuEbiijYk5a5fRv0BsnW8NFE,19258
 wbaccounting/models/invoice_type.py,sha256=SMYKJGyL7rm4_7Sb6yaLT88ZIqXDmh9LA2KpyELsDBg,855
 wbaccounting/models/model_tasks.py,sha256=V0p8xXORYSf98mbZLb6y9mcgkrpKiFqF8afXlNEtw9s,2361
 wbaccounting/models/transactions.py,sha256=V6tOJjLSJJVsqynT53KABqHJGtp22f6Gl2kQy9ok53o,3875
@@ -97,6 +97,6 @@ wbaccounting/viewsets/titles/booking_entry.py,sha256=SNQJOYXf3QcjTtL3Co2uIYZC69d
 wbaccounting/viewsets/titles/entry_accounting_information.py,sha256=76kXkK5ij-HV29tt8efUuvplQ9d1CrQklT8sSv6zHYE,344
 wbaccounting/viewsets/titles/invoice.py,sha256=mr-iufJpM2SYuvexZ3XPLjBmQgPatgIMn1JC4eHLdnY,566
 wbaccounting/viewsets/titles/invoice_type.py,sha256=szgA0iSYVILjLvhFhuLcq_WhMWv04_ESEVvogMYOkyk,301
-wbaccounting-1.59.16.dist-info/METADATA,sha256=OLEd37hRnGeLkwWWkhUSYJv_5lFXqjfxGK5TEdG-hHw,218
-wbaccounting-1.59.16.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
-wbaccounting-1.59.16.dist-info/RECORD,,
+wbaccounting-1.60.0.dist-info/METADATA,sha256=tRWZR2J8Bb0FkoWHkD8XSofBcfJwEVoef89xS28A3QM,217
+wbaccounting-1.60.0.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
+wbaccounting-1.60.0.dist-info/RECORD,,