ynerant
/
nk20-scripts
mirror of https://gitlab.crans.org/bde/nk20-scripts
1
0
Fork 0
Code Issues Releases Wiki Activity

Compare commits

base: ynerant:1f300c3b7bac0b7a31c1a252a83ba68a8268d33d
Branches Tags
ynerant:master
ynerant:borg_backup
ynerant:notes_report
..
compare: ynerant:f41a5a32f7417a874b497640373ea3911eb1e133
Branches Tags
ynerant:borg_backup
ynerant:master
ynerant:notes_report

2 Commits
1f300c3b7b ... f41a5a32f7

Author SHA1 Message Date
Yohann D'ANELLO f41a5a32f7 Fix note balances if needed 2020-08-03 11:15:50 +02:00
Yohann D'ANELLO 7d0c94c19b 🐛 Kfet transactions should go to the Kfet note 2020-08-03 11:09:26 +02:00
2 changed files with 8 additions and 3 deletions
Show Stats Expand all files Collapse all files

10
management/commands/check_consistency.py
View File

@ -11,6 +11,7 @@ from note.templatetags.pretty_money import pretty_money
class Command(BaseCommand): class Command(BaseCommand):
def add_arguments(self, parser): def add_arguments(self, parser):
parser.add_argument('--sum-all', '-s', action='store_true', help='Check if the global sum is equal to zero') parser.add_argument('--sum-all', '-s', action='store_true', help='Check if the global sum is equal to zero')
parser.add_argument('--fix', '-f', action='store_true', help='Fix note balances')
def handle(self, *args, **options): def handle(self, *args, **options):
if options["sum_all"]: if options["sum_all"]:
@ -29,11 +30,14 @@ class Command(BaseCommand):
.annotate(total=F("quantity") * F("amount")).aggregate(Sum("total"))["total__sum"] or 0 .annotate(total=F("quantity") * F("amount")).aggregate(Sum("total"))["total__sum"] or 0
outcoming = Transaction.objects.filter(valid=True, source=note)\ outcoming = Transaction.objects.filter(valid=True, source=note)\
.annotate(total=F("quantity") * F("amount")).aggregate(Sum("total"))["total__sum"] or 0 .annotate(total=F("quantity") * F("amount")).aggregate(Sum("total"))["total__sum"] or 0
expected_balance = incoming - outcoming calculated_balance = incoming - outcoming
if expected_balance != balance: if calculated_balance != balance:
self.stderr.write(self.style.NOTICE("LA SOMME DES TRANSACTIONS DE LA NOTE {} NE CORRESPOND PAS " self.stderr.write(self.style.NOTICE("LA SOMME DES TRANSACTIONS DE LA NOTE {} NE CORRESPOND PAS "
"AVEC LE MONTANT RÉEL".format(str(note)))) "AVEC LE MONTANT RÉEL".format(str(note))))
self.stderr.write(self.style.NOTICE("Attendu : {}, calculé : {}" self.stderr.write(self.style.NOTICE("Attendu : {}, calculé : {}"
.format(pretty_money(balance), pretty_money(expected_balance)))) .format(pretty_money(balance), pretty_money(calculated_balance))))
if options["fix"]:
note.balance = calculated_balance
note.save()
error = True error = True
exit(1 if error else 0) exit(1 if error else 0)

1
management/commands/import_transaction.py
View File

@ -236,6 +236,7 @@ class Command(ImportCommand):
(obj_dict0, (obj_dict0,
child_dict0, child_dict0,
child_transaction) = self._membership_transaction(row, obj_dict, child_dict, pk_membership) child_transaction) = self._membership_transaction(row, obj_dict, child_dict, pk_membership)
obj_dict0["destination_id"] = 6 # Kfet note id
bde_dict = { bde_dict = {
"pk": pk_membership, "pk": pk_membership,
"user_id": user_id, "user_id": user_id,