diff options
| -rw-r--r-- | ishtar/ishtar_base/forms_files.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/ishtar/ishtar_base/forms_files.py b/ishtar/ishtar_base/forms_files.py index 8fd9df926..c4c460cee 100644 --- a/ishtar/ishtar_base/forms_files.py +++ b/ishtar/ishtar_base/forms_files.py @@ -79,9 +79,10 @@ class FileWizard(Wizard): def get_extra_model(self, dct, request, storage, form_list): dct = super(FileWizard, self).get_extra_model(dct, request, storage, form_list) - current_ref = models.File.objects.filter(year=dct['year'] + if not dct['numeric_reference']: + current_ref = models.File.objects.filter(year=dct['year'] ).aggregate(Max('numeric_reference'))["numeric_reference__max"] - dct['numeric_reference'] = current_ref and current_ref + 1 or 1 + dct['numeric_reference'] = current_ref and current_ref + 1 or 1 return dct def done(self, request, storage, form_list, **kwargs): @@ -172,7 +173,8 @@ class FileFormGeneral(forms.Form): numeric_reference = forms.IntegerField(label=_("Numeric reference"), widget=forms.HiddenInput, required=False) internal_reference = forms.CharField(label=_(u"Internal reference"), -max_length=60, validators=[models.is_unique(models.File, 'internal_reference')]) + max_length=60, + validators=[models.is_unique(models.File, 'internal_reference')]) creation_date = forms.DateField(label=_(u"Creation date"), initial=get_now, widget=widgets.JQueryDate) file_type = forms.ChoiceField(label=_("File type"), @@ -185,15 +187,15 @@ max_length=60, validators=[models.is_unique(models.File, 'internal_reference')]) required=False) class FileFormGeneralRO(FileFormGeneral): - year = forms.IntegerField(label=_("Year"), + year = forms.IntegerField(label=_(u"Year"), widget=forms.TextInput(attrs={'readonly':True})) - numeric_reference = forms.IntegerField(label=_("Numeric reference"), + numeric_reference = forms.IntegerField(label=_(u"Numeric reference"), widget=forms.TextInput(attrs={'readonly':True})) internal_reference = forms.CharField(label=_(u"Internal reference"), widget=forms.TextInput(attrs={'readonly':True},)) class FileFormAddress(forms.Form): - form_label = _("Address") + form_label = _(u"Address") associated_models = {'town':models.Town} total_surface = forms.IntegerField(required=False, widget=widgets.AreaWidget, @@ -207,7 +209,7 @@ class FileFormAddress(forms.Form): max_length=10) class FileFormPreventive(forms.Form): - form_label = _("Preventive informations") + form_label = _(u"Preventive informations") associated_models = {'general_contractor':models.Person, 'saisine_type':models.SaisineType, 'permit_type':models.PermitType, @@ -225,7 +227,7 @@ class FileFormPreventive(forms.Form): args=[models.OrganizationType.objects.get(txt_idx='planning_service').pk]), associated_model=models.Organization, new=True), validators=[models.valid_id(models.Organization)]) - permit_type = forms.ChoiceField(label=_("Permit type"), required=False, + permit_type = forms.ChoiceField(label=_(u"Permit type"), required=False, choices=models.PermitType.get_types()) permit_reference = forms.CharField(label=_(u"Permit reference"), required=False, validators=[validators.MaxLengthValidator(60)]) |