Added SIRET field to registeredOffice

coin/billing/templates/billing/invoice_pdf.html

@@ -67,7 +67,7 @@
 		<table widht="100%">
 			<tr>
 				<td width="50"><img id="logo" src="{{ branding.logoURL }}" height="20" /></td>
-				<td>{{ branding.shortname|upper }}, association loi de 1901 à but non lucratif - SIRET : 539 453 191 00014</td>
+				<td>{{ branding.shortname|upper }}, association loi de 1901 à but non lucratif - SIRET : {{ branding.registeredoffice.siret }}</td>
 				<td width="20"><pdf:pagenumber>
 					/<pdf:pagecount>
 				</td>

coin/isp_database/admin.py

@@ -18,9 +18,16 @@ class SingleInstanceAdminMixin(object):
 class RegisteredOfficeInline(admin.StackedInline):
     model = RegisteredOffice
     extra = 0
-    fields = (('street_address', 'extended_address', 'post_office_box'),
-              ('postal_code', 'locality'),
-              ('region', 'country_name'))
+    fieldsets = (
+        ('', {'fields': (
+             ('street_address', 'extended_address', 'post_office_box'),
+             ('postal_code', 'locality'),
+             ('region', 'country_name'))}),
+        ('Extras', {
+             'fields': ('siret',),
+             'description': 'Ces champs ne font pas partie de la spécification db.ffdn.org mais sont utilisés sur le site'})
+        )
+
 
 
 class OtherWebsiteInline(admin.StackedInline):

coin/isp_database/fixtures/illyse.json

@@ -46,7 +46,8 @@
     "isp": 1,
     "postal_code": "69100",
     "country_name": "France",
-    "street_address": "225 route de Genas"
+    "street_address": "225 route de Genas",
+    "siret": "53945319100014"
   },
   "model": "isp_database.registeredoffice",
   "pk": 1

coin/isp_database/migrations/0005_registeredoffice_siret.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import localflavor.fr.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('isp_database', '0004_ispinfo_support_email'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='registeredoffice',
+            name='siret',
+            field=localflavor.fr.models.FRSIRETField(default='', max_length=14),
+            preserve_default=False,
+        ),
+    ]

coin/isp_database/models.py

@@ -6,6 +6,7 @@ from django.core.validators import MaxValueValidator
 from django.core.exceptions import ValidationError
 
 from localflavor.generic.models import IBANField, BICField
+from localflavor.fr.models import FRSIRETField
 
 from coin.members.models import count_active_members
 from coin.offers.models import count_active_subscriptions
@@ -166,6 +167,9 @@ class RegisteredOffice(models.Model):
     country_name = models.CharField(max_length=512)
     isp = models.OneToOneField(ISPInfo)
 
+    # not in db.ffdn.org spec
+    siret = FRSIRETField('SIRET')
+
     def to_dict(self):
         d = dict()
         for field in ('post_office_box', 'extended_address', 'street_address',

requirements.txt

@@ -10,7 +10,7 @@ html2text
 django-polymorphic==0.6
 django-sendfile==0.3.6
 # Can switch to localflavor release as long as BIC field gets in
--e git+https://github.com/JocelynDelalande/django-localflavor.git@add-bic-model-and-form-fields#egg=django-localflavor
+-e git+https://github.com/JocelynDelalande/django-localflavor.git@temp-siret-and-bic#egg=django-localflavor
 -e git+https://code.ffdn.org/zorun/django-postgresql-netfields.git#egg=django-netfields
 -e git+https://github.com/chrisglass/xhtml2pdf@a5d37ffd0ccb0603bdf668198de0f21766816104#egg=xhtml2pdf-master
 -e git+https://github.com/jlaine/django-ldapdb@1c4f9f29e52176f4367a1dffec2ecd2e123e2e7a#egg=django-ldapdb