diff options
Diffstat (limited to 'archaeological_operations/models.py')
| -rw-r--r-- | archaeological_operations/models.py | 17 | 
1 files changed, 8 insertions, 9 deletions
| diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 8601c602f..2ea29fcf5 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -590,15 +590,14 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter):              if q.count():                  c_index = q.all()[0].index + 1              self.index = c_index -        if self.act_type.indexed: -            conflict = AdministrativeAct.objects.filter(act_type__indexed=True, -                                                  signature_date__year=year, -                                                  index=self.index) -            if self.pk: -                conflict = conflict.exclude(pk=self.pk) -            if conflict.count(): -                raise ValidationError(_(u"This index already exists for " -                                        u"this year")) +        conflict = AdministrativeAct.objects.filter(act_type__indexed=True, +                                              signature_date__year=year, +                                              index=self.index) +        if self.pk: +            conflict = conflict.exclude(pk=self.pk) +        if conflict.count(): +            raise ValidationError(_(u"This index already exists for " +                                    u"this year"))          super(AdministrativeAct, self).save(*args, **kwargs)  class Parcel(LightHistorizedItem): | 
