rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-16 08:23:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'refill_balance' into 'dev'

Browse source 
[cotisations] Replace Float by Decimal everywhere

See merge request federez/re2o!323
This commit is contained in:
klafyvel 2018-10-03 22:36:34 +02:00
commit 3db4f837a4
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cotisations/forms.py
View file

@ -233,7 +233,7 @@ class RechargeForm(FormRevMixin, Form):
""" """
Form used to refill a user's balance Form used to refill a user's balance
""" """
value = forms.FloatField( value = forms.DecimalField(
label=_("Amount"), label=_("Amount"),
min_value=0.01, min_value=0.01,
validators=[] validators=[]

2
cotisations/models.py
View file

@ -83,7 +83,7 @@ class BaseInvoice(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
).aggregate( ).aggregate(
total=models.Sum( total=models.Sum(
models.F('prix')*models.F('number'), models.F('prix')*models.F('number'),
output_field=models.FloatField() output_field=models.DecimalField()
) )
)['total'] or 0 )['total'] or 0

4
cotisations/payment_methods/balance/models.py
View file

@ -73,7 +73,7 @@ class BalancePayment(PaymentMethodMixin, models.Model):
""" """
user = invoice.user user = invoice.user
total_price = invoice.prix_total() total_price = invoice.prix_total()
if float(user.solde) - float(total_price) < self.minimum_balance: if user.solde - total_price < self.minimum_balance:
messages.error( messages.error(
request, request,
_("Your balance is too low for this operation.") _("Your balance is too low for this operation.")
@ -106,7 +106,7 @@ class BalancePayment(PaymentMethodMixin, models.Model):
balance. balance.
""" """
return ( return (
float(user.solde) - float(price) >= self.minimum_balance, user.solde - price >= self.minimum_balance,
_("Your balance is too low for this operation.") _("Your balance is too low for this operation.")
) )