Reset all migrations

coin/billing/migrations/0001_initial.py

@@ -3,7 +3,9 @@ from __future__ import unicode_literals
 
 from django.db import models, migrations
 import coin.billing.models
+import coin.utils
 import datetime
+import django.core.files.storage
 
 
 class Migration(migrations.Migration):
@@ -16,10 +18,12 @@ class Migration(migrations.Migration):
             name='Invoice',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('number', models.CharField(default=coin.billing.models.next_invoice_number, unique=True, max_length=25, verbose_name=b'Num\xc3\xa9ro')),
-                ('status', models.CharField(default=b'open', max_length=50, verbose_name=b'Statut', choices=[(b'open', 'A payer'), (b'closed', 'Regl\xe9e'), (b'trouble', 'Litige')])),
-                ('date', models.DateField(default=datetime.date.today, null=True)),
-                ('date_due', models.DateField(default=datetime.date(2014, 9, 30), null=True, verbose_name="Date d'\xe9ch\xe9ance de paiement")),
+                ('validated', models.BooleanField(default=False, verbose_name='valid\xe9e')),
+                ('number', models.CharField(default=coin.billing.models.next_invoice_number, unique=True, max_length=25, verbose_name='num\xe9ro')),
+                ('status', models.CharField(default='open', max_length=50, verbose_name='statut', choices=[('open', 'A payer'), ('closed', 'Regl\xe9e'), ('trouble', 'Litige')])),
+                ('date', models.DateField(default=datetime.date.today, null=True, verbose_name='date')),
+                ('date_due', models.DateField(default=coin.utils.end_of_month, null=True, verbose_name="date d'\xe9ch\xe9ance de paiement")),
+                ('pdf', models.FileField(storage=django.core.files.storage.FileSystemStorage(location='/home/zorun/illyse/git/coin/smedia/'), upload_to=coin.billing.models.invoice_pdf_filename, null=True, verbose_name='PDF', blank=True)),
             ],
             options={
                 'verbose_name': 'facture',
@@ -31,12 +35,12 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('label', models.CharField(max_length=100)),
-                ('amount', models.DecimalField(verbose_name=b'Montant', max_digits=5, decimal_places=2)),
-                ('quantity', models.DecimalField(default=1.0, null=True, verbose_name='Quantit\xe9', max_digits=4, decimal_places=2)),
-                ('tax', models.DecimalField(decimal_places=2, default=0.0, max_digits=4, help_text=b'en %', null=True, verbose_name=b'TVA')),
-                ('period_from', models.DateField(default=datetime.date(2014, 9, 1), help_text='Date de d\xe9but de p\xe9riode sur laquelle est factur\xe9 cet item', null=True, verbose_name='D\xe9but de p\xe9riode', blank=True)),
-                ('period_to', models.DateField(default=datetime.date(2014, 9, 30), help_text='Date de fin de p\xe9riode sur laquelle est factur\xe9 cet item', null=True, verbose_name='Fin de p\xe9riode', blank=True)),
-                ('invoice', models.ForeignKey(related_name=b'details', verbose_name=b'Facture', to='billing.Invoice')),
+                ('amount', models.DecimalField(verbose_name='montant', max_digits=5, decimal_places=2)),
+                ('quantity', models.DecimalField(default=1.0, null=True, verbose_name='quantit\xe9', max_digits=4, decimal_places=2)),
+                ('tax', models.DecimalField(decimal_places=2, default=0.0, max_digits=4, help_text='en %', null=True, verbose_name='TVA')),
+                ('period_from', models.DateField(default=coin.utils.start_of_month, help_text='Date de d\xe9but de p\xe9riode sur laquelle est factur\xe9 cet item', null=True, verbose_name='d\xe9but de p\xe9riode', blank=True)),
+                ('period_to', models.DateField(default=coin.utils.end_of_month, help_text='Date de fin de p\xe9riode sur laquelle est factur\xe9 cet item', null=True, verbose_name='fin de p\xe9riode', blank=True)),
+                ('invoice', models.ForeignKey(related_name='details', verbose_name='facture', to='billing.Invoice')),
             ],
             options={
                 'verbose_name': 'd\xe9tail de facture',
@@ -47,10 +51,10 @@ class Migration(migrations.Migration):
             name='Payment',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('payment_mean', models.CharField(default=b'transfer', max_length=100, null=True, verbose_name=b'Moyen de paiement', choices=[(b'cash', 'Esp\xe8ces'), (b'check', 'Ch\xe8que'), (b'transfer', 'Virement'), (b'other', 'Autre')])),
-                ('amount', models.DecimalField(null=True, verbose_name=b'Montant', max_digits=5, decimal_places=2)),
+                ('payment_mean', models.CharField(default='transfer', max_length=100, null=True, verbose_name='moyen de paiement', choices=[('cash', 'Esp\xe8ces'), ('check', 'Ch\xe8que'), ('transfer', 'Virement'), ('other', 'Autre')])),
+                ('amount', models.DecimalField(null=True, verbose_name='montant', max_digits=5, decimal_places=2)),
                 ('date', models.DateField(default=datetime.date.today)),
-                ('invoice', models.ForeignKey(related_name=b'payments', verbose_name=b'Facture', to='billing.Invoice')),
+                ('invoice', models.ForeignKey(related_name='payments', verbose_name='facture', to='billing.Invoice')),
             ],
             options={
                 'verbose_name': 'paiement',

coin/billing/migrations/0002_auto_20140919_2158.py

@@ -18,13 +18,13 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='invoicedetail',
             name='offersubscription',
-            field=models.ForeignKey(default=None, blank=True, to='offers.OfferSubscription', null=True, verbose_name=b'Abonnement'),
+            field=models.ForeignKey(default=None, blank=True, to='offers.OfferSubscription', null=True, verbose_name='abonnement'),
             preserve_default=True,
         ),
         migrations.AddField(
             model_name='invoice',
             name='member',
-            field=models.ForeignKey(related_name=b'invoices', on_delete=django.db.models.deletion.SET_NULL, default=None, blank=True, to=settings.AUTH_USER_MODEL, null=True, verbose_name=b'Membre'),
+            field=models.ForeignKey(related_name='invoices', on_delete=django.db.models.deletion.SET_NULL, default=None, blank=True, to=settings.AUTH_USER_MODEL, null=True, verbose_name='membre'),
             preserve_default=True,
         ),
     ]

