mirror of
https://github.com/nanoy42/coope
synced 2024-08-19 00:13:39 +00:00
Fix divide issues
This commit is contained in:
parent
2f4844b7a1
commit
325ceada7d
5 changed files with 60 additions and 6 deletions
|
@ -994,14 +994,14 @@ def divide(request):
|
||||||
cotisation_history.save()
|
cotisation_history.save()
|
||||||
divide_history = DivideHistory(
|
divide_history = DivideHistory(
|
||||||
total_cotisations = non_divided_cotisations.count(),
|
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
|
coopeman = request.user
|
||||||
)
|
)
|
||||||
divide_history.save()
|
divide_history.save()
|
||||||
non_divided_cotisations = CotisationHistory.objects.filter(divided=False)
|
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')
|
divide_histories = DivideHistory.objects.all().order_by('-date')
|
||||||
return render(
|
return render(
|
||||||
request,
|
request,
|
||||||
|
|
27
preferences/migrations/0018_auto_20190627_2302.py
Normal file
27
preferences/migrations/0018_auto_20190627_2302.py
Normal file
|
@ -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'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -129,7 +129,7 @@ class Cotisation(models.Model):
|
||||||
"""
|
"""
|
||||||
Duration (in days) of the cotisation
|
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
|
Amount of money given to the PTM club
|
||||||
"""
|
"""
|
||||||
|
@ -178,6 +178,10 @@ class PriceProfile(models.Model):
|
||||||
"""
|
"""
|
||||||
Stores parameters to compute price
|
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")
|
name = models.CharField(max_length=255, verbose_name="Nom")
|
||||||
a = models.DecimalField(verbose_name="Marge constante", max_digits=3, decimal_places=2)
|
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)
|
b = models.DecimalField(verbose_name="Marge variable", max_digits=3, decimal_places=2)
|
||||||
|
|
23
users/migrations/0011_auto_20190627_2302.py
Normal file
23
users/migrations/0011_auto_20190627_2302.py
Normal file
|
@ -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'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -65,7 +65,7 @@ class CotisationHistory(models.Model):
|
||||||
"""
|
"""
|
||||||
True if money of cotisation have been divided between CTM and PTM
|
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
|
Amount of money given to the PTM club
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in a new issue