Merge branch 'develop'

1 files changed, 29 insertions, 11 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 4942d9f05..3103990c9 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -479,11 +479,12 @@ class OperationSelect(TableSelect):
             'archaeological-operations', 'operation'))
     year = forms.IntegerField(label=_("Year"))
     operation_code = forms.IntegerField(label=_(u"Numeric reference"))
-    if settings.COUNTRY == 'fr':
-        code_patriarche = forms.CharField(
+    code_patriarche = forms.CharField(
             max_length=500,
             widget=OAWidget,
             label="Code PATRIARCHE")
+    drassm_code = forms.CharField(
+        label=_(u"DRASSM code"), required=False, max_length=100)
     towns = get_town_field()
     parcel = forms.CharField(label=_(u"Parcel"))
     if settings.ISHTAR_DPTS:
@@ -577,13 +578,16 @@ class OperationSelect(TableSelect):
 
     def __init__(self, *args, **kwargs):
         super(OperationSelect, self).__init__(*args, **kwargs)
-        if not get_current_profile().warehouse:
+        profile = get_current_profile()
+        if not profile.warehouse:
             self.fields.pop('documentation_deadline_before')
             self.fields.pop('documentation_deadline_after')
             self.fields.pop('documentation_received')
             self.fields.pop('finds_deadline_before')
             self.fields.pop('finds_deadline_after')
             self.fields.pop('finds_received')
+        if not profile.underwater:
+            self.fields.pop('drassm_code')
         if settings.ISHTAR_DPTS:
             k = 'towns__numero_insee__startswith'
             self.fields[k].choices = [
@@ -749,11 +753,12 @@ class OperationFormGeneral(CustomForm, ManageOldType):
         'report_processing': models.ReportState
     }
     pk = forms.IntegerField(required=False, widget=forms.HiddenInput)
-    if settings.COUNTRY == 'fr':
-        code_patriarche = forms.CharField(label=u"Code PATRIARCHE",
-                                          max_length=500,
-                                          widget=OAWidget,
-                                          required=False)
+    code_patriarche = forms.CharField(label=u"Code PATRIARCHE",
+                                      max_length=500,
+                                      widget=OAWidget,
+                                      required=False)
+    drassm_code = forms.CharField(
+        label=_(u"DRASSM code"), required=False, max_length=100)
     operation_type = forms.ChoiceField(label=_(u"Operation type"),
                                        choices=[])
     common_name = forms.CharField(label=_(u"Generic name"), required=False,
@@ -873,9 +878,11 @@ class OperationFormGeneral(CustomForm, ManageOldType):
         if not profile.files:
             for key in self.FILE_FIELDS:
                 self.remove_field(key)
-            if not profile.warehouse:
-                for key in self.WAREHOUSE_FIELDS:
-                    self.remove_field(key)
+        if not profile.warehouse:
+            for key in self.WAREHOUSE_FIELDS:
+                self.remove_field(key)
+        if not profile.underwater:
+            self.fields.pop('drassm_code')
 
     def clean(self):
         cleaned_data = self.cleaned_data
@@ -1262,6 +1269,11 @@ class SiteSelect(TableSelect):
     locality_cadastral = forms.CharField(
         label=_(u"Cadastral locality"), max_length=200,
         required=False)
+
+    affmar_number = forms.CharField(
+        label=_(u"AffMar number"), required=False, max_length=100)
+    drassm_number = forms.CharField(
+        label=_(u"DRASSM number"), required=False, max_length=100)
     shipwreck_name = forms.CharField(
         label=_(u"Shipwreck name"), max_length=200,
         required=False)
@@ -1288,6 +1300,8 @@ class SiteSelect(TableSelect):
             self.fields.pop('shipwreck_code')
             self.fields.pop('sinking_date')
             self.fields.pop('discovery_area')
+            self.fields.pop('affmar_number')
+            self.fields.pop('drassm_number')
 
 
 class SiteFormSelection(IshtarForm):
@@ -1378,6 +1392,10 @@ class SiteUnderwaterForm(CustomForm, ManageOldType):
     form_admin_name = _(u"Archaeological site - 030 - Underwater")
     form_slug = u"archaeological_site-030-underwater"
 
+    affmar_number = forms.CharField(
+        label=_(u"AffMar number"), required=False, max_length=100)
+    drassm_number = forms.CharField(
+        label=_(u"DRASSM number"), required=False, max_length=100)
     shipwreck_name = forms.CharField(
         label=_(u"Shipwreck name"), required=False)
     shipwreck_code = forms.CharField(