coin/billing/migrations/0003_auto_20140920_2342.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('billing', '0002_auto_20140919_2158'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='invoice',
-            name='pdf',
-            field=models.FileField(upload_to=b'invoices', null=True, verbose_name='Facture en PDF', blank=True),
-            preserve_default=True,
-        ),
-        migrations.AddField(
-            model_name='invoice',
-            name='validated',
-            field=models.BooleanField(default=False, verbose_name=b'Facture valid\xc3\xa9e'),
-            preserve_default=True,
-        ),
-    ]

coin/billing/migrations/0004_auto_20140921_1454.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import coin.billing.models
-import coin.utils
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('billing', '0003_auto_20140920_2342'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='invoice',
-            name='pdf',
-            field=models.FileField(storage=coin.utils.private_files_storage, upload_to=coin.billing.models.invoice_pdf_filename, null=True, verbose_name='PDF', blank=True),
-        ),
-        migrations.AlterField(
-            model_name='invoice',
-            name='validated',
-            field=models.BooleanField(default=False, verbose_name=b'Valid\xc3\xa9e'),
-        ),
-    ]

coin/configuration/migrations/0001_initial.py

@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
             ],
             options={
-                'abstract': False,
+                'verbose_name': 'configuration',
             },
             bases=(models.Model,),
         ),

coin/configuration/migrations/0002_auto_20140919_2158.py

@@ -16,13 +16,13 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='configuration',
             name='offersubscription',
-            field=models.OneToOneField(related_name=b'configuration', null=True, blank=True, to='offers.OfferSubscription', verbose_name=b'Abonnement'),
+            field=models.OneToOneField(related_name='configuration', verbose_name='abonnement', to='offers.OfferSubscription'),
             preserve_default=True,
         ),
         migrations.AddField(
             model_name='configuration',
             name='polymorphic_ctype',
-            field=models.ForeignKey(related_name=b'polymorphic_configuration.configuration_set', editable=False, to='contenttypes.ContentType', null=True),
+            field=models.ForeignKey(related_name='polymorphic_configuration.configuration_set', editable=False, to='contenttypes.ContentType', null=True),
             preserve_default=True,
         ),
     ]

