Fixes / tests.

Author: MarcoSteinacher

django/cohiva/settings_defaults.py

@@ -489,32 +489,32 @@
         "access_intern": {
             "level": "DEBUG",
             "handlers": ["access_intern"],
-            "propagate": True,
+            "propagate": False,
         },
         "access_portal": {
             "level": "DEBUG",
             "handlers": ["access_portal"],
-            "propagate": True,
+            "propagate": False,
         },
         "geno": {
             "level": "DEBUG",
             "handlers": ["geno"],
-            "propagate": True,
+            "propagate": False,
         },
         "reservation": {
             "level": "DEBUG",
             "handlers": ["reservation"],
-            "propagate": True,
+            "propagate": False,
         },
         "credit_accounting": {
             "level": "DEBUG",
             "handlers": ["credit_accounting", "mail_admins_debug"],
-            "propagate": True,
+            "propagate": False,
         },
         "finance_accounting": {
             "level": "DEBUG",
             "handlers": ["finance_accounting", "mail_admins_debug"],
-            "propagate": True,
+            "propagate": False,
         },
     },
 }

django/finance/accounting/book.py

@@ -60,13 +60,20 @@ def build_transaction_id(self, backend_id):
         return f"{self.book_type_id}_{backend_id}"
 
     def get_backend_id(self, transaction_id):
-        book_type_id, backend_id = transaction_id.split("_", 1)
+        book_type_id, backend_id = self.decode_transaction_id(transaction_id)
         if book_type_id != self.book_type_id:
             raise ValueError(
                 "book_type_id '{book_type_id}' does not match backend type '{self.book_type_id}'"
             )
         return backend_id
 
+    @staticmethod
+    def decode_transaction_id(transaction_id):
+        parts = transaction_id.split("_", 1)
+        if len(parts) != 2:
+            raise ValueError("Invalid transaction_id: {transaction_id}")
+        return parts
+
     @staticmethod
     def get_date(date):
         if not date:

django/geno/api_views.py

@@ -181,7 +181,7 @@ def __init__(self, **kwargs):
         #      6 - Leerstand -> NK Leerstand [4582]
         self.virtual_contract_accounts = {}
         for key, account in settings.FINANCIAL_ACCOUNTS.items():
-            if account["role"] == AccountRole.NK_VIRTUAL:
+            if account.get("role") == AccountRole.NK_VIRTUAL and "virtual_id" in account:
                 self.virtual_contract_accounts[account["virtual_id"]] = Account.from_settings(key)
         self.invoice_id = None
         self.contract = None

django/geno/billing.py

@@ -22,7 +22,7 @@
 
 import geno.settings as geno_settings
 from cohiva.utils.pdf import PdfGenerator
