klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith3.git synced 2024-06-26 16:38:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Uppercase some choices in settings

Browse Source
This commit is contained in:
Skia 2016-08-07 20:06:47 +02:00
parent 1529af32c5
commit d824d0d928
4 changed files with 77 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
accounting/migrations/0014_auto_20160807_1954.py Normal file
View File

@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('accounting', '0013_auto_20160807_1923'),
]
operations = [
migrations.AlterField(
model_name='operation',
name='mode',
field=models.CharField(max_length=255, verbose_name='payment method', choices=[('CHEQUE', 'Check'), ('CASH', 'Cash'), ('TRANSFert', 'Transfert'), ('CARD', 'Credit card')]),
),
]

24
counter/migrations/0015_auto_20160807_1954.py Normal file
View File

@ -0,0 +1,24 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('counter', '0014_auto_20160804_1603'),
]
operations = [
migrations.AlterField(
model_name='refilling',
name='bank',
field=models.CharField(max_length=255, verbose_name='bank', choices=[('OTHER', 'Autre'), ('LA-POSTE', 'La Poste'), ('CREDIT-AGRICOLE', 'Credit Agricole'), ('CREDIT-MUTUEL', 'Credit Mutuel')], default='other'),
),
migrations.AlterField(
model_name='refilling',
name='payment_method',
field=models.CharField(max_length=255, verbose_name='payment method', choices=[('CHEQUE', 'Check'), ('CASH', 'Cash')], default='cash'),
),
]

28
sith/settings_sample.py
View File

@ -43,6 +43,7 @@ INSTALLED_APPS = (
'django.contrib.staticfiles',
'django.contrib.sites',
'django_jinja',
'rest_framework',
'core',
'club',
'subscription',
@ -50,6 +51,7 @@ INSTALLED_APPS = (
'counter',
'eboutic',
'launderette',
'api',
)
MIDDLEWARE_CLASSES = (
@ -245,16 +247,16 @@ SITH_MAIN_BOARD_GROUP=SITH_MAIN_CLUB['unix_name']+SITH_BOARD_SUFFIX
SITH_MAIN_MEMBERS_GROUP=SITH_MAIN_CLUB['unix_name']+SITH_MEMBER_SUFFIX
SITH_ACCOUNTING_PAYMENT_METHOD = [
('cheque', _('Check')),
('cash', _('Cash')),
('transfert', _('Transfert')),
('card', _('Credit card')),
('CHEQUE', _('Check')),
('CASH', _('Cash')),
('TRANSFert', _('Transfert')),
('CARD', _('Credit card')),
]
SITH_SUBSCRIPTION_PAYMENT_METHOD = [
('cheque', _('Check')),
('cash', _('Cash')),
('other', _('Other')),
('CHEQUE', _('Check')),
('CASH', _('Cash')),
('OTHER', _('Other')),
]
SITH_SUBSCRIPTION_LOCATIONS = [
@ -270,15 +272,15 @@ SITH_COUNTER_BARS = [
]
SITH_COUNTER_PAYMENT_METHOD = [
('cheque', _('Check')),
('cash', _('Cash')),
('CHEQUE', _('Check')),
('CASH', _('Cash')),
]
SITH_COUNTER_BANK = [
('other', 'Autre'),
('la-poste', 'La Poste'),
('credit-agricole', 'Credit Agricole'),
('credit-mutuel', 'Credit Mutuel'),
('OTHER', 'Autre'),
('LA-POSTE', 'La Poste'),
('CREDIT-AGRICOLE', 'Credit Agricole'),
('CREDIT-MUTUEL', 'Credit Mutuel'),
]
# Subscription durations are in semestres (should be settingized)

19
subscription/migrations/0004_auto_20160807_1954.py Normal file
View File

@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('subscription', '0003_subscription_location'),
]
operations = [
migrations.AlterField(
model_name='subscription',
name='payment_method',
field=models.CharField(max_length=255, verbose_name='payment method', choices=[('CHEQUE', 'Check'), ('CASH', 'Cash'), ('OTHER', 'Other')]),
),
]