coin/configuration/migrations/0003_auto_20140924_2052.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('configuration', '0002_auto_20140919_2158'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='configuration',
-            name='offersubscription',
-            field=models.OneToOneField(related_name=b'configuration', verbose_name=b'abonnement', to='offers.OfferSubscription'),
-        ),
-    ]

coin/members/migrations/0001_initial.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import models, migrations
 import datetime
+import coin.utils
 from django.conf import settings
 import django.utils.timezone
 import coin.mixins
@@ -30,17 +31,17 @@ class Migration(migrations.Migration):
                 ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
                 ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
                 ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
-                ('status', models.CharField(default=b'pending', max_length=50, choices=[(b'member', b'Adh\xc3\xa9rent'), (b'not_member', b'Non adh\xc3\xa9rent'), (b'pending', b"Demande d'adh\xc3\xa9sion")])),
-                ('type', models.CharField(default=b'natural_person', max_length=20, choices=[(b'natural_person', b'Personne physique'), (b'legal_entity', b'Personne morale')])),
-                ('organization_name', models.CharField(help_text=b'Pour une personne morale', max_length=200, verbose_name=b"Nom de l'organisme", blank=True)),
-                ('home_phone_number', models.CharField(max_length=25, verbose_name='T\xe9l\xe9phone fixe', blank=True)),
-                ('mobile_phone_number', models.CharField(max_length=25, verbose_name='T\xe9l\xe9phone mobile', blank=True)),
-                ('address', models.TextField(null=True, verbose_name='Adresse', blank=True)),
-                ('postal_code', models.CharField(max_length=15, null=True, verbose_name='Code postal', blank=True)),
-                ('city', models.CharField(max_length=200, null=True, verbose_name='Commune', blank=True)),
-                ('country', models.CharField(default=b'France', max_length=200, null=True, verbose_name='Pays', blank=True)),
-                ('entry_date', models.DateField(default=datetime.date.today, verbose_name=b'Date de premi\xc3\xa8re adh\xc3\xa9sion')),
-                ('resign_date', models.DateField(null=True, verbose_name=b"Date de d\xc3\xa9part de l'association", blank=True)),
+                ('status', models.CharField(default='pending', max_length=50, verbose_name='statut', choices=[('member', 'Adh\xe9rent'), ('not_member', 'Non adh\xe9rent'), ('pending', "Demande d'adh\xe9sion")])),
+                ('type', models.CharField(default='natural_person', max_length=20, verbose_name='type', choices=[('natural_person', 'Personne physique'), ('legal_entity', 'Personne morale')])),
+                ('organization_name', models.CharField(help_text='Pour une personne morale', max_length=200, verbose_name="nom de l'organisme", blank=True)),
+                ('home_phone_number', models.CharField(max_length=25, verbose_name='t\xe9l\xe9phone fixe', blank=True)),
+                ('mobile_phone_number', models.CharField(max_length=25, verbose_name='t\xe9l\xe9phone mobile', blank=True)),
+                ('address', models.TextField(null=True, verbose_name='adresse postale', blank=True)),
+                ('postal_code', models.CharField(blank=True, max_length=5, null=True, verbose_name='code postal', validators=[django.core.validators.RegexValidator(regex='^\\d{5}$', message='Code postal non valide.')])),
+                ('city', models.CharField(max_length=200, null=True, verbose_name='commune', blank=True)),
+                ('country', models.CharField(default='France', max_length=200, null=True, verbose_name='pays', blank=True)),
+                ('entry_date', models.DateField(default=datetime.date.today, verbose_name='date de premi\xe8re adh\xe9sion')),
+                ('resign_date', models.DateField(null=True, verbose_name="date de d\xe9part de l'association", blank=True)),
                 ('groups', models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of his/her group.', verbose_name='groups')),
                 ('user_permissions', models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Permission', blank=True, help_text='Specific permissions for this user.', verbose_name='user permissions')),
             ],
@@ -53,9 +54,9 @@ class Migration(migrations.Migration):
             name='CryptoKey',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('type', models.CharField(max_length=3, choices=[(b'RSA', b'RSA'), (b'GPG', b'GPG')])),
-                ('key', models.TextField(verbose_name='Cl\xe9')),
-                ('member', models.ForeignKey(verbose_name='Membre', to=settings.AUTH_USER_MODEL)),
+                ('type', models.CharField(max_length=3, verbose_name='type', choices=[('RSA', 'RSA'), ('GPG', 'GPG')])),
+                ('key', models.TextField(verbose_name='cl\xe9')),
+                ('member', models.ForeignKey(verbose_name='membre', to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'verbose_name': 'cl\xe9',
@@ -66,10 +67,10 @@ class Migration(migrations.Migration):
             name='MembershipFee',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('amount', models.IntegerField(default=b'20', help_text=b'en \xe2\x82\xac', verbose_name='Montant')),
-                ('start_date', models.DateField(default=datetime.date.today, verbose_name=b'Date de d\xc3\xa9but de cotisation')),
-                ('end_date', models.DateField(default=datetime.date(2015, 9, 19), verbose_name=b'Date de fin de cotisation')),
-                ('member', models.ForeignKey(related_name=b'membership_fees', verbose_name='Membre', to=settings.AUTH_USER_MODEL)),
+                ('amount', models.IntegerField(default='20', help_text='en \u20ac', verbose_name='montant')),
+                ('start_date', models.DateField(default=datetime.date.today, verbose_name='date de d\xe9but de cotisation')),
+                ('end_date', models.DateField(default=coin.utils.in_one_year, verbose_name='date de fin de cotisation')),
+                ('member', models.ForeignKey(related_name='membership_fees', verbose_name='membre', to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'verbose_name': 'cotisation',

coin/members/migrations/0002_auto_20140920_1558.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import coin
-import datetime
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('members', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='member',
-            name='email',
-            field=models.EmailField(max_length=75, verbose_name='email address'),
-        ),
-        migrations.AlterField(
-            model_name='membershipfee',
-            name='end_date',
-            field=models.DateField(default=coin.members.models.in_one_year, verbose_name=b'Date de fin de cotisation'),
-        ),
-    ]

coin/members/migrations/0003_auto_20140920_1613.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('members', '0002_auto_20140920_1558'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='member',
-            name='email',
-            field=models.EmailField(unique=True, max_length=75, verbose_name='email address'),
-        ),
-    ]

coin/members/migrations/0004_auto_20140928_0109.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import django.core.validators
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('members', '0003_auto_20140920_1613'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='member',
-            name='address',
-            field=models.TextField(null=True, verbose_name='adresse', blank=True),
-        ),
-        migrations.AlterField(
-            model_name='member',
-            name='postal_code',
-            field=models.CharField(blank=True, max_length=5, null=True, verbose_name='code postal', validators=[django.core.validators.RegexValidator(regex=b'^\\d{5}$', message='Code postal non valide.')]),
-        ),
-    ]

coin/offers/migrations/0001_initial.py

@@ -17,11 +17,11 @@ class Migration(migrations.Migration):
             name='Offer',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=255, verbose_name=b"Nom de l'offre")),
