diff options
| author | root <root@viserion.(none)> | 2013-07-16 12:20:04 +0000 |
|---|---|---|
| committer | root <root@viserion.(none)> | 2013-07-16 12:20:04 +0000 |
| commit | 2bcb0089c9136ce68f24b7ff94887563d86fb120 (patch) | |
| tree | 5c776c1da0f0d534315780b199faa7b4153071a8 | |
| parent | a8b37e700aba8f2d0009b440c23e8e8c1bd63be8 (diff) | |
| parent | ba614d2ed285c6aba0c2e8b7d68ea19659c16447 (diff) | |
| download | Ishtar-2bcb0089c9136ce68f24b7ff94887563d86fb120.tar.bz2 Ishtar-2bcb0089c9136ce68f24b7ff94887563d86fb120.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
| -rw-r--r-- | archaeological_operations/forms.py | 14 | ||||
| -rw-r--r-- | archaeological_operations/import_from_csv.py | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index e545ff5fa..c1003dfe9 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -114,10 +114,7 @@ class OperationSelect(TableSelect): common_name = forms.CharField(label=_(u"Name (full text search)"), max_length=30) if settings.COUNTRY == 'fr': - code_patriarche = forms.IntegerField( - widget=widgets.JQueryAutoComplete("/" + settings.URL_PATH + \ - 'autocomplete-patriarche/'), - label="Code PATRIARCHE") + code_patriarche = forms.IntegerField(label="Code PATRIARCHE") towns = get_town_field() operation_type = forms.ChoiceField(label=_(u"Operation type"), choices=[]) @@ -280,9 +277,14 @@ class OperationFormGeneral(forms.Form): if ops.count(): max_val = models.Operation.objects.filter(year=year).aggregate( Max('operation_code'))["operation_code__max"] - raise forms.ValidationError(_(u"Operation code already exist for " + msg = '' + if year and max_val: + msg = _(u"Operation code already exist for " u"year: %(year)d - use a value bigger than %(last_val)d") % { - 'year':year, 'last_val':max_val}) + 'year':year, 'last_val':max_val} + else: + msg = _(u"Bad operation code") + raise forms.ValidationError(msg) return self.cleaned_data class OperationFormPreventive(forms.Form): diff --git a/archaeological_operations/import_from_csv.py b/archaeological_operations/import_from_csv.py index 3f29bcb95..ff3bd11f4 100644 --- a/archaeological_operations/import_from_csv.py +++ b/archaeological_operations/import_from_csv.py @@ -415,7 +415,7 @@ def parse_ope_name(value): def parse_ha(value): value = parse_string(value) try: - value = float(value) + value = float(value) * 10000 except: value = None return value |