summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-09-24 23:37:56 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-09-24 23:37:56 +0200
commit91cd3c507ef99febf2562f383abc2387652cbd60 (patch)
treed4ede86c7e90716b2413edc33f9b0ba04ebf1043
parenta6465f50f2a479888e010fcf625d52e80c8e4531 (diff)
downloadIshtar-91cd3c507ef99febf2562f383abc2387652cbd60.tar.bz2
Ishtar-91cd3c507ef99febf2562f383abc2387652cbd60.zip
Manage man-days in operation forms (refs #632)
-rw-r--r--ishtar/ishtar_base/forms.py52
-rw-r--r--ishtar/ishtar_base/forms_operations.py6
-rw-r--r--ishtar/ishtar_base/models.py6
-rw-r--r--ishtar/locale/fr/LC_MESSAGES/django.po418
4 files changed, 241 insertions, 241 deletions
diff --git a/ishtar/ishtar_base/forms.py b/ishtar/ishtar_base/forms.py
index 01b1b9dfd..608e54739 100644
--- a/ishtar/ishtar_base/forms.py
+++ b/ishtar/ishtar_base/forms.py
@@ -108,9 +108,7 @@ class Wizard(NamedUrlSessionFormWizard):
modification = None # True when the wizard modify an item
def get_wizard_name(self):
- """
- As the class name can interfere when reused, use the url_name
- """
+ """As the class name can interfere when reused, use the url_name"""
return self.url_name
def get_template(self, request, storage):
@@ -122,9 +120,7 @@ class Wizard(NamedUrlSessionFormWizard):
return templates
def get_template_context(self, request, storage, form=None):
- """
- Add previous, next and current steps to manage the wizard path
- """
+ """Add previous, next and current steps to manage the wizard path"""
context = super(Wizard, self).get_template_context(request, storage,
form)
step = self.get_first_step(request, storage)
@@ -184,9 +180,7 @@ class Wizard(NamedUrlSessionFormWizard):
return context
def get_formated_datas(self, forms):
- """
- Get the data to present in the last page
- """
+ """Get the data to present in the last page"""
datas = []
for form in forms:
form_datas = []
@@ -255,9 +249,7 @@ class Wizard(NamedUrlSessionFormWizard):
return dct
def done(self, request, storage, form_list, return_object=False, **kwargs):
- """
- Save to the model
- """
+ """Save to the model"""
dct, m2m, whole_associated_models = {}, [], []
for form in form_list:
if not form.is_valid():
@@ -326,15 +318,11 @@ class Wizard(NamedUrlSessionFormWizard):
storage, form_list, return_object)
def get_saved_model(self):
- """
- Permit a distinguo when saved model is not the base selected model
- """
+ """Permit a distinguo when saved model is not the base selected model"""
return self.model
def get_current_saved_object(self, request, storage):
- """
- Permit a distinguo when saved model is not the base selected model
- """
+ """Permit a distinguo when saved model is not the base selected model"""
return self.get_current_object(request, storage)
def save_model(self, dct, m2m, whole_associated_models, request, storage,
@@ -439,9 +427,7 @@ class Wizard(NamedUrlSessionFormWizard):
return return_object and (obj, res) or res
def get_deleted(self, keys):
- """
- Get the deleted and non-deleted items in formsets
- """
+ """Get the deleted and non-deleted items in formsets"""
not_to_delete, to_delete = set(), set()
for key in keys:
items = key.split('-')
@@ -461,9 +447,7 @@ class Wizard(NamedUrlSessionFormWizard):
return (to_delete, not_to_delete)
def get_form(self, request, storage, step=None, data=None, files=None):
- """
- Manage formset
- """
+ """Manage formset"""
if data:
data = data.copy()
if not step:
@@ -527,9 +511,7 @@ class Wizard(NamedUrlSessionFormWizard):
**kwargs)
def process_post_request(self, request, storage, *args, **kwargs):
- """
- Convert numerical step number to step name
- """
+ """Convert numerical step number to step name"""
post_data = request.POST.copy()
if request.POST.has_key('form_prev_step'):
try:
@@ -541,10 +523,10 @@ class Wizard(NamedUrlSessionFormWizard):
request.POST = post_data
return super(Wizard, self).process_post_request(request, storage, *args,
**kwargs)
+
@classmethod
def session_has_key(cls, request, storage, form_key, key=None, multi=None):
- """
- Check if the session has value of a specific form and (if provided)
+ """Check if the session has value of a specific form and (if provided)
of a key
"""
test = storage.prefix in request.session \
@@ -559,9 +541,7 @@ class Wizard(NamedUrlSessionFormWizard):
@classmethod
def session_get_value(cls, request, storage, form_key, key, multi=False):
- """
- Get the value of a specific form
- """
+ """Get the value of a specific form"""
if not cls.session_has_key(request, storage, form_key, key, multi):
return
if not multi:
@@ -576,9 +556,7 @@ class Wizard(NamedUrlSessionFormWizard):
return vals
def get_current_object(self, request, storage):
- """
- Get the current object for an instancied wizard
- """
+ """Get the current object for an instancied wizard"""
current_obj = None
main_form_key = 'selec-' + self.url_name
try:
@@ -619,9 +597,7 @@ class Wizard(NamedUrlSessionFormWizard):
return super(Wizard, self).get_form_initial(request, storage, step)
def get_instanced_init(self, obj, request, storage, step=None):
- """
- Get initial data from an init
- """
+ """Get initial data from an init"""
current_step = step or storage.get_current_step() \
or self.get_first_step(request, storage)
c_form = self.form_list[current_step]
diff --git a/ishtar/ishtar_base/forms_operations.py b/ishtar/ishtar_base/forms_operations.py
index 17df6ac4a..f5bad9b58 100644
--- a/ishtar/ishtar_base/forms_operations.py
+++ b/ishtar/ishtar_base/forms_operations.py
@@ -305,6 +305,12 @@ class OperationFormPreventive(forms.Form):
cost = forms.IntegerField(label=_(u"Cost (€)"), required=False)
operator_reference = forms.CharField(label=_(u"Operator reference"),
required=False, max_length=20)
+ scheduled_man_days = forms.IntegerField(label=_(u"Scheduled man-days"),
+ required=False)
+ optional_man_days = forms.IntegerField(label=_(u"Optional man-days"),
+ required=False)
+ effective_man_days = forms.IntegerField(label=_(u"Effective man-days"),
+ required=False)
if settings.COUNTRY == 'fr':
fnap_financing = forms.FloatField(required=False,
label=u"Pourcentage de financement FNAP",
diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py
index 6921b3284..c8f088ab8 100644
--- a/ishtar/ishtar_base/models.py
+++ b/ishtar/ishtar_base/models.py
@@ -1357,6 +1357,12 @@ class Operation(BaseHistorizedItem, OwnPerms):
towns = models.ManyToManyField("Town", verbose_name=_(u"Towns"))
cost = models.IntegerField(_(u"Cost (€)"), blank=True, null=True)
periods = models.ManyToManyField('Period', verbose_name=_(u"Periods"))
+ scheduled_man_days = models.IntegerField(_(u"Scheduled man-days"),
+ blank=True, null=True)
+ optional_man_days = models.IntegerField(_(u"Optional man-days"),
+ blank=True, null=True)
+ effective_man_days = models.IntegerField(_(u"Effective man-days"),
+ blank=True, null=True)
if settings.COUNTRY == 'fr':
code_patriarche = models.IntegerField(u"Code PATRIARCHE", null=True,
blank=True)
diff --git a/ishtar/locale/fr/LC_MESSAGES/django.po b/ishtar/locale/fr/LC_MESSAGES/django.po
index df463536e..b19d95440 100644
--- a/ishtar/locale/fr/LC_MESSAGES/django.po
+++ b/ishtar/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 21:10+0200\n"
+"POT-Creation-Date: 2011-09-24 23:12+0200\n"
"PO-Revision-Date: 2010-12-09\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
@@ -54,15 +54,15 @@ msgid "Archaeological file"
msgstr "Dossier archéologique"
#: ishtar_base/context_processors.py:43 ishtar_base/menus.py:136
-#: ishtar_base/models.py:1382 ishtar_base/models.py:1483
-#: ishtar_base/models.py:1494 ishtar_base/models.py:1504
-#: ishtar_base/models.py:1611 ishtar_base/models.py:1943
-#: ishtar_base/models.py:1966
+#: ishtar_base/models.py:1390 ishtar_base/models.py:1506
+#: ishtar_base/models.py:1517 ishtar_base/models.py:1527
+#: ishtar_base/models.py:1634 ishtar_base/models.py:1966
+#: ishtar_base/models.py:1989
msgid "Operation"
msgstr "Opération"
#: ishtar_base/context_processors.py:44 ishtar_base/menus.py:178
-#: ishtar_base/models.py:1711 templates/sheet_contextrecord.html:104
+#: ishtar_base/models.py:1734 templates/sheet_contextrecord.html:104
#: templates/sheet_operation.html:150
msgid "Context record"
msgstr "Unité d'Enregistrement"
@@ -107,8 +107,8 @@ msgstr "Ajouter un nouvel élément"
#: ishtar_base/forms_common.py:43 ishtar_base/forms_common.py:94
#: ishtar_base/forms_common.py:98 ishtar_base/forms_common.py:131
#: ishtar_base/forms_common.py:135 ishtar_base/forms_common.py:379
-#: ishtar_base/forms_operations.py:327 ishtar_base/models.py:1039
-#: ishtar_base/models.py:1507 ishtar_base/models.py:2049
+#: ishtar_base/forms_operations.py:333 ishtar_base/models.py:1039
+#: ishtar_base/models.py:1530 ishtar_base/models.py:2072
#: templates/dashboard_operation.html:302
#: templates/dashboard_operation.html:315
#: templates/dashboard_operation.html:485
@@ -138,38 +138,38 @@ msgstr ""
#: ishtar_base/forms_common.py:486 ishtar_base/forms_items.py:194
#: ishtar_base/menus.py:89 ishtar_base/models.py:1093
#: ishtar_base/models.py:1118 ishtar_base/models.py:1130
-#: ishtar_base/models.py:2073 ishtar_base/models.py:2106
+#: ishtar_base/models.py:2096 ishtar_base/models.py:2129
msgid "Person"
msgstr "Individu"
#: ishtar_base/forms_common.py:69 ishtar_base/forms_items.py:236
-#: ishtar_base/models.py:1929 ishtar_base/models.py:2004
+#: ishtar_base/models.py:1952 ishtar_base/models.py:2027
msgid "Warehouse"
msgstr "Dépôt"
#: ishtar_base/forms_common.py:77 ishtar_base/forms_common.py:121
#: ishtar_base/forms_common.py:173 ishtar_base/models.py:1056
-#: ishtar_base/models.py:1086 ishtar_base/models.py:1921
-#: ishtar_base/models.py:2035
+#: ishtar_base/models.py:1086 ishtar_base/models.py:1944
+#: ishtar_base/models.py:2058
msgid "Name"
msgstr "Nom"
-#: ishtar_base/forms_common.py:79 ishtar_base/models.py:1917
-#: ishtar_base/models.py:1923
+#: ishtar_base/forms_common.py:79 ishtar_base/models.py:1940
+#: ishtar_base/models.py:1946
msgid "Warehouse type"
msgstr "Type de dépôt"
#: ishtar_base/forms_common.py:81 ishtar_base/forms_files.py:131
#: ishtar_base/forms_files.py:163 ishtar_base/models.py:1199
-#: ishtar_base/models.py:1925
+#: ishtar_base/models.py:1948
msgid "Person in charge"
msgstr "Responsable"
#: ishtar_base/forms_common.py:86 ishtar_base/forms_files.py:184
#: ishtar_base/forms_items.py:241 ishtar_base/forms_operations.py:247
#: ishtar_base/models.py:144 ishtar_base/models.py:1231
-#: ishtar_base/models.py:1378 ishtar_base/models.py:1926
-#: ishtar_base/models.py:2008
+#: ishtar_base/models.py:1386 ishtar_base/models.py:1949
+#: ishtar_base/models.py:2031
msgid "Comment"
msgstr "Commentaire"
@@ -268,9 +268,9 @@ msgid "Send the new password by email?"
msgstr "Envoyer le nouveau mot de passe par courriel ?"
#: ishtar_base/forms_common.py:361 ishtar_base/forms_common.py:373
-#: ishtar_base/forms_operations.py:325 ishtar_base/forms_operations.py:346
+#: ishtar_base/forms_operations.py:331 ishtar_base/forms_operations.py:352
#: ishtar_base/models.py:1209 ishtar_base/models.py:1357
-#: ishtar_base/models.py:2050
+#: ishtar_base/models.py:2073
msgid "Towns"
msgstr "Communes"
@@ -279,18 +279,18 @@ msgid "There are identical towns."
msgstr "Il y a des communes identiques."
#: ishtar_base/forms_common.py:376 ishtar_base/forms_common.py:425
-#: ishtar_base/forms_operations.py:349 ishtar_base/forms_operations.py:370
-#: ishtar_base/forms_operations.py:374 ishtar_base/models.py:1513
+#: ishtar_base/forms_operations.py:355 ishtar_base/forms_operations.py:376
+#: ishtar_base/forms_operations.py:380 ishtar_base/models.py:1536
msgid "Parcels"
msgstr "Parcelles"
-#: ishtar_base/forms_common.py:381 ishtar_base/models.py:1508
+#: ishtar_base/forms_common.py:381 ishtar_base/models.py:1531
#: templates/sheet_ope.html:62 templates/sheet_ope_modif.html:62
#: templates/sheet_operation.html:63
msgid "Section"
msgstr "Section"
-#: ishtar_base/forms_common.py:383 ishtar_base/models.py:1509
+#: ishtar_base/forms_common.py:383 ishtar_base/models.py:1532
msgid "Parcel number"
msgstr "Numéro de parcelle"
@@ -299,7 +299,7 @@ msgstr "Numéro de parcelle"
#: ishtar_base/forms_files.py:188 ishtar_base/forms_items.py:142
#: ishtar_base/forms_operations.py:192 ishtar_base/forms_operations.py:243
#: ishtar_base/models.py:959 ishtar_base/models.py:1192
-#: ishtar_base/models.py:1349 ishtar_base/models.py:1505
+#: ishtar_base/models.py:1349 ishtar_base/models.py:1528
#: templates/sheet_file.html:68 templates/sheet_file.html.py:88
#: templates/sheet_file.html:116 templates/sheet_ope.html:61
#: templates/sheet_ope.html.py:83 templates/sheet_ope_modif.html:61
@@ -373,8 +373,8 @@ msgstr "Opération : "
#: ishtar_base/forms_context_records.py:117
#: ishtar_base/forms_context_records.py:213 ishtar_base/forms_items.py:117
-#: ishtar_base/forms_items.py:145 ishtar_base/forms_operations.py:397
-#: ishtar_base/models.py:1553
+#: ishtar_base/forms_items.py:145 ishtar_base/forms_operations.py:403
+#: ishtar_base/models.py:1576
msgid "Period"
msgstr "Période"
@@ -392,15 +392,15 @@ msgid "You should at least select one context record."
msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement."
#: ishtar_base/forms_context_records.py:147 ishtar_base/forms_files.py:159
-#: ishtar_base/forms_operations.py:217 ishtar_base/forms_operations.py:701
+#: ishtar_base/forms_operations.py:217 ishtar_base/forms_operations.py:707
#: templates/sheet_file.html:17 templates/sheet_ope.html:5
#: templates/sheet_ope_modif.html:5 templates/sheet_operation.html:5
msgid "General"
msgstr "Général"
#: ishtar_base/forms_context_records.py:151
-#: ishtar_base/forms_operations.py:351 ishtar_base/models.py:1512
-#: ishtar_base/models.py:1609 ishtar_base/models.py:1904
+#: ishtar_base/forms_operations.py:357 ishtar_base/models.py:1535
+#: ishtar_base/models.py:1632 ishtar_base/models.py:1927
#: templates/sheet_contextrecord.html:109 templates/sheet_ope.html:63
#: templates/sheet_ope.html.py:129 templates/sheet_ope_modif.html:63
#: templates/sheet_ope_modif.html.py:129 templates/sheet_ope_modif.html:157
@@ -410,8 +410,8 @@ msgid "Parcel"
msgstr "Parcelle"
#: ishtar_base/forms_context_records.py:152 ishtar_base/forms_items.py:99
-#: ishtar_base/forms_items.py:285 ishtar_base/models.py:1613
-#: ishtar_base/models.py:1723 ishtar_base/models.py:1796
+#: ishtar_base/forms_items.py:285 ishtar_base/models.py:1636
+#: ishtar_base/models.py:1746 ishtar_base/models.py:1819
#: templates/sheet_ope.html:125 templates/sheet_ope_modif.html:125
#: templates/sheet_operation.html:124
msgid "ID"
@@ -419,8 +419,8 @@ msgstr "Identifiant"
#: ishtar_base/forms_context_records.py:154 ishtar_base/forms_items.py:101
#: ishtar_base/forms_items.py:148 ishtar_base/forms_items.py:203
-#: ishtar_base/models.py:1614 ishtar_base/models.py:1724
-#: ishtar_base/models.py:1797 ishtar_base/models.py:2068
+#: ishtar_base/models.py:1637 ishtar_base/models.py:1747
+#: ishtar_base/models.py:1820 ishtar_base/models.py:2091
#: templates/sheet_contextrecord.html:23
#: templates/sheet_contextrecord.html:106 templates/sheet_ope.html:128
#: templates/sheet_ope_modif.html:128 templates/sheet_ope_modif.html.py:154
@@ -428,28 +428,28 @@ msgstr "Identifiant"
msgid "Description"
msgstr "Description"
-#: ishtar_base/forms_context_records.py:156 ishtar_base/models.py:1615
+#: ishtar_base/forms_context_records.py:156 ishtar_base/models.py:1638
msgid "Length (cm)"
msgstr "Longueur (cm)"
-#: ishtar_base/forms_context_records.py:157 ishtar_base/models.py:1616
+#: ishtar_base/forms_context_records.py:157 ishtar_base/models.py:1639
msgid "Width (cm)"
msgstr "Largeur (cm)"
-#: ishtar_base/forms_context_records.py:158 ishtar_base/models.py:1617
+#: ishtar_base/forms_context_records.py:158 ishtar_base/models.py:1640
msgid "Thickness (cm)"
msgstr "Épaisseur (cm)"
-#: ishtar_base/forms_context_records.py:159 ishtar_base/models.py:1618
+#: ishtar_base/forms_context_records.py:159 ishtar_base/models.py:1641
msgid "Depth (cm)"
msgstr "Profondeur (cm)"
-#: ishtar_base/forms_context_records.py:160 ishtar_base/models.py:1623
+#: ishtar_base/forms_context_records.py:160 ishtar_base/models.py:1646
msgid "Unit"
msgstr "Unité"
#: ishtar_base/forms_context_records.py:162 ishtar_base/forms_items.py:198
-#: ishtar_base/models.py:1619 ishtar_base/models.py:2071
+#: ishtar_base/models.py:1642 ishtar_base/models.py:2094
msgid "Location"
msgstr "Lieu"
@@ -459,38 +459,38 @@ msgstr "Cet identifiant existe déjà pour cette opération."
#: ishtar_base/forms_context_records.py:208
#: ishtar_base/forms_context_records.py:230 ishtar_base/forms_items.py:112
-#: ishtar_base/models.py:1562 ishtar_base/models.py:1807
+#: ishtar_base/models.py:1585 ishtar_base/models.py:1830
msgid "Dating"
msgstr "Datation"
#: ishtar_base/forms_context_records.py:215 ishtar_base/forms_items.py:119
#: ishtar_base/forms_items.py:205 ishtar_base/forms_operations.py:235
-#: ishtar_base/models.py:1343 ishtar_base/models.py:1530
-#: ishtar_base/models.py:1554 ishtar_base/models.py:1905
-#: ishtar_base/models.py:2075 ishtar_base/models.py:2107
+#: ishtar_base/models.py:1343 ishtar_base/models.py:1553
+#: ishtar_base/models.py:1577 ishtar_base/models.py:1928
+#: ishtar_base/models.py:2098 ishtar_base/models.py:2130
#: templates/sheet_file.html:93
msgid "Start date"
msgstr "Date de début"
#: ishtar_base/forms_context_records.py:216 ishtar_base/forms_items.py:121
-#: ishtar_base/forms_items.py:207 ishtar_base/models.py:1531
-#: ishtar_base/models.py:1555 ishtar_base/models.py:1906
-#: ishtar_base/models.py:2076 ishtar_base/models.py:2108
+#: ishtar_base/forms_items.py:207 ishtar_base/models.py:1554
+#: ishtar_base/models.py:1578 ishtar_base/models.py:1929
+#: ishtar_base/models.py:2099 ishtar_base/models.py:2131
msgid "End date"
msgstr "Date de fin"
#: ishtar_base/forms_context_records.py:217 ishtar_base/forms_items.py:122
-#: ishtar_base/models.py:1558
+#: ishtar_base/models.py:1581
msgid "Quality"
msgstr "Qualité"
#: ishtar_base/forms_context_records.py:219 ishtar_base/forms_items.py:124
-#: ishtar_base/models.py:1544 ishtar_base/models.py:1556
+#: ishtar_base/models.py:1567 ishtar_base/models.py:1579
msgid "Dating type"
msgstr "Type de datation"
#: ishtar_base/forms_context_records.py:233
-#: ishtar_base/forms_context_records.py:240 ishtar_base/models.py:1628
+#: ishtar_base/forms_context_records.py:240 ishtar_base/models.py:1651
#: templates/sheet_contextrecord.html:32
msgid "Interpretation"
msgstr "Interpretation"
@@ -499,41 +499,41 @@ msgstr "Interpretation"
msgid "Has furniture?"
msgstr "A du matériel ?"
-#: ishtar_base/forms_context_records.py:238 ishtar_base/models.py:1627
+#: ishtar_base/forms_context_records.py:238 ishtar_base/models.py:1650
msgid "Filling"
msgstr "Remplissage"
-#: ishtar_base/forms_context_records.py:242 ishtar_base/models.py:1643
+#: ishtar_base/forms_context_records.py:242 ishtar_base/models.py:1666
msgid "Activity"
msgstr "Activité"
-#: ishtar_base/forms_context_records.py:244 ishtar_base/models.py:1641
+#: ishtar_base/forms_context_records.py:244 ishtar_base/models.py:1664
msgid "Identification"
msgstr "Identification"
-#: ishtar_base/forms_context_records.py:246 ishtar_base/models.py:1630
+#: ishtar_base/forms_context_records.py:246 ishtar_base/models.py:1653
msgid "TAQ"
msgstr "TAQ"
-#: ishtar_base/forms_context_records.py:247 ishtar_base/models.py:1633
+#: ishtar_base/forms_context_records.py:247 ishtar_base/models.py:1656
msgid "Estimated TAQ"
msgstr "TAQ estimé"
-#: ishtar_base/forms_context_records.py:249 ishtar_base/models.py:1635
+#: ishtar_base/forms_context_records.py:249 ishtar_base/models.py:1658
msgid "TPQ"
msgstr "TPQ"
-#: ishtar_base/forms_context_records.py:250 ishtar_base/models.py:1638
+#: ishtar_base/forms_context_records.py:250 ishtar_base/models.py:1661
msgid "Estimated TPQ"
msgstr "TPQ estimé"
#: ishtar_base/forms_context_records.py:267
-#: ishtar_base/forms_operations.py:201 ishtar_base/forms_operations.py:582
+#: ishtar_base/forms_operations.py:201 ishtar_base/forms_operations.py:588
msgid "Operation search"
msgstr "Recherche d'opérations"
#: ishtar_base/forms_context_records.py:269
-#: ishtar_base/forms_operations.py:213 ishtar_base/forms_operations.py:584
+#: ishtar_base/forms_operations.py:213 ishtar_base/forms_operations.py:590
msgid "You should select an operation."
msgstr "Vous devez sélectionner une opération."
@@ -562,12 +562,12 @@ msgid "Unit type of the context record"
msgstr "Type d'unité de l'Unité d'Enregistrement"
#: ishtar_base/forms_context_records.py:344 ishtar_base/forms_items.py:450
-#: ishtar_base/forms_operations.py:608
+#: ishtar_base/forms_operations.py:614
msgid "Documentation search"
msgstr "Recherche de document"
#: ishtar_base/forms_context_records.py:346 ishtar_base/forms_items.py:452
-#: ishtar_base/forms_operations.py:610
+#: ishtar_base/forms_operations.py:616
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
@@ -661,8 +661,8 @@ msgid "Would you like to delete this archaelogical file ?"
msgstr "Voulez vous supprimer ce dossier archéologique ?"
#: ishtar_base/forms_files.py:339 ishtar_base/forms_files.py:356
-#: ishtar_base/forms_operations.py:674 ishtar_base/forms_operations.py:704
-#: ishtar_base/models.py:1948 ishtar_base/models.py:1956
+#: ishtar_base/forms_operations.py:680 ishtar_base/forms_operations.py:710
+#: ishtar_base/models.py:1971 ishtar_base/models.py:1979
msgid "Act type"
msgstr "Type d'acte"
@@ -671,35 +671,35 @@ msgid "Current context record: "
msgstr "Unité d'Enregistrement : "
#: ishtar_base/forms_items.py:96 ishtar_base/menus.py:197
-#: ishtar_base/models.py:1865 ishtar_base/models.py:1899
-#: ishtar_base/models.py:2103
+#: ishtar_base/models.py:1888 ishtar_base/models.py:1922
+#: ishtar_base/models.py:2126
msgid "Item"
msgstr "Mobilier"
#: ishtar_base/forms_items.py:103 ishtar_base/forms_items.py:149
-#: ishtar_base/models.py:1727
+#: ishtar_base/models.py:1750
msgid "Is isolated?"
msgstr "Est isolé ?"
#: ishtar_base/forms_items.py:105 ishtar_base/forms_items.py:147
-#: ishtar_base/forms_items.py:289 ishtar_base/models.py:1719
-#: ishtar_base/models.py:1799 templates/sheet_contextrecord.html:103
+#: ishtar_base/forms_items.py:289 ishtar_base/models.py:1742
+#: ishtar_base/models.py:1822 templates/sheet_contextrecord.html:103
#: templates/sheet_operation.html:149
msgid "Material type"
msgstr "Type de matériau"
#: ishtar_base/forms_items.py:107 ishtar_base/forms_items.py:291
-#: ishtar_base/models.py:1800 ishtar_base/models.py:1995
+#: ishtar_base/models.py:1823 ishtar_base/models.py:2018
msgid "Volume (l)"
msgstr "Volume (l)"
#: ishtar_base/forms_items.py:108 ishtar_base/forms_items.py:292
-#: ishtar_base/models.py:1801
+#: ishtar_base/models.py:1824
msgid "Weight (g)"
msgstr "Poids (g)"
#: ishtar_base/forms_items.py:109 ishtar_base/forms_items.py:293
-#: ishtar_base/models.py:1802
+#: ishtar_base/models.py:1825
msgid "Item number"
msgstr "Nombre d'éléments"
@@ -715,8 +715,8 @@ msgstr "Recherche de mobilier"
msgid "Base treatment"
msgstr "Traitement de base"
-#: ishtar_base/forms_items.py:193 ishtar_base/models.py:2062
-#: ishtar_base/models.py:2070
+#: ishtar_base/forms_items.py:193 ishtar_base/models.py:2085
+#: ishtar_base/models.py:2093
msgid "Treatment type"
msgstr "Type de traitement"
@@ -724,7 +724,7 @@ msgstr "Type de traitement"
msgid "Upstream items"
msgstr "Mobilier amont"
-#: ishtar_base/forms_items.py:220 ishtar_base/models.py:1866
+#: ishtar_base/forms_items.py:220 ishtar_base/models.py:1889
msgid "Items"
msgstr "Mobiliers"
@@ -732,13 +732,13 @@ msgstr "Mobiliers"
msgid "You should at least select one archaeological item."
msgstr "Vous devez sélectionner du mobilier archéologique."
-#: ishtar_base/forms_items.py:233 ishtar_base/models.py:1808
-#: ishtar_base/models.py:2011 ishtar_base/models.py:2066
+#: ishtar_base/forms_items.py:233 ishtar_base/models.py:1831
+#: ishtar_base/models.py:2034 ishtar_base/models.py:2089
msgid "Container"
msgstr "Contenant"
#: ishtar_base/forms_items.py:234 ishtar_base/forms_items.py:358
-#: ishtar_base/models.py:1996 ishtar_base/models.py:2007
+#: ishtar_base/models.py:2019 ishtar_base/models.py:2030
#: templates/sheet_file.html:69 templates/sheet_file.html.py:89
#: templates/sheet_file.html:117 templates/sheet_ope.html:84
#: templates/sheet_ope_modif.html:84 templates/sheet_operation.html:84
@@ -746,7 +746,7 @@ msgid "Reference"
msgstr "Référence"
#: ishtar_base/forms_items.py:235 ishtar_base/forms_items.py:357
-#: ishtar_base/models.py:1999 ishtar_base/models.py:2006
+#: ishtar_base/models.py:2022 ishtar_base/models.py:2029
msgid "Container type"
msgstr "Type de contenant"
@@ -825,7 +825,7 @@ msgstr ""
"oubli, définissez le à la première étape."
#: ishtar_base/forms_operations.py:188 ishtar_base/forms_operations.py:233
-#: ishtar_base/forms_operations.py:595 ishtar_base/models.py:1323
+#: ishtar_base/forms_operations.py:601 ishtar_base/models.py:1323
#: ishtar_base/models.py:1354
msgid "Operation type"
msgstr "Type d'opération"
@@ -838,12 +838,12 @@ msgstr "Vestiges"
msgid "Is open?"
msgstr "Est ouvert ?"
-#: ishtar_base/forms_operations.py:222 ishtar_base/models.py:1958
+#: ishtar_base/forms_operations.py:222 ishtar_base/models.py:1981
msgid "Person in charge of the operation"
msgstr "Responsable d'opération"
-#: ishtar_base/forms_operations.py:229 ishtar_base/models.py:1942
-#: ishtar_base/models.py:1968
+#: ishtar_base/forms_operations.py:229 ishtar_base/models.py:1965
+#: ishtar_base/models.py:1991
msgid "Archaelogical file"
msgstr "Dossier archéologique"
@@ -868,11 +868,11 @@ msgid "References"
msgstr "Référence"
#: ishtar_base/forms_operations.py:277 ishtar_base/models.py:1350
-#: ishtar_base/models.py:1418
+#: ishtar_base/models.py:1426
msgid "Operation code"
msgstr "Code de l'opération"
-#: ishtar_base/forms_operations.py:278 ishtar_base/models.py:1376
+#: ishtar_base/forms_operations.py:278 ishtar_base/models.py:1384
msgid "Generic name"
msgstr "Nom générique"
@@ -894,62 +894,74 @@ msgstr "Information archéologie préventive - fouille"
msgid "Cost (€)"
msgstr "Cout (€)"
-#: ishtar_base/forms_operations.py:306 ishtar_base/models.py:1374
+#: ishtar_base/forms_operations.py:306 ishtar_base/models.py:1382
msgid "Operator reference"
-msgstr "Référence de l'opérateur :"
+msgstr "Référence de l'opérateur"
+
+#: ishtar_base/forms_operations.py:308 ishtar_base/models.py:1360
+msgid "Scheduled man-days"
+msgstr "Jours-hommes prévus"
-#: ishtar_base/forms_operations.py:315
+#: ishtar_base/forms_operations.py:310 ishtar_base/models.py:1362
+msgid "Optional man-days"
+msgstr "Jours-hommes optionnels"
+
+#: ishtar_base/forms_operations.py:312 ishtar_base/models.py:1364
+msgid "Effective man-days"
+msgstr "Jours-hommes effectifs"
+
+#: ishtar_base/forms_operations.py:321
msgid "Preventive informations - diagnostic"
msgstr "Information archéologie préventive - diagnostic"
-#: ishtar_base/forms_operations.py:318 ishtar_base/models.py:1369
+#: ishtar_base/forms_operations.py:324 ishtar_base/models.py:1377
msgid "Prescription on zoning"
msgstr "Prescription sur zonage"
-#: ishtar_base/forms_operations.py:320 ishtar_base/models.py:1371
+#: ishtar_base/forms_operations.py:326 ishtar_base/models.py:1379
msgid "Prescription on large area"
msgstr "Prescription sur une vaste surface"
-#: ishtar_base/forms_operations.py:322 ishtar_base/models.py:1373
+#: ishtar_base/forms_operations.py:328 ishtar_base/models.py:1381
msgid "Prescription on geoarchaeological context"
msgstr "Prescription sur un contexte géoarchéologique"
-#: ishtar_base/forms_operations.py:377 ishtar_base/forms_operations.py:391
+#: ishtar_base/forms_operations.py:383 ishtar_base/forms_operations.py:397
#: ishtar_base/models.py:1338
msgid "Remain types"
msgstr "Types de vestige"
-#: ishtar_base/forms_operations.py:380 ishtar_base/models.py:1337
+#: ishtar_base/forms_operations.py:386 ishtar_base/models.py:1337
msgid "Remain type"
msgstr "Type de vestige"
-#: ishtar_base/forms_operations.py:387
+#: ishtar_base/forms_operations.py:393
msgid "There are identical remain types"
msgstr "Il y a des types de vestige identiques."
-#: ishtar_base/forms_operations.py:394 ishtar_base/forms_operations.py:408
+#: ishtar_base/forms_operations.py:400 ishtar_base/forms_operations.py:414
#: ishtar_base/models.py:1359 templates/sheet_contextrecord.html:105
#: templates/sheet_ope_modif.html:153 templates/sheet_operation.html:151
msgid "Periods"
msgstr "Périodes"
-#: ishtar_base/forms_operations.py:404
+#: ishtar_base/forms_operations.py:410
msgid "There are identical periods"
msgstr "Il y a des périodes identiques."
-#: ishtar_base/forms_operations.py:497
+#: ishtar_base/forms_operations.py:503
msgid "Would you like to close this operation?"
msgstr "Voulez vous clôturer cette opération ?"
-#: ishtar_base/forms_operations.py:511
+#: ishtar_base/forms_operations.py:517
msgid "Would you like to delete this operation?"
msgstr "Voulez vous supprimer cette opération ?"
-#: ishtar_base/forms_operations.py:553 ishtar_base/models.py:1496
+#: ishtar_base/forms_operations.py:559 ishtar_base/models.py:1519
msgid "Index"
msgstr "Index"
-#: ishtar_base/forms_operations.py:576
+#: ishtar_base/forms_operations.py:582
#, python-format
msgid ""
"Index already exist for operation: %(operation)s - use a value bigger than "
@@ -958,35 +970,35 @@ msgstr ""
"Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur "
"plus grande que %(last_val)d"
-#: ishtar_base/forms_operations.py:594
+#: ishtar_base/forms_operations.py:600
msgid "Operation's town"
msgstr "Commune de l'opération"
-#: ishtar_base/forms_operations.py:597
+#: ishtar_base/forms_operations.py:603
msgid "Operation's year"
msgstr "Année de l'opération"
-#: ishtar_base/forms_operations.py:684
+#: ishtar_base/forms_operations.py:690
msgid "Administrative act search"
msgstr "Recherche d'actes administratifs"
-#: ishtar_base/forms_operations.py:696
+#: ishtar_base/forms_operations.py:702
msgid "You should select an administrative act."
msgstr "Vous devez sélectionner un acte administratif."
-#: ishtar_base/forms_operations.py:705 ishtar_base/models.py:1964
+#: ishtar_base/forms_operations.py:711 ishtar_base/models.py:1987
msgid "Signatory"
msgstr "Signataire"
-#: ishtar_base/forms_operations.py:709 ishtar_base/models.py:1971
+#: ishtar_base/forms_operations.py:715 ishtar_base/models.py:1994
msgid "Object"
msgstr "Objet"
-#: ishtar_base/forms_operations.py:711 ishtar_base/models.py:1969
+#: ishtar_base/forms_operations.py:717 ishtar_base/models.py:1992
msgid "Signature date"
msgstr "Date de signature"
-#: ishtar_base/forms_operations.py:738
+#: ishtar_base/forms_operations.py:744
msgid "Would you like to delete this administrative act?"
msgstr "Voulez vous supprimer cet acte administratif ?"
@@ -1024,7 +1036,7 @@ msgid "Deletion"
msgstr "Suppression"
#: ishtar_base/menus.py:120 ishtar_base/menus.py:159
-#: ishtar_base/models.py:1977 ishtar_base/models.py:2105
+#: ishtar_base/models.py:2000 ishtar_base/models.py:2128
msgid "Administrative act"
msgstr "Acte administratif"
@@ -1067,7 +1079,7 @@ msgstr "Informations générales"
msgid "Archaeological files"
msgstr "Dossiers archéologiques"
-#: ishtar_base/menus.py:296 ishtar_base/models.py:1383
+#: ishtar_base/menus.py:296 ishtar_base/models.py:1391
#: ishtar_base/views.py:679 templates/dashboard_operation.html:9
msgid "Operations"
msgstr "Opérations"
@@ -1291,16 +1303,16 @@ msgstr "Peut changer son propre Dossier archéologique"
msgid "Can delete own Archaelogical file"
msgstr "Peut supprimer son propre Dossier archéologique"
-#: ishtar_base/models.py:1259 ishtar_base/models.py:1392
+#: ishtar_base/models.py:1259 ishtar_base/models.py:1400
msgid "Intercommunal"
msgstr "Intercommunal"
#: ishtar_base/models.py:1314 ishtar_base/models.py:1352
-#: ishtar_base/models.py:1502
+#: ishtar_base/models.py:1525
msgid "File"
msgstr "Dossier"
-#: ishtar_base/models.py:1315 ishtar_base/models.py:1484
+#: ishtar_base/models.py:1315 ishtar_base/models.py:1507
#: templates/dashboard_operation.html:273
#: templates/dashboard_operation.html:286
#: templates/dashboard_operation.html:456
@@ -1316,105 +1328,105 @@ msgstr "Types d'opération"
msgid "In charge"
msgstr "Responsable"
-#: ishtar_base/models.py:1355 ishtar_base/models.py:2036
+#: ishtar_base/models.py:1355 ishtar_base/models.py:2059
msgid "Surface (m²)"
msgstr "Area (m²)"
-#: ishtar_base/models.py:1385
+#: ishtar_base/models.py:1393
msgid "Can view own Operation"
msgstr "Peut voir sa propre Opération"
-#: ishtar_base/models.py:1386
+#: ishtar_base/models.py:1394
msgid "Can add own Operation"
msgstr "Peut ajouter sa propre Opération"
-#: ishtar_base/models.py:1387
+#: ishtar_base/models.py:1395
msgid "Can change own Operation"
msgstr "Peut changer sa propre Opération"
-#: ishtar_base/models.py:1388
+#: ishtar_base/models.py:1396
msgid "Can delete own Operation"
msgstr "Peut supprimer sa propre Opération"
-#: ishtar_base/models.py:1431
+#: ishtar_base/models.py:1439
msgid "This operation code already exists for this year"
msgstr "Cet code d'opération existe déjà pour cette année."
-#: ishtar_base/models.py:1492
+#: ishtar_base/models.py:1515
msgid "Operation documentation"
msgstr "Documentation d'une opération"
-#: ishtar_base/models.py:1493
+#: ishtar_base/models.py:1516
msgid "Operation documentations"
msgstr "Documentations des opérations"
-#: ishtar_base/models.py:1529 ishtar_base/models.py:1573
-#: ishtar_base/models.py:1585 ishtar_base/models.py:1595
-#: ishtar_base/models.py:1795
+#: ishtar_base/models.py:1552 ishtar_base/models.py:1596
+#: ishtar_base/models.py:1608 ishtar_base/models.py:1618
+#: ishtar_base/models.py:1818
msgid "Order"
msgstr "Ordre"
-#: ishtar_base/models.py:1532
+#: ishtar_base/models.py:1555
msgid "Parent period"
msgstr "Période parente"
-#: ishtar_base/models.py:1536
+#: ishtar_base/models.py:1559
msgid "Type Period"
msgstr "Type de période"
-#: ishtar_base/models.py:1537
+#: ishtar_base/models.py:1560
msgid "Types Period"
msgstr "Types de période"
-#: ishtar_base/models.py:1545
+#: ishtar_base/models.py:1568
msgid "Dating types"
msgstr "Types de datation"
-#: ishtar_base/models.py:1549
+#: ishtar_base/models.py:1572
msgid "Dating quality"
msgstr "Qualité de datation"
-#: ishtar_base/models.py:1550
+#: ishtar_base/models.py:1573
msgid "Dating qualities"
msgstr "Qualités de datation"
-#: ishtar_base/models.py:1563
+#: ishtar_base/models.py:1586
msgid "Datings"
msgstr "Datations"
-#: ishtar_base/models.py:1574
+#: ishtar_base/models.py:1597
msgid "Parent unit"
msgstr "Unité parente"
-#: ishtar_base/models.py:1578
+#: ishtar_base/models.py:1601
msgid "Type Unit"
msgstr "Type d'unité"
-#: ishtar_base/models.py:1579
+#: ishtar_base/models.py:1602
msgid "Types Unit"
msgstr "Types d'unité"
-#: ishtar_base/models.py:1588
+#: ishtar_base/models.py:1611
msgid "Type Activity"
msgstr "Type d'activité"
-#: ishtar_base/models.py:1589
+#: ishtar_base/models.py:1612
msgid "Types Activity"
msgstr "Types d'activités"
-#: ishtar_base/models.py:1597
+#: ishtar_base/models.py:1620
msgid "Type Identification"
msgstr "Type d'identification"
-#: ishtar_base/models.py:1598
+#: ishtar_base/models.py:1621
msgid "Types Identification"
msgstr "Types d'identification"
-#: ishtar_base/models.py:1621
+#: ishtar_base/models.py:1644
msgid "A short description of the location of the context record"
msgstr "Une courte description de la situation de l'Unité d'Enregistrement"
-#: ishtar_base/models.py:1631
+#: ishtar_base/models.py:1654
msgid ""
"\"Terminus Ante Quem\" the context record can't have been created after this "
"date"
@@ -1422,11 +1434,11 @@ msgstr ""
"« Terminus Ante Quem » l'Unité d'Enregistrement ne peut avoir été crée après "
"cette date"
-#: ishtar_base/models.py:1634
+#: ishtar_base/models.py:1657
msgid "Estimation of a \"Terminus Ante Quem\""
msgstr "Estimation d'un « Terminus Ante Quem »"
-#: ishtar_base/models.py:1636
+#: ishtar_base/models.py:1659
msgid ""
"\"Terminus Post Quem\" the context record can't have been created before "
"this date"
@@ -1434,258 +1446,258 @@ msgstr ""
"« Terminus Post Quem » l'Unité d'Enregistrement ne peut avoir été crée avant "
"cette date"
-#: ishtar_base/models.py:1639
+#: ishtar_base/models.py:1662
msgid "Estimation of a \"Terminus Post Quem\""
msgstr "Estimation d'un « Terminus Post Quem »"
-#: ishtar_base/models.py:1647 ishtar_base/models.py:1648
-#: ishtar_base/models.py:1726 templates/sheet_contextrecord.html:6
+#: ishtar_base/models.py:1670 ishtar_base/models.py:1671
+#: ishtar_base/models.py:1749 templates/sheet_contextrecord.html:6
msgid "Context Record"
msgstr "Unité d'Enregistrement"
-#: ishtar_base/models.py:1650
+#: ishtar_base/models.py:1673
msgid "Can view own Context Record"
msgstr "Peut voir sa propre Unité d'Enregistrement"
-#: ishtar_base/models.py:1651
+#: ishtar_base/models.py:1674
msgid "Can add own Context Record"
msgstr "Peut ajouter sa propre Unité d'Enregistrement"
-#: ishtar_base/models.py:1652
+#: ishtar_base/models.py:1675
msgid "Can change own Context Record"
msgstr "Peut changer sa propre Unité d'Enregistrement"
-#: ishtar_base/models.py:1653
+#: ishtar_base/models.py:1676
msgid "Can delete own Context Record"
msgstr "Peut supprimer sa propre Unité d'Enregistrement"
-#: ishtar_base/models.py:1708
+#: ishtar_base/models.py:1731
msgid "Context record documentation"
msgstr "Documentation d'une Unité d'Enregistrement"
-#: ishtar_base/models.py:1709
+#: ishtar_base/models.py:1732
msgid "Context record documentations"
msgstr "Documentations des Unités d'Enregistrement"
-#: ishtar_base/models.py:1714
+#: ishtar_base/models.py:1737
msgid "Recommendation"
msgstr "Recommendation"
-#: ishtar_base/models.py:1716
+#: ishtar_base/models.py:1739
msgid "Parent material"
msgstr "Matériau parent"
-#: ishtar_base/models.py:1720
+#: ishtar_base/models.py:1743
msgid "Material types"
msgstr "Types de matériaux"
-#: ishtar_base/models.py:1734 ishtar_base/models.py:1793
+#: ishtar_base/models.py:1757 ishtar_base/models.py:1816
msgid "Base item"
msgstr "Mobilier de base"
-#: ishtar_base/models.py:1735
+#: ishtar_base/models.py:1758
msgid "Base items"
msgstr "Mobiliers de base"
-#: ishtar_base/models.py:1737
+#: ishtar_base/models.py:1760
msgid "Can view own Base item"
msgstr "Peut voir son propre Mobilier de base"
-#: ishtar_base/models.py:1738
+#: ishtar_base/models.py:1761
msgid "Can add own Base item"
msgstr "Peut ajouter son propre Mobilier de base"
-#: ishtar_base/models.py:1739
+#: ishtar_base/models.py:1762
msgid "Can change own Base item"
msgstr "Peut changer son propre Mobilier de base"
-#: ishtar_base/models.py:1740
+#: ishtar_base/models.py:1763
msgid "Can delete own Base item"
msgstr "Peut supprimer son propre Mobilier de base"
-#: ishtar_base/models.py:1804
+#: ishtar_base/models.py:1827
msgid "Upstream treatment"
msgstr "Traitement amont"
-#: ishtar_base/models.py:1806
+#: ishtar_base/models.py:1829
msgid "Downstream treatment"
msgstr "Traitement aval"
-#: ishtar_base/models.py:1868
+#: ishtar_base/models.py:1891
msgid "Can view own Item"
msgstr "Peut voir son propre Mobilier"
-#: ishtar_base/models.py:1869
+#: ishtar_base/models.py:1892
msgid "Can add own Item"
msgstr "Peut ajouter son propre Mobilier"
-#: ishtar_base/models.py:1870
+#: ishtar_base/models.py:1893
msgid "Can change own Item"
msgstr "Peut changer son propre Mobilier"
-#: ishtar_base/models.py:1871
+#: ishtar_base/models.py:1894
msgid "Can delete own Item"
msgstr "Peut supprimer son propre Mobilier"
-#: ishtar_base/models.py:1897
+#: ishtar_base/models.py:1920
msgid "Item documentation"
msgstr "Documentation du mobilier"
-#: ishtar_base/models.py:1898
+#: ishtar_base/models.py:1921
msgid "Item documentations"
msgstr "Documentations des mobiliers"
-#: ishtar_base/models.py:1903 templates/sheet_ope.html:64
+#: ishtar_base/models.py:1926 templates/sheet_ope.html:64
#: templates/sheet_ope_modif.html:64
msgid "Owner"
msgstr "Propriétaire"
-#: ishtar_base/models.py:1909
+#: ishtar_base/models.py:1932
msgid "Parcel owner"
msgstr "Propriétaire de parcelle"
-#: ishtar_base/models.py:1910
+#: ishtar_base/models.py:1933
msgid "Parcel owners"
msgstr "Propriétaires de parcelle"
-#: ishtar_base/models.py:1918
+#: ishtar_base/models.py:1941
msgid "Warehouse types"
msgstr "Types de dépôts"
-#: ishtar_base/models.py:1930
+#: ishtar_base/models.py:1953
msgid "Warehouses"
msgstr "Dépôts"
-#: ishtar_base/models.py:1932
+#: ishtar_base/models.py:1955
msgid "Can view own Warehouse"
msgstr "Peut voir son propre Dépôt"
-#: ishtar_base/models.py:1933
+#: ishtar_base/models.py:1956
msgid "Can add own Warehouse"
msgstr "Peut ajouter son propre Dépôt"
-#: ishtar_base/models.py:1934
+#: ishtar_base/models.py:1957
msgid "Can change own Warehouse"
msgstr "Peut changer son propre Dépôt"
-#: ishtar_base/models.py:1935
+#: ishtar_base/models.py:1958
msgid "Can delete own Warehouse"
msgstr "Peut supprimer son propre Dépôt"
-#: ishtar_base/models.py:1945
+#: ishtar_base/models.py:1968
msgid "Intended to"
msgstr "Destiné à"
-#: ishtar_base/models.py:1949
+#: ishtar_base/models.py:1972
msgid "Act types"
msgstr "Types d'acte"
-#: ishtar_base/models.py:1960
+#: ishtar_base/models.py:1983
msgid "Archaeological preventive operator"
msgstr "Opérateur d'archéologie préventive"
-#: ishtar_base/models.py:1962
+#: ishtar_base/models.py:1985
msgid "Person in charge of the scientific part"
msgstr "Responsable scientifique"
-#: ishtar_base/models.py:1978
+#: ishtar_base/models.py:2001
msgid "Administrative acts"
msgstr "Actes administratifs"
-#: ishtar_base/models.py:1980
+#: ishtar_base/models.py:2003
msgid "Can view own Administrative act"
msgstr "Peut voir son propre Acte administratif"
-#: ishtar_base/models.py:1981
+#: ishtar_base/models.py:2004
msgid "Can add own Administrative act"
msgstr "Peut ajouter son propre Acte administratif"
-#: ishtar_base/models.py:1982
+#: ishtar_base/models.py:2005
msgid "Can change own Administrative act"
msgstr "Peut changer son propre Acte administratif"
-#: ishtar_base/models.py:1983
+#: ishtar_base/models.py:2006
msgid "Can delete own Administrative act"
msgstr "Peut supprimer son propre Acte administratif"
-#: ishtar_base/models.py:1992
+#: ishtar_base/models.py:2015
msgid "Length (mm)"
msgstr "Longueur (mm) :"
-#: ishtar_base/models.py:1993
+#: ishtar_base/models.py:2016
msgid "Width (mm)"
msgstr "Largeur (mm) :"
-#: ishtar_base/models.py:1994
+#: ishtar_base/models.py:2017
msgid "Height (mm)"
msgstr "Hauteur (mm)"
-#: ishtar_base/models.py:2000
+#: ishtar_base/models.py:2023
msgid "Container types"
msgstr "Types de contenant"
-#: ishtar_base/models.py:2012
+#: ishtar_base/models.py:2035
msgid "Containers"
msgstr "Contenants"
-#: ishtar_base/models.py:2037 templates/sheet_contextrecord.html:71
+#: ishtar_base/models.py:2060 templates/sheet_contextrecord.html:71
#: templates/sheet_file.html:43 templates/sheet_ope.html:46
#: templates/sheet_ope.html.py:107 templates/sheet_ope_modif.html:46
#: templates/sheet_ope_modif.html.py:107 templates/sheet_operation.html:46
msgid "Localisation"
msgstr "Localisation"
-#: ishtar_base/models.py:2060
+#: ishtar_base/models.py:2083
msgid "Virtual"
msgstr "Virtuel"
-#: ishtar_base/models.py:2063
+#: ishtar_base/models.py:2086
msgid "Treatment types"
msgstr "Types de traitements"
-#: ishtar_base/models.py:2080 ishtar_base/models.py:2099
+#: ishtar_base/models.py:2103 ishtar_base/models.py:2122
msgid "Treatment"
msgstr "Traitement"
-#: ishtar_base/models.py:2081
+#: ishtar_base/models.py:2104
msgid "Treatments"
msgstr "Traitements"
-#: ishtar_base/models.py:2083
+#: ishtar_base/models.py:2106
msgid "Can view own Treatment"
msgstr "Peut voir son propre Traitement"
-#: ishtar_base/models.py:2084
+#: ishtar_base/models.py:2107
msgid "Can add own Treatment"
msgstr "Peut ajouter son propre Traitement"
-#: ishtar_base/models.py:2085
+#: ishtar_base/models.py:2108
msgid "Can change own Treatment"
msgstr "Peut changer son propre Traitement"
-#: ishtar_base/models.py:2086
+#: ishtar_base/models.py:2109
msgid "Can delete own Treatment"
msgstr "Peut supprimer son propre traitement"
-#: ishtar_base/models.py:2092 templates/sheet_contextrecord.html:65
+#: ishtar_base/models.py:2115 templates/sheet_contextrecord.html:65
#: templates/sheet_file.html:35 templates/sheet_ope.html:22
#: templates/sheet_ope_modif.html:22 templates/sheet_operation.html:22
msgid "by"
msgstr "par"
-#: ishtar_base/models.py:2097
+#: ishtar_base/models.py:2120
msgid "Treatment documentation"
msgstr "Documentation d'un traitement"
-#: ishtar_base/models.py:2098
+#: ishtar_base/models.py:2121
msgid "Treament documentations"
msgstr "Documentations des traitements"
-#: ishtar_base/models.py:2111
+#: ishtar_base/models.py:2134
msgid "Property"
msgstr "Propriété"
-#: ishtar_base/models.py:2112
+#: ishtar_base/models.py:2135
msgid "Properties"
msgstr "Propriétés"