-                ('configuration_type', models.CharField(help_text=b'Type of configuration to use with this offer', max_length=50, null=True, choices=[(b'', b'')])),
-                ('billing_period', models.IntegerField(default=1, help_text=b'en mois', verbose_name=b'P\xc3\xa9riode de facturation')),
-                ('period_fees', models.DecimalField(help_text=b'en \xe2\x82\xac', verbose_name=b'Montant par p\xc3\xa9riode de facturation', max_digits=5, decimal_places=2)),
-                ('initial_fees', models.DecimalField(help_text=b'en \xe2\x82\xac', verbose_name=b'Frais de mise en service', max_digits=5, decimal_places=2)),
+                ('name', models.CharField(max_length=255, verbose_name="nom de l'offre")),
+                ('configuration_type', models.CharField(help_text='Type de configuration \xe0 utiliser avec cette offre', max_length=50, null=True, verbose_name='type de configuration', choices=[('', '')])),
+                ('billing_period', models.IntegerField(default=1, help_text='en mois', verbose_name='p\xe9riode de facturation')),
+                ('period_fees', models.DecimalField(help_text='en \u20ac', verbose_name='montant par p\xe9riode de facturation', max_digits=5, decimal_places=2)),
+                ('initial_fees', models.DecimalField(help_text='en \u20ac', verbose_name='frais de mise en service', max_digits=5, decimal_places=2)),
             ],
             options={
                 'verbose_name': 'offre',
@@ -32,11 +32,11 @@ class Migration(migrations.Migration):
             name='OfferSubscription',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('subscription_date', models.DateField(default=datetime.date.today, verbose_name=b"Date de souscription \xc3\xa0 l'offre")),
-                ('resign_date', models.DateField(null=True, verbose_name=b'Date de r\xc3\xa9siliation', blank=True)),
-                ('commitment', models.IntegerField(default=0, help_text=b'en mois', verbose_name=b"P\xc3\xa9riode d'engagement")),
-                ('member', models.ForeignKey(verbose_name=b'Membre', to=settings.AUTH_USER_MODEL)),
-                ('offer', models.ForeignKey(verbose_name=b'Offre', to='offers.Offer')),
+                ('subscription_date', models.DateField(default=datetime.date.today, verbose_name="date de souscription \xe0 l'offre")),
+                ('resign_date', models.DateField(null=True, verbose_name='date de r\xe9siliation', blank=True)),
+                ('commitment', models.IntegerField(default=0, help_text='en mois', verbose_name="p\xe9riode d'engagement")),
+                ('member', models.ForeignKey(verbose_name='membre', to=settings.AUTH_USER_MODEL)),
+                ('offer', models.ForeignKey(verbose_name='offre', to='offers.Offer')),
             ],
             options={
                 'verbose_name': 'abonnement',

coin/resources/migrations/0001_initial.py

@@ -10,6 +10,7 @@ import django.core.validators
 class Migration(migrations.Migration):
 
     dependencies = [
+        ('configuration', '0002_auto_20141002_0204'),
     ]
 
     operations = [
@@ -17,11 +18,13 @@ class Migration(migrations.Migration):
             name='IPPool',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(help_text=b'Name of the IP pool', max_length=255)),
-                ('default_subnetsize', models.PositiveSmallIntegerField(help_text=b'Default subnet size to allocate to subscribers in this pool', verbose_name=b'default subnet size', validators=[django.core.validators.MaxValueValidator(64)])),
-                ('inet', netfields.fields.CidrAddressField(help_text=b'Address space to use', max_length=43, validators=[coin.resources.models.validate_subnet])),
+                ('name', models.CharField(help_text="Nom du pool d'IP", max_length=255, verbose_name='nom')),
+                ('default_subnetsize', models.PositiveSmallIntegerField(help_text='Taille par d\xe9faut du sous-r\xe9seau \xe0 allouer aux abonn\xe9s dans ce pool', verbose_name='taille de sous-r\xe9seau par d\xe9faut', validators=[django.core.validators.MaxValueValidator(64)])),
+                ('inet', netfields.fields.CidrAddressField(help_text="Bloc d'adresses IP du pool", max_length=43, verbose_name='r\xe9seau', validators=[coin.resources.models.validate_subnet])),
             ],
             options={
+                'verbose_name': "pool d'IP",
+                'verbose_name_plural': "pools d'IP",
             },
             bases=(models.Model,),
         ),
