entrouvert
/
calebasse
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

agenda: show an error when end of reccurence is before last billed act 

Fixes #2929
This commit is contained in:
Jérôme Schneider 2013-08-07 19:23:01 +02:00
parent c8ba1faace
commit c48dcd4cb8
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
calebasse/agenda/forms.py
View File

@ -92,16 +92,15 @@ class NewAppointmentForm(BaseForm):
class UpdatePeriodicAppointmentForm(NewAppointmentForm):
def is_valid(self):
def clean(self):
cleaned_data = super(UpdatePeriodicAppointmentForm, self).clean()
acts = self.instance.act_set.filter(is_billed=True).order_by('-date')
if acts and self.data.get('recurrence_end_date'):
recurrence_end_date = datetime.strptime(self.data['recurrence_end_date'],
'%d/%m/%Y').date()
if acts and cleaned_data.get('recurrence_end_date'):
recurrence_end_date = cleaned_data['recurrence_end_date']
if recurrence_end_date < acts[0].date:
self.errors['recurrence_end_date'] = \
u"La date doit être supérieur au dernier acte de la récurrence facturée"
return False
return super(UpdatePeriodicAppointmentForm, self).is_valid()
self._errors['recurrence_end_date'] = self.error_class([
u"La date doit être supérieur au dernier acte facturé de la récurrence"])
return cleaned_data
class DisablePatientAppointmentForm(NewAppointmentForm):