Merge branch 'master' into dev

Author: rafaelurben

kmuhelper/modules/main/models.py

@@ -202,14 +202,14 @@ def __str__(self):
             return f"[{self.pk}] {self.clean_name()} (#{self.linked_fee.pk})"
         return f"[{self.pk}] {self.clean_name()}"
 
-    def save(self, *args, **kwargs):
+    def save(self, **kwargs):
         if self.pk is None and self.linked_fee is not None:
             # Copy data from linked fee
             self.name = self.linked_fee.name
             self.vat_rate = self.linked_fee.vat_rate
             # Don't override price if already here (required for WooCommerce import)
             self.price = self.price or self.linked_fee.price
-        super().save(*args, **kwargs)
+        super().save(**kwargs)
 
     class Meta:
         verbose_name = _("Bestellungskosten")
@@ -320,7 +320,7 @@ def __str__(self):
             )
         return f"[{self.pk}] {self.quantity}x {self.clean_name()} (Art. {self.article_number})"
 
-    def save(self, *args, **kwargs):
+    def save(self, **kwargs):
         if self.pk is None and self.linked_product is not None:
             # Copy data from linked product
             self.article_number = self.linked_product.article_number
@@ -331,7 +331,7 @@ def save(self, *args, **kwargs):
             self.product_price = runden(
                 self.product_price or self.linked_product.get_current_price()
             )
-        super().save(*args, **kwargs)
+        super().save(**kwargs)
 
     class Meta:
         verbose_name = _("Bestellungsposten")
@@ -559,7 +559,7 @@ def import_customer_data(self):
         for field in constants.ADDR_SHIPPING_FIELDS + constants.ADDR_BILLING_FIELDS:
             setattr(self, field, getattr(self.customer, field))
 
-    def second_save(self, *args, **kwargs):
+    def second_save(self, **kwargs):
         "This HAS to be called after all related models have been saved."
 
         self.cached_sum = self.calc_total()
@@ -570,13 +570,13 @@ def second_save(self, *args, **kwargs):
                     i.linked_product.save()
             self.is_removed_from_stock = True
 
-        super().save(*args, **kwargs)
+        super().save(**kwargs)
 
-    def save(self, *args, **kwargs):
+    def save(self, **kwargs):
         if not self.pk and not self.woocommerceid and self.customer:
             self.import_customer_data()
 
-        super().save(*args, **kwargs)
+        super().save(**kwargs)
 
     @admin.display(description=_("Trackinglink"), ordering="tracking_number")
     def tracking_link(self):
@@ -1152,11 +1152,11 @@ class Meta(WooCommerceModelMixin.Meta):
         verbose_name = _("Kunde")
         verbose_name_plural = _("Kunden")
 
-    def save(self, *args, **kwargs):
+    def save(self, **kwargs):
         if self.combine_with:
             self.combine_with_customer(self.combine_with)
             self.combine_with = None
-        super().save(*args, **kwargs)
+        super().save(**kwargs)
 
     def combine_with_customer(self, other: "Customer"):
         """Combine this customer with another customer.

kmuhelper/modules/pdfgeneration/order/views.py

@@ -1,7 +1,6 @@
 from datetime import datetime
 
 from django.contrib.admin.models import LogEntry, CHANGE
-from django.contrib.admin.options import get_content_type_for_model
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import redirect, render
 from django.urls import reverse_lazy, reverse
@@ -86,21 +85,20 @@ def order_view_pdf(request, obj):
                     add_cut_lines=not is_print_version,
                     show_payment_conditions=False,
                 )
-            case other:
+            case _:
                 return render_error(
-                    request, status=400, message="Ungültige Vorlage: " + str(other)
+                    request, status=400, message="Ungültige Vorlage: " + str(preset)
                 )
 
         # Log the action
-        LogEntry.objects.log_action(
+        LogEntry.objects.log_actions(
             user_id=request.user.id,
-            content_type_id=get_content_type_for_model(obj).pk,
-            object_id=obj.pk,
-            object_repr=str(obj),
+            queryset=[obj],
             action_flag=CHANGE,
             change_message=f'PDF "{title}" aus Vorlage "{preset}" erstellt mit Text: "{text}"'
             if text
             else f'PDF "{title}" aus Vorlage "{preset}" erstellt.',
+            single_object=True,
         )
 
         filename = f"{str(order)} - {title}.pdf"

kmuhelper/static/admin/kmuhelper/js/collapse-open.js

@@ -2,9 +2,10 @@
 'use strict';
 {
     window.addEventListener('load', function () {
-        var open_toggles = document.querySelectorAll('fieldset.collapse.default-open a.collapse-toggle, fieldset.collapse.start-open a.collapse-toggle');
-        for (var i = 0; i < open_toggles.length; i++) {
-            open_toggles[i].click();
+        const collapsers = document.querySelectorAll('fieldset.collapse.start-open :is(summary, .collapse-toggle)');
+        // Note: details is for Django>=5.1, .collapse-toggle for Django<5.1
+        for (let i = 0; i < collapsers.length; i++) {
+            collapsers[i].click();
         }
     });
 }

kmuhelper/templates/admin/kmuhelper/customer/change_form.html

@@ -90,7 +90,7 @@
 
             document.addEventListener("DOMContentLoaded", () => {
                 updateShippingFormVisibility();
-                $(".addr-shipping-fieldset h2").after(
+                $(".addr-shipping-fieldset .form-row.field-addr_shipping_first_name").before(
                     document.getElementById("auto-copy-form-row")
                 )
 

kmuhelper/templates/admin/kmuhelper/order/change_form.html

@@ -232,7 +232,7 @@
 
             document.addEventListener("DOMContentLoaded", () => {
                 updateShippingFormVisibility();
-                $(".addr-shipping-fieldset h2").after(
+                $(".addr-shipping-fieldset .form-row.field-addr_shipping_first_name").before(
                     document.getElementById("auto-copy-form-row")
                 )
 

setup.cfg

@@ -14,6 +14,7 @@ classifiers =
     Framework :: Django
     Framework :: Django :: 4.2
     Framework :: Django :: 5.0
+    Framework :: Django :: 5.1
     Intended Audience :: Developers
     License :: OSI Approved :: GNU General Public License v3 (GPLv3)
     Operating System :: OS Independent