@@ -29,11 +32,14 @@ class Migration(migrations.Migration):
             name='IPSubnet',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('inet', netfields.fields.CidrAddressField(blank=True, help_text=b'Leave empty for automatic allocation', max_length=43, verbose_name=b'subnet', validators=[coin.resources.models.validate_subnet])),
-                ('delegate_reverse_dns', models.BooleanField(default=False)),
-                ('ip_pool', models.ForeignKey(verbose_name=b'IP pool', to='resources.IPPool')),
+                ('inet', netfields.fields.CidrAddressField(blank=True, help_text='Laisser vide pour allouer automatiquement', max_length=43, verbose_name='sous-r\xe9seau', validators=[coin.resources.models.validate_subnet])),
+                ('delegate_reverse_dns', models.BooleanField(default=False, help_text='D\xe9l\xe9guer la r\xe9solution DNS inverse de ce sous-r\xe9seau \xe0 un ou plusieurs serveurs de noms', verbose_name='d\xe9l\xe9guer le reverse DNS')),
+                ('configuration', models.ForeignKey(related_name='ip_subnet', verbose_name='configuration', to='configuration.Configuration')),
+                ('ip_pool', models.ForeignKey(verbose_name="pool d'IP", to='resources.IPPool')),
             ],
             options={
+                'verbose_name': 'sous-r\xe9seau IP',
+                'verbose_name_plural': 'sous-r\xe9seaux IP',
             },
             bases=(models.Model,),
         ),

