Merge branch 'master' of github.com:spiral-project/ihatemoney

1 files changed, 10 insertions, 2 deletions

diff --git a/budget/forms.py b/budget/forms.py
index 36bde64..f5c3fb5 100644
--- a/budget/forms.py
+++ b/budget/forms.py
@@ -45,6 +45,12 @@ def get_billform_for(project, set_default=True, **kwargs):
         form.set_default()
     return form
 
+class CommaDecimalField(DecimalField):
+    """A class to deal with comma in Decimal Field"""
+    def process_formdata(self, value):
+        if value:
+            value[0] = str(value[0]).replace(',', '.')
+        return super(CommaDecimalField, self).process_formdata(value)
 
 
 class EditProjectForm(Form):
@@ -101,7 +107,7 @@ class BillForm(Form):
     date = DateField(_("Date"), validators=[Required()], default=datetime.now)
     what = TextField(_("What?"), validators=[Required()])
     payer = SelectField(_("Payer"), validators=[Required()], coerce=int)
-    amount = DecimalField(_("Amount paid"), validators=[Required()])
+    amount = CommaDecimalField(_("Amount paid"), validators=[Required()])
     payed_for = SelectMultipleField(_("For whom?"), 
             validators=[Required()], widget=select_multi_checkbox, coerce=int)
     submit = SubmitField(_("Send the bill"))
@@ -128,7 +134,9 @@ class BillForm(Form):
 
     def validate_amount(self, field):
         if field.data < 0:
-            raise ValidationError(_("Bills can't be negative"))
+            field.data = abs(field.data)
+        elif field.data == 0:
+            raise ValidationError(_("Bills can't be null"))
 
 
 class MemberForm(Form):