diff --git a/cotisations/admin.py b/cotisations/admin.py index a26ed35c..03a7efbe 100644 --- a/cotisations/admin.py +++ b/cotisations/admin.py @@ -1,12 +1,12 @@ from django.contrib import admin -from .models import Facture, Article, Banque, Paiement +from .models import Facture, Article, Banque, Paiement, Cotisation class FactureAdmin(admin.ModelAdmin): list_display = ('user','paiement','name', 'number', 'date') class ArticleAdmin(admin.ModelAdmin): - list_display = ('name','prix') + list_display = ('name','prix','cotisation') class BanqueAdmin(admin.ModelAdmin): list_display = ('name',) @@ -14,7 +14,14 @@ class BanqueAdmin(admin.ModelAdmin): class PaiementAdmin(admin.ModelAdmin): list_display = ('moyen',) +class PaiementAdmin(admin.ModelAdmin): + list_display = ('moyen',) + +class CotisationAdmin(admin.ModelAdmin): + list_display = ('facture','date_start','date_end') + admin.site.register(Facture, FactureAdmin) admin.site.register(Article, ArticleAdmin) admin.site.register(Banque, BanqueAdmin) admin.site.register(Paiement, PaiementAdmin) +admin.site.register(Cotisation, CotisationAdmin) diff --git a/cotisations/migrations/0008_auto_20160702_1614.py b/cotisations/migrations/0008_auto_20160702_1614.py new file mode 100644 index 00000000..54d6de67 --- /dev/null +++ b/cotisations/migrations/0008_auto_20160702_1614.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0005_auto_20160702_0006'), + ('cotisations', '0007_auto_20160702_1543'), + ] + + operations = [ + migrations.CreateModel( + name='Cotisation', + fields=[ + ('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)), + ('date_start', models.DateTimeField(auto_now_add=True)), + ('date_end', models.DateTimeField()), + ], + ), + migrations.AddField( + model_name='article', + name='cotisation', + field=models.BooleanField(default=True), + preserve_default=False, + ), + migrations.AddField( + model_name='article', + name='duration', + field=models.DurationField(blank=True, null=True), + ), + migrations.AddField( + model_name='facture', + name='valid', + field=models.BooleanField(default=True), + ), + migrations.AddField( + model_name='cotisation', + name='facture', + field=models.ForeignKey(to='cotisations.Facture', on_delete=django.db.models.deletion.PROTECT), + ), + migrations.AddField( + model_name='cotisation', + name='user', + field=models.ForeignKey(to='users.User', on_delete=django.db.models.deletion.PROTECT), + ), + ] diff --git a/cotisations/migrations/0009_remove_cotisation_user.py b/cotisations/migrations/0009_remove_cotisation_user.py new file mode 100644 index 00000000..4dc65e9a --- /dev/null +++ b/cotisations/migrations/0009_remove_cotisation_user.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cotisations', '0008_auto_20160702_1614'), + ] + + operations = [ + migrations.RemoveField( + model_name='cotisation', + name='user', + ), + ] diff --git a/cotisations/migrations/__pycache__/0008_auto_20160702_1614.cpython-34.pyc b/cotisations/migrations/__pycache__/0008_auto_20160702_1614.cpython-34.pyc new file mode 100644 index 00000000..eeebbd86 Binary files /dev/null and b/cotisations/migrations/__pycache__/0008_auto_20160702_1614.cpython-34.pyc differ diff --git a/cotisations/migrations/__pycache__/0009_remove_cotisation_user.cpython-34.pyc b/cotisations/migrations/__pycache__/0009_remove_cotisation_user.cpython-34.pyc new file mode 100644 index 00000000..5b4d4487 Binary files /dev/null and b/cotisations/migrations/__pycache__/0009_remove_cotisation_user.cpython-34.pyc differ diff --git a/cotisations/models.py b/cotisations/models.py index 206bdb1a..195a70c8 100644 --- a/cotisations/models.py +++ b/cotisations/models.py @@ -13,13 +13,16 @@ class Facture(models.Model): date = models.DateTimeField(auto_now_add=True) name = models.CharField(max_length=255) prix = models.DecimalField(max_digits=5, decimal_places=2) + valid = models.BooleanField(default=True) def __str__(self): - return str(self.name) + return str(self.name) + ' ' + str(self.date) + ' ' + str(self.user) class Article(models.Model): name = models.CharField(max_length=255) prix = models.DecimalField(max_digits=5, decimal_places=2) + cotisation = models.BooleanField() + duration = models.DurationField(blank=True, null=True) def __str__(self): return self.name @@ -36,6 +39,14 @@ class Paiement(models.Model): def __str__(self): return self.moyen +class Cotisation(models.Model): + facture = models.ForeignKey('Facture', on_delete=models.PROTECT) + date_start = models.DateTimeField(auto_now_add=True) + date_end = models.DateTimeField() + + def __str__(self): + return str(self.facture) + class NewFactureForm(ModelForm): article = forms.ModelMultipleChoiceField(queryset=Article.objects.all(), label="Article")