coin/resources/migrations/0002_auto_20140919_2158.py

@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('offers', '0001_initial'),
-        ('resources', '0001_initial'),
-        ('reverse_dns', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='ipsubnet',
-            name='name_server',
-            field=models.ManyToManyField(help_text=b'Nameserver to use for the delegation of reverse DNS', to='reverse_dns.NameServer', blank=True),
-            preserve_default=True,
-        ),
-        migrations.AddField(
-            model_name='ipsubnet',
-            name='offer_subscription',
-            field=models.ForeignKey(related_name=b'ip_subnet', verbose_name=b'subscription', to='offers.OfferSubscription'),
-            preserve_default=True,
-        ),
-    ]

coin/resources/migrations/0002_ipsubnet_name_server.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('resources', '0001_initial'),
+        ('reverse_dns', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ipsubnet',
+            name='name_server',
+            field=models.ManyToManyField(help_text='Serveur de noms \xe0 qui d\xe9l\xe9guer la r\xe9solution DNS inverse', to='reverse_dns.NameServer', verbose_name='serveur de noms', blank=True),
+            preserve_default=True,
+        ),
+    ]

coin/resources/migrations/0003_auto_20140920_1615.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('configuration', '0002_auto_20140919_2158'),
-        ('resources', '0002_auto_20140919_2158'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='ipsubnet',
-            name='offer_subscription',
-        ),
-        migrations.AddField(
-            model_name='ipsubnet',
-            name='configuration',
-            field=models.ForeignKey(related_name=b'ip_subnet', default=None, to='configuration.Configuration'),
-            preserve_default=False,
-        ),
-    ]

coin/reverse_dns/migrations/0001_initial.py

@@ -19,11 +19,13 @@ class Migration(migrations.Migration):
             name='NameServer',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('dns_name', models.CharField(help_text=b'Example: ns1.example.com', max_length=255)),
-                ('description', models.CharField(help_text=b'Example: My first name server', max_length=255, verbose_name=b'human-readable name of the nameserver', blank=True)),
-                ('owner', models.ForeignKey(to=settings.AUTH_USER_MODEL, null=True)),
+                ('dns_name', models.CharField(help_text='Exemple : ns1.example.com', max_length=255, verbose_name='nom du serveur')),
+                ('description', models.CharField(help_text='Exemple : Mon serveur de noms principal', max_length=255, verbose_name='description du serveur', blank=True)),
+                ('owner', models.ForeignKey(verbose_name='propri\xe9taire', to=settings.AUTH_USER_MODEL)),
             ],
             options={
+                'verbose_name': 'serveur de noms',
+                'verbose_name_plural': 'serveurs de noms',
             },
             bases=(models.Model,),
         ),
@@ -31,12 +33,14 @@ class Migration(migrations.Migration):
             name='ReverseDNSEntry',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('ip', netfields.fields.InetAddressField(unique=True, max_length=39)),
-                ('reverse', models.CharField(max_length=255, verbose_name=b'hostname to associate to the IP')),
-                ('ttl', models.IntegerField(default=3600, help_text=b'in seconds', verbose_name=b'TTL', validators=[django.core.validators.MinValueValidator(60)])),
-                ('ip_subnet', models.ForeignKey(to='resources.IPSubnet')),
+                ('ip', netfields.fields.InetAddressField(unique=True, max_length=39, verbose_name='adresse IP')),
+                ('reverse', models.CharField(help_text="Nom \xe0 associer \xe0 l'adresse IP", max_length=255, verbose_name='reverse')),
+                ('ttl', models.IntegerField(default=3600, help_text='en secondes', verbose_name='TTL', validators=[django.core.validators.MinValueValidator(60)])),
+                ('ip_subnet', models.ForeignKey(verbose_name='sous-r\xe9seau IP', to='resources.IPSubnet')),
             ],
             options={
+                'verbose_name': 'entr\xe9e DNS inverse',
+                'verbose_name_plural': 'entr\xe9es DNS inverses',
             },
             bases=(models.Model,),
         ),

