Commit 31e159e1 authored by chirac's avatar chirac

Merge branch 'fix_migration' into 'master'

Devrait fixer le bug sur cotisations/migrations/0026_auto_20171028_0126.py

See merge request federez/re2o!86
parents 38ed79a1 107fa6b9
......@@ -59,7 +59,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='cotisation',
name='type_cotisation',
field=models.CharField(choices=[('Connexion', 'Connexion'), ('Adhesion', 'Adhesion'), ('All', 'All')], max_length=255),
field=models.CharField(choices=[('Connexion', 'Connexion'), ('Adhesion', 'Adhesion'), ('All', 'All')], max_length=255, default='All'),
),
migrations.AddField(
model_name='vente',
......
......@@ -534,6 +534,7 @@ class Cotisation(models.Model):
type_cotisation = models.CharField(
choices=COTISATION_TYPE,
max_length=255,
default='All',
)
date_start = models.DateTimeField()
date_end = models.DateTimeField()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment