diff --git a/apps/activity/fixtures/initial.json b/apps/activity/fixtures/initial.json index 63c5009..2ebec84 100644 --- a/apps/activity/fixtures/initial.json +++ b/apps/activity/fixtures/initial.json @@ -1,32 +1 @@ -[ - { - "model": "activity.activitytype", - "pk": 1, - "fields": { - "name": "Pot", - "manage_entries": true, - "can_invite": true, - "guest_entry_fee": 500 - } - }, - { - "model": "activity.activitytype", - "pk": 2, - "fields": { - "name": "Soir\u00e9e de club", - "manage_entries": false, - "can_invite": false, - "guest_entry_fee": 0 - } - }, - { - "model": "activity.activitytype", - "pk": 3, - "fields": { - "name": "Autre", - "manage_entries": false, - "can_invite": false, - "guest_entry_fee": 0 - } - } -] +[{"model": "activity.activitytype", "pk": 4, "fields": {"name": "Activit\u00e9 gratuite ouverte", "manage_entries": false, "can_invite": true, "guest_entry_fee": 0}}, {"model": "activity.activitytype", "pk": 5, "fields": {"name": "Soir\u00e9e", "manage_entries": true, "can_invite": false, "guest_entry_fee": 500}}] \ No newline at end of file diff --git a/apps/activity/tests/test_activities.py b/apps/activity/tests/test_activities.py index 1fcc776..456cd55 100644 --- a/apps/activity/tests/test_activities.py +++ b/apps/activity/tests/test_activities.py @@ -36,7 +36,7 @@ class TestActivities(TestCase): name="Activity", description="This is a test activity\non two very very long lines\nbecause this is very important.", location="Earth", - activity_type=ActivityType.objects.get(name="Pot"), + activity_type=ActivityType.objects.get(name="Activit\u00e9 gratuite ouverte"), creater=self.user, organizer=Club.objects.get(name="Kfet"), attendees_club=Club.objects.get(name="Kfet"), @@ -70,7 +70,7 @@ class TestActivities(TestCase): name="Activity created", description="This activity was successfully created.", location="Earth", - activity_type=ActivityType.objects.get(name="Soirée de club").id, + activity_type=ActivityType.objects.get(name="Soir\u00e9e").id, creater=self.user.id, organizer=Club.objects.get(name="Kfet").id, attendees_club=Club.objects.get(name="Kfet").id, @@ -100,7 +100,7 @@ class TestActivities(TestCase): name=str(self.activity) + " updated", description="This activity was successfully updated.", location="Earth", - activity_type=ActivityType.objects.get(name="Autre").id, + activity_type=ActivityType.objects.get(name="Soir\u00e9e").id, creater=self.user.id, organizer=Club.objects.get(name="Kfet").id, attendees_club=Club.objects.get(name="Kfet").id, @@ -186,7 +186,7 @@ class TestActivityAPI(TestAPI): name="Activity", description="This is a test activity\non two very very long lines\nbecause this is very important.", location="Earth", - activity_type=ActivityType.objects.get(name="Pot"), + activity_type=ActivityType.objects.get(name="Activit\u00e9 gratuite ouverte"), creater=self.user, organizer=Club.objects.get(name="Kfet"), attendees_club=Club.objects.get(name="Kfet"), diff --git a/apps/note/fixtures/initial.json b/apps/note/fixtures/initial.json new file mode 100644 index 0000000..56be0fa --- /dev/null +++ b/apps/note/fixtures/initial.json @@ -0,0 +1,57 @@ +[ + { + "model": "note.templatecategory", + "pk": 1, + "fields": { + "name": "Soft" + } + }, + { + "model": "note.templatecategory", + "pk": 2, + "fields": { + "name": "Alcool" + } + }, + { + "model": "note.templatecategory", + "pk": 3, + "fields": { + "name": "Nourriture" + } + }, + { + "model": "note.templatecategory", + "pk": 4, + "fields": { + "name": "Clubs" + } + }, + { + "model": "note.templatecategory", + "pk": 5, + "fields": { + "name": "Goodies" + } + }, + { + "model": "note.templatecategory", + "pk": 6, + "fields": { + "name": "Autre" + } + }, + { + "model": "note.transactiontemplate", + "pk": 1, + "fields": { + "name": "Test Button", + "destination": 5, + "amount": 1, + "category": 6, + "display": false, + "highlighted": false, + "description": "Test button" + } + } +] \ No newline at end of file diff --git a/apps/note/models/notes.py b/apps/note/models/notes.py index 6db9e5f..2889ab4 100644 --- a/apps/note/models/notes.py +++ b/apps/note/models/notes.py @@ -219,7 +219,7 @@ class NoteSpecial(Note): class Trust(models.Model): """ - A one-sided trust relationship bertween two users + A one-sided trust relationship between two users If another user considers you as your friend, you can transfer money from them diff --git a/apps/treasury/migrations/0001_initial.py b/apps/treasury/migrations/0001_initial.py index 0231d29..47b0dfa 100644 --- a/apps/treasury/migrations/0001_initial.py +++ b/apps/treasury/migrations/0001_initial.py @@ -1,7 +1,7 @@ -# Generated by Django 2.2.16 on 2020-09-04 21:41 +# Generated by Django 2.2.28 on 2022-08-06 13:33 import datetime -from django.conf import settings +import django.core.validators from django.db import migrations, models import django.db.models.deletion import django.utils.timezone @@ -12,8 +12,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('note', '0001_initial'), + ('note', '0006_trust'), ] operations = [ @@ -21,7 +20,7 @@ class Migration(migrations.Migration): name='Invoice', fields=[ ('id', models.PositiveIntegerField(primary_key=True, serialize=False, verbose_name='Invoice identifier')), - ('bde', models.CharField(choices=[('Saperlistpopette.png', 'Saper[list]popette'), ('Finalist.png', 'Fina[list]'), ('Listorique.png', '[List]orique'), ('Satellist.png', 'Satel[list]'), ('Monopolist.png', 'Monopo[list]'), ('Kataclist.png', 'Katac[list]')], default='Saperlistpopette.png', max_length=32, verbose_name='BDE')), + ('bde', models.CharField(choices=[('BDE', 'BDE')], default='BDE', max_length=32, verbose_name='BDE')), ('object', models.CharField(max_length=255, verbose_name='Object')), ('description', models.TextField(verbose_name='Description')), ('name', models.CharField(max_length=255, verbose_name='Name')), @@ -53,7 +52,7 @@ class Migration(migrations.Migration): name='SpecialTransactionProxy', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('remittance', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='treasury.Remittance', verbose_name='Remittance')), + ('remittance', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='transaction_proxies', to='treasury.Remittance', verbose_name='Remittance')), ('transaction', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='note.SpecialTransaction')), ], options={ @@ -61,19 +60,6 @@ class Migration(migrations.Migration): 'verbose_name_plural': 'special transaction proxies', }, ), - migrations.CreateModel( - name='SogeCredit', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('credit_transaction', models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, to='note.SpecialTransaction', verbose_name='credit transaction')), - ('transactions', models.ManyToManyField(related_name='_sogecredit_transactions_+', to='note.MembershipTransaction', verbose_name='membership transactions')), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='user')), - ], - options={ - 'verbose_name': 'Credit from the Société générale', - 'verbose_name_plural': 'Credits from the Société générale', - }, - ), migrations.CreateModel( name='RemittanceType', fields=[ @@ -95,7 +81,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('designation', models.CharField(max_length=255, verbose_name='Designation')), - ('quantity', models.PositiveIntegerField(verbose_name='Quantity')), + ('quantity', models.DecimalField(decimal_places=2, max_digits=7, validators=[django.core.validators.MinValueValidator(0)], verbose_name='Quantity')), ('amount', models.IntegerField(verbose_name='Unit price')), ('invoice', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='products', to='treasury.Invoice', verbose_name='invoice')), ], diff --git a/apps/treasury/migrations/0002_invoice_remove_png_extension.py b/apps/treasury/migrations/0002_invoice_remove_png_extension.py deleted file mode 100644 index e908d69..0000000 --- a/apps/treasury/migrations/0002_invoice_remove_png_extension.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.16 on 2020-09-06 13:43 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('treasury', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='invoice', - name='bde', - field=models.CharField(choices=[('Saperlistpopette', 'Saper[list]popette'), ('Finalist', 'Fina[list]'), ('Listorique', '[List]orique'), ('Satellist', 'Satel[list]'), ('Monopolist', 'Monopo[list]'), ('Kataclist', 'Katac[list]')], default='Saperlistpopette', max_length=32, verbose_name='BDE'), - ), - ] diff --git a/apps/treasury/migrations/0003_auto_20210321_1034.py b/apps/treasury/migrations/0003_auto_20210321_1034.py deleted file mode 100644 index 2c36122..0000000 --- a/apps/treasury/migrations/0003_auto_20210321_1034.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 2.2.19 on 2021-03-21 09:34 - -import django.core.validators -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('treasury', '0002_invoice_remove_png_extension'), - ] - - operations = [ - migrations.AlterField( - model_name='product', - name='quantity', - field=models.DecimalField(decimal_places=2, max_digits=7, validators=[django.core.validators.MinValueValidator(0)], verbose_name='Quantity'), - ), - migrations.AlterField( - model_name='specialtransactionproxy', - name='remittance', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='transaction_proxies', to='treasury.Remittance', verbose_name='Remittance'), - ), - ] diff --git a/apps/treasury/migrations/0004_auto_20211005_1544.py b/apps/treasury/migrations/0004_auto_20211005_1544.py deleted file mode 100644 index 6016a47..0000000 --- a/apps/treasury/migrations/0004_auto_20211005_1544.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.24 on 2021-10-05 13:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('treasury', '0003_auto_20210321_1034'), - ] - - operations = [ - migrations.AlterField( - model_name='sogecredit', - name='transactions', - field=models.ManyToManyField(blank=True, related_name='_sogecredit_transactions_+', to='note.MembershipTransaction', verbose_name='membership transactions'), - ), - ] diff --git a/apps/treasury/migrations/0005_delete_sogecredit.py b/apps/treasury/migrations/0005_delete_sogecredit.py deleted file mode 100644 index 3989e41..0000000 --- a/apps/treasury/migrations/0005_delete_sogecredit.py +++ /dev/null @@ -1,16 +0,0 @@ -# Generated by Django 2.2.28 on 2022-07-31 11:45 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('treasury', '0004_auto_20211005_1544'), - ] - - operations = [ - migrations.DeleteModel( - name='SogeCredit', - ), - ] diff --git a/apps/treasury/models.py b/apps/treasury/models.py index 4f8c9d5..8bab512 100644 --- a/apps/treasury/models.py +++ b/apps/treasury/models.py @@ -28,14 +28,9 @@ class Invoice(models.Model): bde = models.CharField( max_length=32, - default='Saperlistpopette', + default='BDE', choices=( - ('Saperlistpopette', 'Saper[list]popette'), - ('Finalist', 'Fina[list]'), - ('Listorique', '[List]orique'), - ('Satellist', 'Satel[list]'), - ('Monopolist', 'Monopo[list]'), - ('Kataclist', 'Katac[list]'), + ('BDE', 'BDE'), ), verbose_name=_("BDE"), ) diff --git a/apps/treasury/static/img/Finalist.png b/apps/treasury/static/img/Finalist.png deleted file mode 100644 index 1a3c41f..0000000 Binary files a/apps/treasury/static/img/Finalist.png and /dev/null differ diff --git a/apps/treasury/static/img/Finalist_bg.jpg b/apps/treasury/static/img/Finalist_bg.jpg deleted file mode 100644 index 8f1fe6c..0000000 Binary files a/apps/treasury/static/img/Finalist_bg.jpg and /dev/null differ diff --git a/apps/treasury/static/img/Kataclist.png b/apps/treasury/static/img/Kataclist.png deleted file mode 100644 index 97fc411..0000000 Binary files a/apps/treasury/static/img/Kataclist.png and /dev/null differ diff --git a/apps/treasury/static/img/Kataclist_bg.jpg b/apps/treasury/static/img/Kataclist_bg.jpg deleted file mode 100644 index fa3888f..0000000 Binary files a/apps/treasury/static/img/Kataclist_bg.jpg and /dev/null differ diff --git a/apps/treasury/static/img/Listorique.png b/apps/treasury/static/img/Listorique.png deleted file mode 100644 index c515832..0000000 Binary files a/apps/treasury/static/img/Listorique.png and /dev/null differ diff --git a/apps/treasury/static/img/Listorique_bg.jpg b/apps/treasury/static/img/Listorique_bg.jpg deleted file mode 100644 index 6400da2..0000000 Binary files a/apps/treasury/static/img/Listorique_bg.jpg and /dev/null differ diff --git a/apps/treasury/static/img/Monopolist.png b/apps/treasury/static/img/Monopolist.png deleted file mode 100644 index 2685b21..0000000 Binary files a/apps/treasury/static/img/Monopolist.png and /dev/null differ diff --git a/apps/treasury/static/img/Monopolist_bg.jpg b/apps/treasury/static/img/Monopolist_bg.jpg deleted file mode 100644 index 0938080..0000000 Binary files a/apps/treasury/static/img/Monopolist_bg.jpg and /dev/null differ diff --git a/apps/treasury/static/img/Saperlistpopette.png b/apps/treasury/static/img/Saperlistpopette.png deleted file mode 100644 index 4b351fb..0000000 Binary files a/apps/treasury/static/img/Saperlistpopette.png and /dev/null differ diff --git a/apps/treasury/static/img/Saperlistpopette_bg.jpg b/apps/treasury/static/img/Saperlistpopette_bg.jpg deleted file mode 100644 index b88884a..0000000 Binary files a/apps/treasury/static/img/Saperlistpopette_bg.jpg and /dev/null differ diff --git a/apps/treasury/static/img/Satellist.png b/apps/treasury/static/img/bde.png similarity index 100% rename from apps/treasury/static/img/Satellist.png rename to apps/treasury/static/img/bde.png diff --git a/apps/treasury/static/img/Satellist_bg.jpg b/apps/treasury/static/img/bde_bg.jpg similarity index 100% rename from apps/treasury/static/img/Satellist_bg.jpg rename to apps/treasury/static/img/bde_bg.jpg