First import script

1 files changed, 8 insertions, 1 deletions

diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py
index 4224adccb..00bfb3bfb 100644
--- a/ishtar/ishtar_base/models.py
+++ b/ishtar/ishtar_base/models.py
@@ -1395,6 +1395,12 @@ class Operation(BaseHistorizedItem, OwnPerms):
         return JOINT.join(items)
 
     @classmethod
+    def get_available_operation_code(cls, year):
+        max_val = cls.objects.filter(year=year).aggregate(
+                            Max('operation_code'))["operation_code__max"]
+        return (max_val + 1) if max_val else 1
+
+    @classmethod
     def get_years(cls):
         return [res['year'] for res in list(cls.objects.values('year').annotate(
                                              Count("id")).order_by())]
@@ -1956,7 +1962,8 @@ related_name='+', verbose_name=_(u"Person in charge of the scientific part"))
                 related_name='administrative_act', verbose_name=_(u"Operation"))
     associated_file = models.ForeignKey(File, blank=True, null=True,
        related_name='administrative_act', verbose_name=_(u"Archaelogical file"))
-    signature_date = models.DateField(_(u"Signature date"))
+    signature_date = models.DateField(_(u"Signature date"), blank=True,
+                                      null=True)
     act_object = models.CharField(_(u"Object"), max_length=200)
     if settings.COUNTRY == 'fr':
         ref_sra = models.CharField(u"Référence SRA", max_length=15)