coin/reverse_dns/models.py

@@ -40,7 +40,8 @@ class ReverseDNSEntry(models.Model):
     ttl = models.IntegerField(default=3600, verbose_name="TTL",
                               help_text="en secondes",
                               validators=[MinValueValidator(60)])
-    ip_subnet = models.ForeignKey('resources.IPSubnet')
+    ip_subnet = models.ForeignKey('resources.IPSubnet',
+                                  verbose_name='sous-réseau IP')
 
     objects = NetManager()
 

coin/vpn/migrations/0001_initial.py

@@ -18,12 +18,12 @@ class Migration(migrations.Migration):
             name='VPNConfiguration',
             fields=[
                 ('configuration_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='configuration.Configuration')),
-                ('activated', models.BooleanField(default=False)),
-                ('login', models.CharField(help_text=b'leave empty for automatic generation', unique=True, max_length=50, blank=True)),
-                ('password', models.CharField(max_length=256, null=True, blank=True)),
-                ('ipv4_endpoint', netfields.fields.InetAddressField(blank=True, max_length=39, null=True, validators=[coin.validation.validate_v4])),
-                ('ipv6_endpoint', netfields.fields.InetAddressField(blank=True, max_length=39, null=True, validators=[coin.validation.validate_v6])),
-                ('comment', models.CharField(max_length=512, blank=True)),
+                ('activated', models.BooleanField(default=False, verbose_name='activ\xe9')),
+                ('login', models.CharField(help_text='leave empty for automatic generation', unique=True, max_length=50, verbose_name='identifiant', blank=True)),
+                ('password', models.CharField(max_length=256, null=True, verbose_name='mot de passe', blank=True)),
+                ('ipv4_endpoint', netfields.fields.InetAddressField(validators=[coin.validation.validate_v4], max_length=39, blank=True, help_text='Adresse IPv4 utilis\xe9e par d\xe9faut sur le VPN', null=True, verbose_name='IPv4')),
+                ('ipv6_endpoint', netfields.fields.InetAddressField(validators=[coin.validation.validate_v6], max_length=39, blank=True, help_text='Adresse IPv6 utilis\xe9e par d\xe9faut sur le VPN', null=True, verbose_name='IPv6')),
+                ('comment', models.CharField(max_length=512, verbose_name='commentaire', blank=True)),
             ],
             options={
                 'verbose_name': 'VPN',

coin/vpn/migrations/0002_auto_20140928_0109.py

@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import netfields.fields
-import coin.validation
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='vpnconfiguration',
-            name='comment',
-            field=models.CharField(max_length=512, verbose_name=b'commentaire', blank=True),
-        ),
-        migrations.AlterField(
-            model_name='vpnconfiguration',
-            name='ipv4_endpoint',
-            field=netfields.fields.InetAddressField(validators=[coin.validation.validate_v4], max_length=39, blank=True, help_text=b'Addresse IPv4 utilis\xc3\xa9e par d\xc3\xa9faut sur le VPN', null=True, verbose_name=b'IPv4'),
-        ),
-        migrations.AlterField(
-            model_name='vpnconfiguration',
-            name='ipv6_endpoint',
-            field=netfields.fields.InetAddressField(validators=[coin.validation.validate_v6], max_length=39, blank=True, help_text=b'Addresse IPv6 utilis\xc3\xa9e par d\xc3\xa9faut sur le VPN', null=True, verbose_name=b'IPv6'),
-        ),
-        migrations.AlterField(
-            model_name='vpnconfiguration',
-            name='login',
-            field=models.CharField(help_text=b'leave empty for automatic generation', unique=True, max_length=50, verbose_name=b'identifiant', blank=True),
-        ),
-    ]