From f512c1bdd742ca2c1f4cbdd9899ad6ae1e7021b0 Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Sat, 18 Mar 2017 18:02:23 -0300 Subject: [PATCH 1/4] Add better checkout creation --- kfet/management/commands/loadkfetdevdata.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/kfet/management/commands/loadkfetdevdata.py b/kfet/management/commands/loadkfetdevdata.py index 5b3e9913..328a50a4 100644 --- a/kfet/management/commands/loadkfetdevdata.py +++ b/kfet/management/commands/loadkfetdevdata.py @@ -12,7 +12,8 @@ from django.contrib.auth.models import User, Group, Permission, ContentType from gestioncof.management.base import MyBaseCommand from gestioncof.models import CofProfile -from kfet.models import Account, Article, OperationGroup, Operation, Checkout +from kfet.models import Account, Article, OperationGroup, Operation,\ + Checkout, CheckoutStatement # Où sont stockés les fichiers json DATA_DIR = os.path.join(os.path.dirname(os.path.dirname(__file__)), @@ -96,13 +97,25 @@ class Command(MyBaseCommand): # Caisse # --- - checkout, _ = Checkout.objects.get_or_create( + checkout, created = Checkout.objects.get_or_create( created_by=Account.objects.get(trigramme='000'), name='Chaudron', - valid_from=timezone.now(), - valid_to=timezone.now() + timedelta(days=365) + defaults={ + 'valid_from': timezone.now(), + 'valid_to': timezone.now() + timedelta(days=730) + }, ) + if created: + CheckoutStatement.objects.create( + by=Account.objects.get(trigramme='000'), + checkout=checkout, + balance_old=0, + balance_new=0, + amount_taken=0, + amount_error=0 + ) + # --- # Opérations # --- From 29d7654052740fa0d41c6d1942d5b9011233d52f Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Sat, 18 Mar 2017 18:02:33 -0300 Subject: [PATCH 2/4] Root kfet account --- kfet/management/commands/loadkfetdevdata.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kfet/management/commands/loadkfetdevdata.py b/kfet/management/commands/loadkfetdevdata.py index 328a50a4..8fa974df 100644 --- a/kfet/management/commands/loadkfetdevdata.py +++ b/kfet/management/commands/loadkfetdevdata.py @@ -93,6 +93,14 @@ class Command(MyBaseCommand): liq_account, _ = Account.objects.get_or_create(cofprofile=liq_profile, trigramme='LIQ') + # Root account if existing + + root_profile = CofProfile.objects.filter(user__username='root') + if root_profile.exists(): + root_profile = root_profile.get() + Account.objects.get_or_create(cofprofile=root_profile, + trigramme='AAA') + # --- # Caisse # --- From 47b7d934e05acd6fb3a762d000a1c5c00d54b578 Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Sat, 18 Mar 2017 19:01:51 -0300 Subject: [PATCH 3/4] PEP8 on imports --- kfet/management/commands/loadkfetdevdata.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kfet/management/commands/loadkfetdevdata.py b/kfet/management/commands/loadkfetdevdata.py index 8fa974df..b1ed6726 100644 --- a/kfet/management/commands/loadkfetdevdata.py +++ b/kfet/management/commands/loadkfetdevdata.py @@ -12,8 +12,8 @@ from django.contrib.auth.models import User, Group, Permission, ContentType from gestioncof.management.base import MyBaseCommand from gestioncof.models import CofProfile -from kfet.models import Account, Article, OperationGroup, Operation,\ - Checkout, CheckoutStatement +from kfet.models import (Account, Article, OperationGroup, Operation, + Checkout, CheckoutStatement) # Où sont stockés les fichiers json DATA_DIR = os.path.join(os.path.dirname(os.path.dirname(__file__)), From 51fba4da21b6247faf2e345ca4e62d1a63f78679 Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Sat, 18 Mar 2017 19:02:08 -0300 Subject: [PATCH 4/4] Log messages --- kfet/management/commands/loadkfetdevdata.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kfet/management/commands/loadkfetdevdata.py b/kfet/management/commands/loadkfetdevdata.py index b1ed6726..705f6f27 100644 --- a/kfet/management/commands/loadkfetdevdata.py +++ b/kfet/management/commands/loadkfetdevdata.py @@ -88,6 +88,7 @@ class Command(MyBaseCommand): # Compte liquide + self.stdout.write("Création du compte liquide") liq_user, _ = User.objects.get_or_create(username='liquide') liq_profile, _ = CofProfile.objects.get_or_create(user=liq_user) liq_account, _ = Account.objects.get_or_create(cofprofile=liq_profile, @@ -97,6 +98,7 @@ class Command(MyBaseCommand): root_profile = CofProfile.objects.filter(user__username='root') if root_profile.exists(): + self.stdout.write("Création du compte K-Fêt root") root_profile = root_profile.get() Account.objects.get_or_create(cofprofile=root_profile, trigramme='AAA')