Merge branch 'master' of git.illyse.org:coin

coin/billing/migrations/0001_001.py

@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'Invoice'
+        db.create_table(u'billing_invoice', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('status', self.gf('django.db.models.fields.CharField')(default='open', max_length=50)),
+            ('amount', self.gf('django.db.models.fields.DecimalField')(max_digits=5, decimal_places=2)),
+            ('date', self.gf('django.db.models.fields.DateField')(auto_now_add=True, null=True, blank=True)),
+            ('period_from', self.gf('django.db.models.fields.DateField')(null=True)),
+            ('period_to', self.gf('django.db.models.fields.DateField')(null=True)),
+            ('date_due', self.gf('django.db.models.fields.DateField')(null=True)),
+        ))
+        db.send_create_signal(u'billing', ['Invoice'])
+
+        # Adding model 'InvoiceDetail'
+        db.create_table(u'billing_invoicedetail', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('label', self.gf('django.db.models.fields.CharField')(max_length=100)),
+            ('amount', self.gf('django.db.models.fields.DecimalField')(max_digits=5, decimal_places=2)),
+            ('quantity', self.gf('django.db.models.fields.IntegerField')(null=True)),
+            ('tax', self.gf('django.db.models.fields.IntegerField')(null=True)),
+            ('invoice', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['billing.Invoice'])),
+        ))
+        db.send_create_signal(u'billing', ['InvoiceDetail'])
+
+        # Adding model 'Payment'
+        db.create_table(u'billing_payment', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('payment_means', self.gf('django.db.models.fields.CharField')(max_length=100, null=True)),
+            ('amount', self.gf('django.db.models.fields.DecimalField')(null=True, max_digits=7, decimal_places=2)),
+            ('date', self.gf('django.db.models.fields.DateField')(auto_now_add=True, blank=True)),
+            ('invoce', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['billing.Invoice'])),
+        ))
+        db.send_create_signal(u'billing', ['Payment'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'Invoice'
+        db.delete_table(u'billing_invoice')
+
+        # Deleting model 'InvoiceDetail'
+        db.delete_table(u'billing_invoicedetail')
+
+        # Deleting model 'Payment'
+        db.delete_table(u'billing_payment')
+
+
+    models = {
+        u'billing.invoice': {
+            'Meta': {'object_name': 'Invoice'},
+            'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
+            'date_due': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'period_from': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            'period_to': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'open'", 'max_length': '50'})
+        },
+        u'billing.invoicedetail': {
+            'Meta': {'object_name': 'InvoiceDetail'},
+            'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'invoice': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['billing.Invoice']"}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'quantity': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
+            'tax': ('django.db.models.fields.IntegerField', [], {'null': 'True'})
+        },
+        u'billing.payment': {
+            'Meta': {'object_name': 'Payment'},
+            'amount': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '7', 'decimal_places': '2'}),
+            'date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'invoce': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['billing.Invoice']"}),
+            'payment_means': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'})
+        }
+    }
+
+    complete_apps = ['billing']

