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

Revised the algorithm to find the transactions to reorder when the date of an existing transaction is changed in a transaction form in the accounting application.

Browse Source
This commit is contained in:
依瑪貓 2020-08-05 08:29:30 +08:00
parent 97825dfe8d
commit c765d8ec86
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
accounting/views.py
View File

@ -869,7 +869,6 @@ def txn_store(request, txn_type, txn=None):
if txn is None: if txn is None:
txn = Transaction() txn = Transaction()
old_date = txn.date old_date = txn.date
old_ord = txn.ord
fill_txn_from_post(txn_type, txn, post) fill_txn_from_post(txn_type, txn, post)
if not txn.is_dirty(): if not txn.is_dirty():
url = reverse("accounting:transactions.show", args=(txn_type, txn)) url = reverse("accounting:transactions.show", args=(txn_type, txn))
@ -886,9 +885,13 @@ def txn_store(request, txn_type, txn=None):
txn_to_sort = [] txn_to_sort = []
if txn.date != old_date: if txn.date != old_date:
if old_date is not None: if old_date is not None:
txn_to_sort = Transaction.objects\ txn_same_day = list(Transaction.objects\
.filter(date=old_date, ord__gt=old_ord)\ .filter(Q(date=old_date), ~Q(pk=txn.pk))\
.order_by("ord") .order_by("ord"))
for i in range(len(txn_same_day)):
txn_same_day[i].ord = i + 1
if txn_same_day[i].is_dirty():
txn_to_sort.append(txn_same_day[i])
max_ord = Transaction.objects\ max_ord = Transaction.objects\
.filter(date=txn.date)\ .filter(date=txn.date)\
.aggregate(max=Max("ord"))["max"] .aggregate(max=Max("ord"))["max"]
@ -902,8 +905,6 @@ def txn_store(request, txn_type, txn=None):
record.created_by = user record.created_by = user
record.updated_at = Now() record.updated_at = Now()
record.updated_by = user record.updated_by = user
for x in txn_to_sort:
x.ord = x.ord - 1
to_keep = [x.pk for x in txn.records if x.pk is not None] to_keep = [x.pk for x in txn.records if x.pk is not None]
to_delete = [x for x in txn.record_set.all() if x.pk not in to_keep] to_delete = [x for x in txn.record_set.all() if x.pk not in to_keep]
# Runs the update # Runs the update