imacat/mia-accounting-django
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fixed the _find_order_holes() utility to include the check for the minimal order in the accounting application.

Browse Source
This commit is contained in:
依瑪貓 2020-07-21 18:57:34 +08:00
parent e0e2815c34
commit 090f3dc3a5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accounting/views/reports.py
View File

@ -20,7 +20,7 @@
""" """
import re import re
from django.db.models import Sum, Case, When, F, Q, Count, Max from django.db.models import Sum, Case, When, F, Q, Count, Max, Min
from django.db.models.functions import TruncMonth, Coalesce from django.db.models.functions import TruncMonth, Coalesce
from django.http import HttpResponseRedirect, Http404 from django.http import HttpResponseRedirect, Http404
from django.shortcuts import render from django.shortcuts import render
@ -911,8 +911,8 @@ def _find_order_holes(records):
""" """
holes = [x["date"] for x in Transaction.objects holes = [x["date"] for x in Transaction.objects
.values("date") .values("date")
.annotate(count=Count("ord"), max=Max("ord")) .annotate(count=Count("ord"), max=Max("ord"), min=Min("ord"))
.filter(~Q(count=F("max")))]\ .filter(~(Q(max=F("count")) & Q(min=1)))]\
+ [x["date"] for x in Transaction.objects + [x["date"] for x in Transaction.objects
.values("date", "ord") .values("date", "ord")
.annotate(count=Count("sn")) .annotate(count=Count("sn"))