From f033add0db879015d92067f14007ce2cfc6556fb Mon Sep 17 00:00:00 2001
From: Hugo LEVY-FALK <hugo.levy--falk@supelec.fr>
Date: Sun, 28 Jan 2018 09:23:28 +0100
Subject: [PATCH] Fix erreur de rebase

---
 preferences/forms.py  | 1 -
 preferences/models.py | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/preferences/forms.py b/preferences/forms.py
index 6d6414c3..fc214f52 100644
--- a/preferences/forms.py
+++ b/preferences/forms.py
@@ -51,7 +51,6 @@ class EditOptionalUserForm(ModelForm):
         self.fields['max_solde'].label = 'Solde maximum'
         self.fields['min_online_payment'].label = 'Montant de rechargement minimum en ligne'
         self.fields['self_adhesion'].label = 'Auto inscription'
-        self.fields['max_recharge'].label = 'Rechargement max'
 
 
 class EditOptionalMachineForm(ModelForm):
diff --git a/preferences/models.py b/preferences/models.py
index 4d2a29dd..d4ef9645 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -52,10 +52,6 @@ class OptionalUser(models.Model):
         max_digits=5,
         decimal_places=2,
         default=10
-    max_recharge = models.DecimalField(
-        max_digits=5,
-        decimal_places=2,
-        default=50
     )
     gpg_fingerprint = models.BooleanField(default=True)
     all_can_create = models.BooleanField(