coin/billing/migrations/0002_001.py

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Invoice.offer'
+        db.add_column(u'billing_invoice', 'offer',
+                      self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['offers.Offer']),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Invoice.offer'
+        db.delete_column(u'billing_invoice', 'offer_id')
+
+
+    models = {
+        u'billing.invoice': {
+            'Meta': {'object_name': 'Invoice'},
+            'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
+            'date_due': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'offer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['offers.Offer']"}),
+            'period_from': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            'period_to': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'open'", 'max_length': '50'})
+        },
+        u'billing.invoicedetail': {
+            'Meta': {'object_name': 'InvoiceDetail'},
+            'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'invoice': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['billing.Invoice']"}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'quantity': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
+            'tax': ('django.db.models.fields.IntegerField', [], {'null': 'True'})
+        },
+        u'billing.payment': {
+            'Meta': {'object_name': 'Payment'},
+            'amount': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '7', 'decimal_places': '2'}),
+            'date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'invoce': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['billing.Invoice']"}),
+            'payment_means': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'})
+        },
+        u'offers.offer': {
+            'Meta': {'object_name': 'Offer'},
+            'billing_period': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'initial_fees': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'period_fees': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['offers.Service']"})
+        },
+        u'offers.service': {
+            'Meta': {'object_name': 'Service'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['billing']

coin/billing/models.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.db import models
-
+from coin.offers.models import Offer 
 
 class Invoice(models.Model):
 
@@ -17,7 +17,7 @@ class Invoice(models.Model):
     period_from = models.DateField(auto_now_add=False, null=True)
     period_to = models.DateField(auto_now_add=False, null=True)
     date_due = models.DateField(auto_now_add=False, null=True)
-
+    offer = models.ForeignKey(Offer)
 
 class InvoiceDetail(models.Model):
 

coin/resources/admin.py

@@ -1,3 +1,6 @@
 from django.contrib import admin
 
-# Register your models here.
+from coin.resources.models import IPPool, IPSubnet
+
+admin.site.register(IPPool,)
+admin.site.register(IPSubnet,)

coin/resources/migrations/0001_initial.py

@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'IPPool'
+        db.create_table(u'resources_ippool', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('description', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('inet', self.gf('netfields.fields.CidrAddressField')(max_length=43)),
+        ))
+        db.send_create_signal(u'resources', ['IPPool'])
+
+        # Adding model 'IPSubnet'
+        db.create_table(u'resources_ipsubnet', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('inet', self.gf('netfields.fields.CidrAddressField')(max_length=43)),
+            ('ip_pool', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['resources.IPPool'])),
+            ('offer_subscription', self.gf('django.db.models.fields.related.ForeignKey')(related_name='ip_subnet', to=orm['offers.OfferSubscription'])),
+        ))
+        db.send_create_signal(u'resources', ['IPSubnet'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'IPPool'
+        db.delete_table(u'resources_ippool')
+
+        # Deleting model 'IPSubnet'
+        db.delete_table(u'resources_ipsubnet')
+
+
+    models = {
+        u'members.member': {
+            'Meta': {'object_name': 'Member'},
+            'address': ('django.db.models.fields.TextField', [], {}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'country': ('django.db.models.fields.CharField', [], {'default': "'France'", 'max_length': '200'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
+            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'ldap_cn': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
+            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'})
+        },
+        u'offers.offer': {
+            'Meta': {'object_name': 'Offer'},
+            'billing_period': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'initial_fees': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'period_fees': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['offers.Service']"})
+        },
+        u'offers.offersubscription': {
+            'Meta': {'object_name': 'OfferSubscription'},
+            'commitment': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
+            'offer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['offers.Offer']"}),
+            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'subscription_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
+        },
+        u'offers.service': {
+            'Meta': {'object_name': 'Service'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        u'resources.ippool': {
+            'Meta': {'object_name': 'IPPool'},
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'inet': ('netfields.fields.CidrAddressField', [], {'max_length': '43'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        u'resources.ipsubnet': {
+            'Meta': {'object_name': 'IPSubnet'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'inet': ('netfields.fields.CidrAddressField', [], {'max_length': '43'}),
+            'ip_pool': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['resources.IPPool']"}),
+            'offer_subscription': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ip_subnet'", 'to': u"orm['offers.OfferSubscription']"})
+        }
+    }
+
+    complete_apps = ['resources']

coin/resources/models.py

@@ -12,9 +12,16 @@ class IPPool(models.Model):
     inet = CidrAddressField()
     objects = NetManager()
 
+    def __unicode__(self):
+        return self.name
+
 
 class IPSubnet(models.Model):
     inet = CidrAddressField()
     objects = NetManager()
     ip_pool = models.ForeignKey(IPPool)
-    offer_subscription = models.ForeignKey('offers.OfferSubscription')
+    offer_subscription = models.ForeignKey('offers.OfferSubscription',
+                                           related_name='ip_subnet')
+
+    def __unicode__(self):
+        return str(self.inet)

coin/settings.py

@@ -33,6 +33,7 @@ DATABASES = {
         'ENGINE': 'ldapdb.backends.ldap',
         'NAME': 'ldap://ldapdev.illyse.org:390/',
         'TLS': True,
+        'GLOBAL_OPTIONS': {ldap.OPT_X_TLS_REQUIRE_CERT: ldap.OPT_X_TLS_NEVER},
         'USER': 'cn=illysedev,ou=services,o=ILLYSE,l=Villeurbanne,st=RHA,c=FR',
         'PASSWORD': 'gfj83-E8ECgGh23JK_Ol12'
     }