Merge branch 'sli' into 'master'

Add subscription for 2018 Euroks

See merge request !155

sith/settings.py

@@ -502,6 +502,11 @@ SITH_SUBSCRIPTIONS = {
         'name': _('Two month for free'),
         'price': 0,
         'duration': 0.33,
+    },
+    'benevoles-euroks': {
+        'name': _('Eurok\'s volunteer'),
+        'price': 5,
+        'duration': 0.1
     }
     # To be completed....
 }

subscription/migrations/0007_auto_20180706_1135.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.13 on 2018-07-06 09:35
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('subscription', '0006_auto_20170902_1222'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subscription',
+            name='subscription_type',
+            field=models.CharField(choices=[('amicale/doceo', 'Amicale/DOCEO member'), ('assidu', 'Assidu member'), ('benevoles-euroks', "Eurok's volunteer"), ('crous', 'CROUS member'), ('cursus-alternant', 'Alternating cursus'), ('cursus-branche', 'Branch cursus'), ('cursus-tronc-commun', 'Common core cursus'), ('deux-mois-essai', 'Two month for free'), ('deux-semestres', 'Two semesters'), ('membre-honoraire', 'Honorary member'), ('reseau-ut', 'UT network member'), ('sbarro/esta', 'Sbarro/ESTA member'), ('un-semestre', 'One semester'), ('un-semestre-welcome', 'One semester Welcome Week')], max_length=255, verbose_name='subscription type'),
+        ),
+    ]