-from finance.accounting import Account, AccountingManager, AccountKey
+from finance.accounting import Account, AccountingBook, AccountingManager, AccountKey
 
 from .models import (
     Address,
@@ -71,6 +71,7 @@ def create_invoices(
     )  # name="Mietzins wiederkehrend")
 
     messages = []
+    count = {"invoices": 0, "contracts": 0}
     with AccountingManager(messages) as book:
         if not book:
             return messages
@@ -86,8 +87,10 @@ def create_invoices(
             )
             if isinstance(result, str):
                 return result
-            count = result
-    messages.append("%s Rechnungen" % count)
+            if result > 0:
+                count["invoices"] += result
+                count["contracts"] += 1
+    messages.append(f"{count['invoices']} Rechnungen für {count['contracts']} Verträge")
     return messages
 
 
@@ -529,13 +532,13 @@ def setup_account(account, contract):
             account.set_code(building=ru.building)
         else:
             logger.error(
-                "Could not find building for contract %s, using default account with no postfix %s."
-                % (contract, account.prefix)
+                f"Could not find building for contract id {contract.pk}, "
+                f" using default account with no postfix {account.prefix}."
             )
             send_error_mail(
                 "get_income_account_code()",
-                "Could not find building for contract %s, using default account with no postfix %s."
-                % (contract, account.prefix),
+                f"Could not find building for contract id {contract.pk}, "
+                f"using default account with no postfix {account.prefix}.",
             )
     return account
 
@@ -685,24 +688,25 @@ def add_invoice_obj(
 
 def delete_invoice_transaction(invoice):
     if not invoice.fin_transaction_ref:
-        logger.warning("Trying to delete an invoice without a fin_transaction_ref: %s" % invoice)
+        logger.warning(f"Trying to delete an invoice without a fin_transaction_ref: {invoice.pk}")
         return None
     try:
-        with AccountingManager() as book:
+        book_type_id, _ = AccountingBook.decode_transaction_id(invoice.fin_transaction_ref)
+        with AccountingManager(book_type_id=book_type_id) as book:
             book.delete_transaction(invoice.fin_transaction_ref)
     except Exception:
         logger.error(
-            "Could not delete transaction %s linked to invoice %s."
-            % (invoice.fin_transaction_ref, invoice)
+            f"Could not delete transaction {invoice.fin_transaction_ref} "
+            f"linked to invoice {invoice.pk}."
         )
         send_error_mail(
             "delete_invoice_transaction()",
-            "Could not delete transaction %s linked to invoice %s."
-            % (invoice.fin_transaction_ref, invoice),
+            f"Could not delete transaction {invoice.fin_transaction_ref} "
+            f"linked to invoice {invoice.pk}.",
         )
         return None
     logger.info(
-        "Deleted fin_transaction_ref %s for invoice %s." % (invoice.fin_transaction_ref, invoice)
+        f"Deleted fin_transaction_ref {invoice.fin_transaction_ref} for invoice {invoice.pk}."
     )
     return None
 

django/geno/tests/test_documents.py

@@ -652,7 +652,7 @@ def test_send_mail_singlefile(self):
         self.assertEmailSent(4)
         self.assertEqual(len(mail.outbox[0].attachments), 1)
         self.assertEqual(len(mail.outbox[1].attachments), 1)
-        self.assertEqual(mail.outbox[0].attachments[0][0], "testpdf_b1.pdf")  # Test_PDF1.pdf
+        self.assertEqual(mail.outbox[0].attachments[0][0], "TestPDF1.pdf")  # testpdf_b1.pdf
         self.assertEqual(mail.outbox[0].attachments[0][2], "application/pdf")
         self.assertInPDF(mail.outbox[0].attachments[0][1], "B1")
 
@@ -663,9 +663,9 @@ def test_send_mail_twofiles(self):
         self.assertEmailSent(4)
         self.assertEqual(len(mail.outbox[0].attachments), 2)
         self.assertEqual(len(mail.outbox[1].attachments), 2)
-        self.assertEqual(mail.outbox[0].attachments[0][0], "testpdf_b1.pdf")  # Test_PDF1.pdf
+        self.assertEqual(mail.outbox[0].attachments[0][0], "TestPDF1.pdf")  # testpdf_b1.pdf
         self.assertEqual(mail.outbox[0].attachments[0][2], "application/pdf")
-        self.assertEqual(mail.outbox[0].attachments[1][0], "testpdf_c1.pdf")  # Test_PDF2.pdf
+        self.assertEqual(mail.outbox[0].attachments[1][0], "TestPDF2.pdf")  # testpdf_c1.pdf
         self.assertEqual(mail.outbox[0].attachments[1][2], "application/pdf")
         self.assertInPDF(mail.outbox[0].attachments[0][1], "B1")
         self.assertInPDF(mail.outbox[0].attachments[1][1], "C1")
@@ -971,7 +971,7 @@ def test_send_mail_multiple_documents_multiple_contexts(self):
             ],
         )
 
-        self.assertEqual(mail.outbox[0].attachments[1][0], "testpdf_b1.pdf")  # Test_PDF1.pdf
+        self.assertEqual(mail.outbox[0].attachments[1][0], "TestPDF1.pdf")  # testpdf_b1.pdf
 
         self.assertEqual(mail.outbox[0].attachments[2][0], "Muster_Hans_QR-Bill.pdf")
         self.assertInPDF(
@@ -987,7 +987,7 @@ def test_send_mail_multiple_documents_multiple_contexts(self):
             ],
         )
 
-        self.assertEqual(mail.outbox[0].attachments[3][0], "testpdf_c1.pdf")  # Test_PDF2.pdf
+        self.assertEqual(mail.outbox[0].attachments[3][0], "TestPDF2.pdf")  # testpdf_c1.pdf
 
         self.assertEqual(mail.outbox[0].attachments[4][0], "Muster_Hans_QR-BillRef.pdf")
         self.assertInPDF(