Merge pull request #4 from nanoy42/master

Fix-3.6.1

CHANGELOG.md

@@ -1,3 +1,5 @@
+## v3.6.1
+* Valeur par défaut des répartitions et calcul des répartitions
 ## v3.6.0
 * AJout d'un débit direct comme champ du profil
 * Suppression des codes bare

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Yoann `Nanoy` Pietri
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

django_tex/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Martin Bierbaum
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

gestion/views.py

@@ -994,14 +994,14 @@ def divide(request):
             cotisation_history.save()
         divide_history = DivideHistory(
             total_cotisations = non_divided_cotisations.count(),
-            total_cotisations_amount = sum([x.amount for x in non_divided_cotisations]),
+            total_cotisations_amount = sum([x.amount or 0 for x in non_divided_cotisations]),
-            total_ptm_amount = sum([x.amount_ptm for x in non_divided_cotisations]),
+            total_ptm_amount = sum([x.amount_ptm or 0 for x in non_divided_cotisations]),
             coopeman = request.user
         )
         divide_history.save()
     non_divided_cotisations = CotisationHistory.objects.filter(divided=False)
-    total_amount = sum([x.amount for x in non_divided_cotisations])
+    total_amount = sum([x.amount or 0 for x in non_divided_cotisations])
-    total_amount_ptm = sum([x.amount_ptm for x in non_divided_cotisations])
+    total_amount_ptm = sum([x.amount_ptm or 0 for x in non_divided_cotisations])
     divide_histories = DivideHistory.objects.all().order_by('-date')
     return render(
         request, 

preferences/migrations/0018_auto_20190627_2302.py

@@ -0,0 +1,27 @@
+# Generated by Django 2.1 on 2019-06-27 21:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0017_auto_20190623_1453'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='priceprofile',
+            options={'verbose_name': 'Profil de prix', 'verbose_name_plural': 'Profils de prix'},
+        ),
+        migrations.AlterField(
+            model_name='cotisation',
+            name='amount_ptm',
+            field=models.DecimalField(decimal_places=2, default=0, max_digits=5, null=True, verbose_name='Montant pour le club Phœnix Technopôle Metz'),
+        ),
+        migrations.AlterField(
+            model_name='historicalcotisation',
+            name='amount_ptm',
+            field=models.DecimalField(decimal_places=2, default=0, max_digits=5, null=True, verbose_name='Montant pour le club Phœnix Technopôle Metz'),
+        ),
+    ]

preferences/models.py

@@ -129,7 +129,7 @@ class Cotisation(models.Model):
     """
     Duration (in days) of the cotisation
     """
-    amount_ptm = models.DecimalField(max_digits=5, decimal_places=2, null=True, verbose_name="Montant pour le club Phœnix Technopôle Metz")
+    amount_ptm = models.DecimalField(max_digits=5, decimal_places=2, null=True, verbose_name="Montant pour le club Phœnix Technopôle Metz", default=0)
     """
     Amount of money given to the PTM club
     """
@@ -178,6 +178,10 @@ class PriceProfile(models.Model):
     """
     Stores parameters to compute price
     """
+    class Meta:
+        verbose_name = "Profil de prix"
+        verbose_name_plural = "Profils de prix"
+        
     name = models.CharField(max_length=255, verbose_name="Nom")
     a = models.DecimalField(verbose_name="Marge constante", max_digits=3, decimal_places=2)
     b = models.DecimalField(verbose_name="Marge variable", max_digits=3, decimal_places=2)

templates/footer.html

@@ -42,6 +42,6 @@
 		<li><a href="https://www.facebook.com/coopesmetz/" class="icon fa-facebook alt"><span class="label">Facebook</span></a></li>
 	</ul>
 </section>
-<p class="copyright">coope.rez v3.6.0 (release stable) &copy; 2018-2019 Yoann Pietri.</p>
+<p class="copyright">coope.rez v3.6.1 (release stable) &copy; 2018-2019 Yoann Pietri.</p>
 
 

users/migrations/0011_auto_20190627_2302.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.1 on 2019-06-27 21:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0010_auto_20190623_1656'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='cotisationhistory',
+            name='amount_ptm',
+            field=models.DecimalField(decimal_places=2, default=0, max_digits=5, null=True, verbose_name='Montant pour le club Phœnix Technopôle Metz'),
+        ),
+        migrations.AlterField(
+            model_name='historicalcotisationhistory',
+            name='amount_ptm',
+            field=models.DecimalField(decimal_places=2, default=0, max_digits=5, null=True, verbose_name='Montant pour le club Phœnix Technopôle Metz'),
+        ),
+    ]

users/models.py

@@ -65,7 +65,7 @@ class CotisationHistory(models.Model):
     """
     True if money of cotisation have been divided between CTM and PTM
     """
-    amount_ptm = models.DecimalField(max_digits=5, decimal_places=2, null=True, verbose_name="Montant pour le club Phœnix Technopôle Metz")
+    amount_ptm = models.DecimalField(max_digits=5, decimal_places=2, null=True, verbose_name="Montant pour le club Phœnix Technopôle Metz", default=0)
     """
     Amount of money given to the PTM club
     """