.github/workflows/python-publish.yml

@@ -28,7 +28,7 @@ jobs:
     - name: Build package
       run: python3 -m build
     - name: Store the distribution packages
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: python-package-distributions
         path: dist/
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: python-package-distributions
           path: dist/

juntagrico_billing/__init__.py

@@ -1 +1 @@
-__version__ = '1.6.3'
+__version__ = '1.6.6'

juntagrico_billing/admin/bill.py

@@ -1,12 +1,12 @@
 from django.utils.translation import gettext as _
 from django.urls import reverse
 from django.utils.html import mark_safe
-from django.contrib.admin import display
+from django.contrib.admin import display, SimpleListFilter
 from juntagrico.admins import BaseAdmin
 
 from juntagrico_billing.admin.billitem_inline import BillItemInline
 from juntagrico_billing.admin.payment_inline import PaymentInline
-from juntagrico_billing.util.billing import recalc_bill, publish_bills
+from juntagrico_billing.util.billing import recalc_bill, publish_bills, update_vat, add_balancing_payment
 
 
 def set_notification_sent(modeladmin, request, queryset):
@@ -39,15 +39,52 @@ def do_publish_bills(modeladmin, request, queryset):
 do_publish_bills.short_description = _("Publish bills")
 
 
+def do_update_vat(modeladmin, request, queryset):
+    for bill in queryset.all():
+        update_vat(bill)
+
+
+do_update_vat.short_description = _("Update VAT (from settings)")
+
+
+def do_add_balancing_payment(modeladmin, request, queryset):
+    for bill in queryset.all():
+        add_balancing_payment(request, bill)
+
+
+do_add_balancing_payment.short_description = _("Balance bill with compensation payment")
+
+
+class OpenAmountFilter(SimpleListFilter):
+    title = _('Open amount')
+    parameter_name = 'open_amount_filter'
+
+    def lookups(self, request, model_admin):
+        return (
+            ('open', _('Open amount > 0')),
+            ('overpaid', _('Open amount < 0 (overpaid)')),
+        )
+
+    def queryset(self, request, queryset):
+        if self.value() == 'open':
+            return [obj for obj in queryset.all() if obj.amount_open > 0]
+        if self.value() == 'overpaid':
+            objects = [obj for obj in queryset.all() if obj.amount_open < 0]
+            print("%d objects" % len(objects))
+            return queryset.filter(id__in=[obj.id for obj in objects])
+
+
 class BillAdmin(BaseAdmin):
     search_fields = ['id', 'member__first_name', 'member__last_name']
     list_display = [
         'id', 'business_year', 'member', 'bill_date', 'item_kinds',
         'amount_f', 'amount_open_f', 'paid', 'published', 'user_bill_link']
+    list_filter = ['paid', 'published', 'notification_sent', 'business_year', OpenAmountFilter]
+    readonly_fields = ['vat_rate', 'vat_amount', 'amount_paid', 'amount_open']
     inlines = [BillItemInline, PaymentInline, ]
     actions = [
         do_recalc_bill, do_publish_bills, set_notification_sent,
-        reset_notification_sent]
+        reset_notification_sent, do_update_vat, do_add_balancing_payment]
 
     @display(description=_('Amount'))
     def amount_f(self, bill):