diff options
| -rw-r--r-- | ishtar/furnitures/admin.py | 36 | ||||
| -rw-r--r-- | ishtar/furnitures/models.py | 104 | ||||
| -rw-r--r-- | ishtar/locale/fr/LC_MESSAGES/django.po | 628 |
3 files changed, 414 insertions, 354 deletions
diff --git a/ishtar/furnitures/admin.py b/ishtar/furnitures/admin.py index 8a47ea429..3a93f1852 100644 --- a/ishtar/furnitures/admin.py +++ b/ishtar/furnitures/admin.py @@ -80,6 +80,14 @@ class OperationAdmin(HistorizedObjectAdmin): admin.site.register(models.Operation, OperationAdmin) +class OperationSourceAdmin(admin.ModelAdmin): + list_display = ('operation', 'title', 'source_type',) + list_filter = ('source_type',) + search_fields = ('title', 'operation__name') + model = models.OperationSource + +admin.site.register(models.OperationSource, OperationSourceAdmin) + class ParcelAdmin(HistorizedObjectAdmin): list_display = ('section', 'parcel_number', 'operation', 'associated_file') search_fields = ('operation__name',) @@ -110,13 +118,13 @@ class ContextRecordAdmin(HistorizedObjectAdmin): admin.site.register(models.ContextRecord, ContextRecordAdmin) -class SourceAdmin(admin.ModelAdmin): - list_display = ('title', 'source_type',) +class ContextRecordSourceAdmin(admin.ModelAdmin): + list_display = ('context_record', 'title', 'source_type',) list_filter = ('source_type',) - search_fields = ('title',) - model = models.Source + search_fields = ('title', ) + model = models.ContextRecordSource -admin.site.register(models.Source, SourceAdmin) +admin.site.register(models.ContextRecordSource, ContextRecordSourceAdmin) class BaseItemAdmin(HistorizedObjectAdmin): list_display = ('label', 'context_record', 'is_isolated') @@ -134,6 +142,14 @@ class ItemAdmin(HistorizedObjectAdmin): admin.site.register(models.Item, ItemAdmin) +class ItemSourceAdmin(admin.ModelAdmin): + list_display = ('item', 'title', 'source_type',) + list_filter = ('source_type',) + search_fields = ('title', ) + model = models.ItemSource + +admin.site.register(models.ItemSource, ItemSourceAdmin) + class WarehouseAdmin(HistorizedObjectAdmin): list_display = ('name', 'warehouse_type', 'town') list_filter = ('warehouse_type',) @@ -176,7 +192,7 @@ class TownAdmin(admin.ModelAdmin): admin.site.register(models.Town, TownAdmin) class AuthorAdmin(admin.ModelAdmin): - list_display = ['person', 'source', 'author_type'] + list_display = ['person', 'author_type'] list_filter = ("author_type",) model = models.Author @@ -196,6 +212,14 @@ class TreatmentAdmin(HistorizedObjectAdmin): admin.site.register(models.Treatment, TreatmentAdmin) +class TreatmentSourceAdmin(admin.ModelAdmin): + list_display = ('treatment', 'title', 'source_type',) + list_filter = ('source_type',) + search_fields = ('title',) + model = models.TreatmentSource + +admin.site.register(models.TreatmentSource, TreatmentSourceAdmin) + basic_models = [models.PersonType, models.IshtarUser, models.FileType, models.OperationType, models.DatingType, models.DatingQuality, models.SourceType, models.MaterialType, models.ParcelOwner, diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index 6a0999119..37c958b30 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -426,6 +426,37 @@ class IshtarUser(User): verbose_name = _(u"Ishtar user") verbose_name_plural = _(u"Ishtar users") +class AuthorType(GeneralType): + class Meta: + verbose_name = _(u"Author type") + verbose_name_plural = _(u"Author types") + +class Author(models.Model): + person = models.ForeignKey(Person, verbose_name=_(u"Person")) + author_type = models.ForeignKey(AuthorType, verbose_name=_(u"Author type")) + + class Meta: + verbose_name = _(u"Author") + verbose_name_plural = _(u"Authors") + + def __unicode__(self): + return self.person + JOINT + self.source + +class SourceType(GeneralType): + class Meta: + verbose_name = _(u"Source type") + verbose_name_plural = _(u"Source types") + +class Source(models.Model): + title = models.CharField(_(u"Title"), max_length=200) + source_type = models.ForeignKey(SourceType, verbose_name=_(u"Type")) + authors = models.ManyToManyField(Author, verbose_name=_(u"Authors")) + + class Meta: + abstract = True + + def __unicode__(self): + return self.title class FileType(GeneralType): class Meta: @@ -641,6 +672,13 @@ class Operation(BaseHistorizedItem, OwnPerms): return {'date':item.history_date, 'user':IshtarUser.objects.get(pk=item.history_modifier_id)} +class OperationSource(Source): + class Meta: + verbose_name = _(u"Operation documentation") + verbose_name_plural = _(u"Operation documentations") + operation = models.ForeignKey(Operation, verbose_name=_(u"Operation"), + related_name="source") + class Parcel(LightHistorizedItem): associated_file = models.ForeignKey(File, related_name='parcels', blank=True, null=True, verbose_name=_(u"File")) @@ -817,22 +855,12 @@ class ContextRecord(BaseHistorizedItem, OwnPerms): return JOINT.join([unicode(lbl) for lbl in [self.parcel.operation.year, self.parcel.operation.operation_code, self.label] if lbl]) - -class SourceType(GeneralType): - class Meta: - verbose_name = _(u"Source type") - verbose_name_plural = _(u"Source types") - -class Source(models.Model) : - title = models.CharField(_(u"Title"), max_length=200) - source_type = models.ForeignKey(SourceType, verbose_name=_(u"Type")) - +class ContextRecordSource(Source): class Meta: - verbose_name = _(u"Source") - verbose_name_plural = _(u"Sources") - - def __unicode__(self): - return self.title + verbose_name = _(u"Context record documentation") + verbose_name_plural = _(u"Context record documentations") + context_record = models.ForeignKey(ContextRecord, + verbose_name=_(u"Context record"), related_name="source") class MaterialType(GeneralType): recommendation = models.TextField(_(u"Recommendation")) @@ -852,7 +880,6 @@ class BaseItem(BaseHistorizedItem, OwnPerms): null=True) index = models.IntegerField(u"Index", default=0) material_index = models.IntegerField(u"Material index", default=0) - documentations = models.ManyToManyField(Source) history = HistoricalRecords() class Meta: @@ -966,25 +993,12 @@ class Item(BaseHistorizedItem, OwnPerms): base_item.save() super(Item, self).save(*args, **kwargs) -""" -def initialize_item(sender, **kwargs): - # initialize base items with the item - if kwargs['action'] != 'post_add': - return - item = kwargs['instance'] - # item already initialized - if item.label: - return - base_items = item.base_items.all() - if len(base_items) != 1: - return - base_item = base_items[0] - item.label = base_item.label - item.description = base_item.description - item.save() -m2m_changed.connect(initialize_item, - sender=Item.base_items.through) -""" +class ItemSource(Source): + class Meta: + verbose_name = _(u"Item documentation") + verbose_name_plural = _(u"Item documentations") + item = models.ForeignKey(Item, verbose_name=_(u"Item"), + related_name="source") class ParcelOwner(LightHistorizedItem): owner = models.ForeignKey(Person, verbose_name=_(u"Owner")) @@ -1166,22 +1180,12 @@ class Treatment(BaseHistorizedItem, OwnPerms): ("delete_own_treatment", ugettext(u"Can delete own Treatment")), ) -class AuthorType(GeneralType): +class TreatmentSource(Source): class Meta: - verbose_name = _(u"Author type") - verbose_name_plural = _(u"Author types") - -class Author(models.Model): - person = models.ForeignKey(Person, verbose_name=_(u"Person")) - source = models.ForeignKey(Source, verbose_name=_(u"Source")) - author_type = models.ForeignKey(AuthorType, verbose_name=_(u"Author type")) - - class Meta: - verbose_name = _(u"Author") - verbose_name_plural = _(u"Authors") - - def __unicode__(self): - return self.person + JOINT + self.source + verbose_name = _(u"Treatment documentation") + verbose_name_plural = _(u"Treament documentations") + treatment = models.ForeignKey(Treatment, verbose_name=_(u"Treatment"), + related_name="source") class Property(LightHistorizedItem): item = models.ForeignKey(Item, verbose_name=_(u"Item")) diff --git a/ishtar/locale/fr/LC_MESSAGES/django.po b/ishtar/locale/fr/LC_MESSAGES/django.po index 09f382ea7..a6b55ee90 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-06-14 00:19+0200\n" +"POT-Creation-Date: 2011-06-21 11:48+0200\n" "PO-Revision-Date: 2010-12-09\n" "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n" "Language-Team: \n" @@ -44,14 +44,15 @@ msgstr "Nouvelle organisation" msgid "New person" msgstr "Nouvelle personne" -#: furnitures/context_processors.py:42 furnitures/forms_operations.py:228 -#: furnitures/menus.py:102 furnitures/models.py:1027 furnitures/models.py:1053 +#: furnitures/context_processors.py:42 furnitures/forms_operations.py:229 +#: furnitures/menus.py:102 furnitures/models.py:1043 furnitures/models.py:1069 msgid "Archaelogical file" msgstr "Dossier archéologique" #: furnitures/context_processors.py:43 furnitures/menus.py:132 -#: furnitures/models.py:607 furnitures/models.py:648 furnitures/models.py:1028 -#: furnitures/models.py:1051 +#: furnitures/models.py:638 furnitures/models.py:679 furnitures/models.py:686 +#: furnitures/models.py:793 furnitures/models.py:1044 +#: furnitures/models.py:1067 msgid "Operation" msgstr "Opération" @@ -96,32 +97,32 @@ msgstr "" #: furnitures/forms_common.py:54 furnitures/forms_common.py:75 #: furnitures/forms_common.py:79 furnitures/forms_common.py:112 #: furnitures/forms_common.py:116 furnitures/forms_common.py:368 -#: furnitures/forms_operations.py:306 furnitures/models.py:340 -#: furnitures/models.py:652 furnitures/models.py:1127 +#: furnitures/forms_operations.py:307 furnitures/models.py:340 +#: furnitures/models.py:690 furnitures/models.py:1143 msgid "Town" msgstr "Commune" #: furnitures/forms_common.py:58 furnitures/forms_common.py:102 #: furnitures/forms_common.py:154 furnitures/models.py:357 -#: furnitures/models.py:387 furnitures/models.py:1006 -#: furnitures/models.py:1113 +#: furnitures/models.py:387 furnitures/models.py:1022 +#: furnitures/models.py:1129 msgid "Name" msgstr "Nom" -#: furnitures/forms_common.py:60 furnitures/models.py:1002 -#: furnitures/models.py:1008 +#: furnitures/forms_common.py:60 furnitures/models.py:1018 +#: furnitures/models.py:1024 msgid "Warehouse type" msgstr "Type de dépôt" #: furnitures/forms_common.py:62 furnitures/forms_files.py:159 -#: furnitures/models.py:466 furnitures/models.py:1010 +#: furnitures/models.py:497 furnitures/models.py:1026 msgid "Person in charge" msgstr "Responsable" #: furnitures/forms_common.py:67 furnitures/forms_files.py:180 -#: furnitures/forms_items.py:209 furnitures/forms_operations.py:244 -#: furnitures/models.py:131 furnitures/models.py:497 furnitures/models.py:603 -#: furnitures/models.py:1011 furnitures/models.py:1091 +#: furnitures/forms_items.py:210 furnitures/forms_operations.py:245 +#: furnitures/models.py:131 furnitures/models.py:528 furnitures/models.py:634 +#: furnitures/models.py:1027 furnitures/models.py:1107 msgid "Comment" msgstr "Commentaire" @@ -158,10 +159,10 @@ msgstr "Type d'organisation" msgid "Person search" msgstr "Recherche d'individus" -#: furnitures/forms_common.py:142 furnitures/forms_items.py:181 +#: furnitures/forms_common.py:142 furnitures/forms_items.py:182 #: furnitures/menus.py:89 furnitures/models.py:398 furnitures/models.py:423 -#: furnitures/models.py:1151 furnitures/models.py:1173 -#: furnitures/models.py:1188 +#: furnitures/models.py:435 furnitures/models.py:1167 +#: furnitures/models.py:1194 msgid "Person" msgstr "Individu" @@ -170,7 +171,7 @@ msgid "Identity" msgstr "Identité" #: furnitures/forms_common.py:151 furnitures/models.py:385 -#: furnitures/models.py:825 templates/sheet_contextrecord.html:83 +#: furnitures/models.py:451 templates/sheet_contextrecord.html:83 #: templates/sheet_ope.html:104 templates/sheet_ope_modif.html:104 #: templates/sheet_operation.html:104 msgid "Title" @@ -231,9 +232,9 @@ msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" #: furnitures/forms_common.py:339 furnitures/forms_common.py:362 -#: furnitures/forms_operations.py:304 furnitures/forms_operations.py:325 -#: furnitures/forms_operations.py:329 furnitures/models.py:476 -#: furnitures/models.py:586 furnitures/models.py:1128 +#: furnitures/forms_operations.py:305 furnitures/forms_operations.py:326 +#: furnitures/forms_operations.py:330 furnitures/models.py:507 +#: furnitures/models.py:617 furnitures/models.py:1144 msgid "Towns" msgstr "Communes" @@ -242,26 +243,26 @@ msgid "There are identical towns." msgstr "Il y a des communes identiques." #: furnitures/forms_common.py:365 furnitures/forms_common.py:413 -#: furnitures/forms_operations.py:332 furnitures/forms_operations.py:353 -#: furnitures/forms_operations.py:357 furnitures/models.py:658 +#: furnitures/forms_operations.py:333 furnitures/forms_operations.py:354 +#: furnitures/forms_operations.py:358 furnitures/models.py:696 msgid "Parcels" msgstr "Parcelles" -#: furnitures/forms_common.py:370 furnitures/models.py:653 +#: furnitures/forms_common.py:370 furnitures/models.py:691 #: templates/sheet_ope.html:62 templates/sheet_ope_modif.html:62 #: templates/sheet_operation.html:63 msgid "Section" msgstr "Section" -#: furnitures/forms_common.py:372 furnitures/models.py:654 +#: furnitures/forms_common.py:372 furnitures/models.py:692 msgid "Parcel number" msgstr "Numéro de parcelle" #: furnitures/forms_common.py:374 furnitures/forms_context_records.py:114 #: furnitures/forms_files.py:132 furnitures/forms_files.py:164 -#: furnitures/forms_files.py:184 furnitures/forms_items.py:140 -#: furnitures/forms_operations.py:193 furnitures/forms_operations.py:240 -#: furnitures/models.py:459 furnitures/models.py:578 furnitures/models.py:649 +#: furnitures/forms_files.py:184 furnitures/forms_items.py:139 +#: furnitures/forms_operations.py:194 furnitures/forms_operations.py:241 +#: furnitures/models.py:490 furnitures/models.py:609 furnitures/models.py:687 #: 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 @@ -274,14 +275,14 @@ msgstr "Année" msgid "All fields are required" msgstr "Tous les champs sont nécessaires" -#: furnitures/forms_context_records.py:76 furnitures/forms_items.py:79 +#: furnitures/forms_context_records.py:76 furnitures/forms_items.py:78 msgid "Current operation: " msgstr "Opération : " #: furnitures/forms_context_records.py:115 -#: furnitures/forms_context_records.py:204 furnitures/forms_items.py:115 -#: furnitures/forms_items.py:144 furnitures/forms_operations.py:377 -#: furnitures/models.py:697 +#: furnitures/forms_context_records.py:204 furnitures/forms_items.py:114 +#: furnitures/forms_items.py:143 furnitures/forms_operations.py:378 +#: furnitures/models.py:735 msgid "Period" msgstr "Période" @@ -298,14 +299,14 @@ msgid "You should select a context record." msgstr "Vous devez sélectionner une Unité d'Enregistrement." #: furnitures/forms_context_records.py:138 furnitures/forms_files.py:155 -#: furnitures/forms_operations.py:216 furnitures/forms_operations.py:567 +#: furnitures/forms_operations.py:217 furnitures/forms_operations.py:568 #: 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" -#: furnitures/forms_context_records.py:142 furnitures/forms_operations.py:334 -#: furnitures/models.py:657 furnitures/models.py:753 furnitures/models.py:989 +#: furnitures/forms_context_records.py:142 furnitures/forms_operations.py:335 +#: furnitures/models.py:695 furnitures/models.py:791 furnitures/models.py:1005 #: templates/sheet_contextrecord.html:110 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 @@ -314,47 +315,47 @@ msgstr "Général" msgid "Parcel" msgstr "Parcelle" -#: furnitures/forms_context_records.py:143 furnitures/forms_items.py:97 -#: furnitures/forms_items.py:236 furnitures/models.py:755 -#: furnitures/models.py:845 furnitures/models.py:922 +#: furnitures/forms_context_records.py:143 furnitures/forms_items.py:96 +#: furnitures/forms_items.py:237 furnitures/models.py:795 +#: furnitures/models.py:875 furnitures/models.py:951 #: templates/sheet_ope.html:125 templates/sheet_ope_modif.html:125 #: templates/sheet_operation.html:124 msgid "ID" msgstr "Identifiant" -#: furnitures/forms_context_records.py:145 furnitures/forms_items.py:99 -#: furnitures/forms_items.py:179 furnitures/models.py:756 -#: furnitures/models.py:846 furnitures/models.py:923 furnitures/models.py:1146 -#: templates/sheet_contextrecord.html:23 +#: furnitures/forms_context_records.py:145 furnitures/forms_items.py:98 +#: furnitures/forms_items.py:147 furnitures/forms_items.py:180 +#: furnitures/models.py:796 furnitures/models.py:876 furnitures/models.py:952 +#: furnitures/models.py:1162 templates/sheet_contextrecord.html:23 #: templates/sheet_contextrecord.html:107 templates/sheet_ope.html:128 #: templates/sheet_ope_modif.html:128 templates/sheet_ope_modif.html.py:154 #: templates/sheet_operation.html:127 templates/sheet_operation.html.py:156 msgid "Description" msgstr "Description" -#: furnitures/forms_context_records.py:147 furnitures/models.py:757 +#: furnitures/forms_context_records.py:147 furnitures/models.py:797 msgid "Length (cm)" msgstr "Longueur (cm)" -#: furnitures/forms_context_records.py:148 furnitures/models.py:758 +#: furnitures/forms_context_records.py:148 furnitures/models.py:798 msgid "Width (cm)" msgstr "Largeur (cm)" -#: furnitures/forms_context_records.py:149 furnitures/models.py:759 +#: furnitures/forms_context_records.py:149 furnitures/models.py:799 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" -#: furnitures/forms_context_records.py:150 furnitures/models.py:760 +#: furnitures/forms_context_records.py:150 furnitures/models.py:800 msgid "Depth (cm)" msgstr "Profondeur (cm)" -#: furnitures/forms_context_records.py:151 furnitures/models.py:765 +#: furnitures/forms_context_records.py:151 furnitures/models.py:805 msgid "Unit" msgstr "Unité" -#: furnitures/forms_context_records.py:153 furnitures/forms_items.py:185 -#: furnitures/models.py:761 furnitures/models.py:1087 -#: furnitures/models.py:1149 +#: furnitures/forms_context_records.py:153 furnitures/forms_items.py:186 +#: furnitures/models.py:801 furnitures/models.py:1103 +#: furnitures/models.py:1165 msgid "Location" msgstr "Lieu" @@ -363,38 +364,39 @@ msgid "This ID already exist for this operation." msgstr "Cet identifiant existe déjà pour cette opération." #: furnitures/forms_context_records.py:199 -#: furnitures/forms_context_records.py:221 furnitures/forms_items.py:110 -#: furnitures/models.py:706 furnitures/models.py:933 +#: furnitures/forms_context_records.py:221 furnitures/forms_items.py:109 +#: furnitures/models.py:744 furnitures/models.py:962 msgid "Dating" msgstr "Datation" -#: furnitures/forms_context_records.py:206 furnitures/forms_items.py:117 -#: furnitures/forms_items.py:190 furnitures/forms_operations.py:234 -#: furnitures/models.py:574 furnitures/models.py:674 furnitures/models.py:698 -#: furnitures/models.py:990 furnitures/models.py:1153 -#: furnitures/models.py:1189 templates/sheet_file.html:93 +#: furnitures/forms_context_records.py:206 furnitures/forms_items.py:116 +#: furnitures/forms_items.py:191 furnitures/forms_operations.py:235 +#: furnitures/models.py:605 furnitures/models.py:712 furnitures/models.py:736 +#: furnitures/models.py:1006 furnitures/models.py:1169 +#: furnitures/models.py:1195 templates/sheet_file.html:93 msgid "Start date" msgstr "Date de début" -#: furnitures/forms_context_records.py:207 furnitures/forms_items.py:119 -#: furnitures/forms_items.py:192 furnitures/models.py:675 -#: furnitures/models.py:699 furnitures/models.py:991 furnitures/models.py:1154 -#: furnitures/models.py:1190 templates/sheet_file.html:94 +#: furnitures/forms_context_records.py:207 furnitures/forms_items.py:118 +#: furnitures/forms_items.py:193 furnitures/models.py:713 +#: furnitures/models.py:737 furnitures/models.py:1007 +#: furnitures/models.py:1170 furnitures/models.py:1196 +#: templates/sheet_file.html:94 msgid "End date" msgstr "Date de fin" -#: furnitures/forms_context_records.py:208 furnitures/forms_items.py:120 -#: furnitures/models.py:702 +#: furnitures/forms_context_records.py:208 furnitures/forms_items.py:119 +#: furnitures/models.py:740 msgid "Quality" msgstr "Qualité" -#: furnitures/forms_context_records.py:210 furnitures/forms_items.py:122 -#: furnitures/models.py:688 furnitures/models.py:700 +#: furnitures/forms_context_records.py:210 furnitures/forms_items.py:121 +#: furnitures/models.py:726 furnitures/models.py:738 msgid "Dating type" msgstr "Type de datation" #: furnitures/forms_context_records.py:224 -#: furnitures/forms_context_records.py:231 furnitures/models.py:770 +#: furnitures/forms_context_records.py:231 furnitures/models.py:810 #: templates/sheet_contextrecord.html:32 msgid "Interpretation" msgstr "Interpretation" @@ -403,31 +405,31 @@ msgstr "Interpretation" msgid "Has furniture?" msgstr "A du matériel ?" -#: furnitures/forms_context_records.py:229 furnitures/models.py:769 +#: furnitures/forms_context_records.py:229 furnitures/models.py:809 msgid "Filling" msgstr "Remplissage" -#: furnitures/forms_context_records.py:233 furnitures/models.py:785 +#: furnitures/forms_context_records.py:233 furnitures/models.py:825 msgid "Activity" msgstr "Activité" -#: furnitures/forms_context_records.py:235 furnitures/models.py:783 +#: furnitures/forms_context_records.py:235 furnitures/models.py:823 msgid "Identification" msgstr "Identification" -#: furnitures/forms_context_records.py:237 furnitures/models.py:772 +#: furnitures/forms_context_records.py:237 furnitures/models.py:812 msgid "TAQ" msgstr "TAQ" -#: furnitures/forms_context_records.py:238 furnitures/models.py:775 +#: furnitures/forms_context_records.py:238 furnitures/models.py:815 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: furnitures/forms_context_records.py:240 furnitures/models.py:777 +#: furnitures/forms_context_records.py:240 furnitures/models.py:817 msgid "TPQ" msgstr "TPQ" -#: furnitures/forms_context_records.py:241 furnitures/models.py:780 +#: furnitures/forms_context_records.py:241 furnitures/models.py:820 msgid "Estimated TPQ" msgstr "TPQ estimé" @@ -436,7 +438,7 @@ msgid "Would you like to delete this context record?" msgstr "Voulez vous supprimer cette Unité d'Enregistrement ?" #: furnitures/forms_files.py:129 furnitures/forms_files.py:174 -#: furnitures/models.py:464 +#: furnitures/models.py:495 msgid "File type" msgstr "Type de dossier" @@ -453,37 +455,37 @@ msgid "You should select a file." msgstr "Vous devez sélectionner un dossier archéologique." #: furnitures/forms_files.py:168 furnitures/forms_files.py:186 -#: furnitures/models.py:461 +#: furnitures/models.py:492 msgid "Numeric reference" msgstr "Référence numérique" #: furnitures/forms_files.py:170 furnitures/forms_files.py:188 -#: furnitures/models.py:462 +#: furnitures/models.py:493 msgid "Internal reference" msgstr "Référence interne" -#: furnitures/forms_files.py:172 furnitures/models.py:477 +#: furnitures/forms_files.py:172 furnitures/models.py:508 msgid "Creation date" msgstr "Date de création" -#: furnitures/forms_files.py:176 furnitures/models.py:481 +#: furnitures/forms_files.py:176 furnitures/models.py:512 msgid "Related file" msgstr "Dossier en relation avec" -#: furnitures/forms_files.py:196 furnitures/forms_operations.py:237 -#: furnitures/models.py:488 +#: furnitures/forms_files.py:196 furnitures/forms_operations.py:238 +#: furnitures/models.py:519 msgid "Total surface (m²)" msgstr "Surface totale (m²)" -#: furnitures/forms_files.py:199 furnitures/models.py:492 +#: furnitures/forms_files.py:199 furnitures/models.py:523 msgid "Main address" msgstr "Adresse principale" -#: furnitures/forms_files.py:200 furnitures/models.py:493 +#: furnitures/forms_files.py:200 furnitures/models.py:524 msgid "Main address - complement" msgstr "Adresse principale - complément" -#: furnitures/forms_files.py:202 furnitures/models.py:495 +#: furnitures/forms_files.py:202 furnitures/models.py:526 msgid "Main address - postal code" msgstr "Adresse principale - code postal" @@ -491,28 +493,28 @@ msgstr "Adresse principale - code postal" msgid "Preventive informations" msgstr "Information archéologie préventive" -#: furnitures/forms_files.py:211 furnitures/models.py:468 +#: furnitures/forms_files.py:211 furnitures/models.py:499 msgid "General contractor" msgstr "Aménageur" -#: furnitures/forms_files.py:218 furnitures/models.py:470 +#: furnitures/forms_files.py:218 furnitures/models.py:501 msgid "Town planning service" msgstr "Service instructeur" -#: furnitures/forms_files.py:224 furnitures/models.py:446 -#: furnitures/models.py:471 +#: furnitures/forms_files.py:224 furnitures/models.py:477 +#: furnitures/models.py:502 msgid "Permit type" msgstr "Type de permis" -#: furnitures/forms_files.py:226 furnitures/models.py:473 +#: furnitures/forms_files.py:226 furnitures/models.py:504 msgid "Permit reference" msgstr "Référence du permis" -#: furnitures/forms_files.py:229 furnitures/models.py:491 +#: furnitures/forms_files.py:229 furnitures/models.py:522 msgid "Total developed surface (m²)" msgstr "Surface totale aménagée (m²)" -#: furnitures/forms_files.py:235 furnitures/models.py:479 +#: furnitures/forms_files.py:235 furnitures/models.py:510 msgid "Reception date" msgstr "Date de réception" @@ -525,103 +527,104 @@ msgid "Would you like to delete this archaelogical file ?" msgstr "Voulez vous supprimer ce dossier archéologique ?" #: furnitures/forms_files.py:329 furnitures/forms_files.py:346 -#: furnitures/forms_operations.py:540 furnitures/forms_operations.py:570 -#: furnitures/models.py:1033 furnitures/models.py:1041 +#: furnitures/forms_operations.py:541 furnitures/forms_operations.py:571 +#: furnitures/models.py:1049 furnitures/models.py:1057 msgid "Act type" msgstr "Type d'acte" -#: furnitures/forms_items.py:80 +#: furnitures/forms_items.py:79 msgid "Current context record: " msgstr "Unité d'Enregistrement : " -#: furnitures/forms_items.py:94 furnitures/menus.py:193 -#: furnitures/models.py:937 furnitures/models.py:1185 +#: furnitures/forms_items.py:93 furnitures/menus.py:193 +#: furnitures/models.py:966 furnitures/models.py:1000 +#: furnitures/models.py:1191 msgid "Item" msgstr "Mobilier" -#: furnitures/forms_items.py:101 furnitures/forms_items.py:147 -#: furnitures/models.py:849 +#: furnitures/forms_items.py:100 furnitures/forms_items.py:148 +#: furnitures/models.py:879 msgid "Is isolated?" msgstr "Est isolé ?" -#: furnitures/forms_items.py:103 furnitures/forms_items.py:146 -#: furnitures/forms_items.py:240 furnitures/models.py:841 -#: furnitures/models.py:925 templates/sheet_contextrecord.html:104 +#: furnitures/forms_items.py:102 furnitures/forms_items.py:146 +#: furnitures/forms_items.py:241 furnitures/models.py:871 +#: furnitures/models.py:954 templates/sheet_contextrecord.html:104 #: templates/sheet_operation.html:153 msgid "Material type" msgstr "Type de matériau" -#: furnitures/forms_items.py:105 furnitures/forms_items.py:242 -#: furnitures/models.py:926 furnitures/models.py:1079 +#: furnitures/forms_items.py:104 furnitures/forms_items.py:243 +#: furnitures/models.py:955 furnitures/models.py:1095 msgid "Volume (l)" msgstr "Volume (l)" -#: furnitures/forms_items.py:106 furnitures/forms_items.py:243 -#: furnitures/models.py:927 +#: furnitures/forms_items.py:105 furnitures/forms_items.py:244 +#: furnitures/models.py:956 msgid "Weight (g)" msgstr "Poids (g)" -#: furnitures/forms_items.py:107 furnitures/forms_items.py:244 -#: furnitures/models.py:928 +#: furnitures/forms_items.py:106 furnitures/forms_items.py:245 +#: furnitures/models.py:957 msgid "Item number" msgstr "Nombre d'éléments" -#: furnitures/forms_items.py:142 +#: furnitures/forms_items.py:141 msgid "Code PATRIARCHE" msgstr "" -#: furnitures/forms_items.py:150 +#: furnitures/forms_items.py:151 msgid "Item search" msgstr "Recherche de mobilier" -#: furnitures/forms_items.py:173 +#: furnitures/forms_items.py:174 msgid "Base treatment" msgstr "Traitement de base" -#: furnitures/forms_items.py:177 furnitures/models.py:1140 -#: furnitures/models.py:1148 +#: furnitures/forms_items.py:178 furnitures/models.py:1156 +#: furnitures/models.py:1164 msgid "Treatment type" msgstr "Type de traitement" -#: furnitures/forms_items.py:196 +#: furnitures/forms_items.py:197 msgid "Upstream items" msgstr "Mobilier amont" -#: furnitures/forms_items.py:204 furnitures/models.py:1094 -#: furnitures/models.py:1144 +#: furnitures/forms_items.py:205 furnitures/models.py:1110 +#: furnitures/models.py:1160 msgid "Container" msgstr "Contenant" -#: furnitures/forms_items.py:206 furnitures/models.py:1080 -#: furnitures/models.py:1090 templates/sheet_file.html:69 +#: furnitures/forms_items.py:207 furnitures/models.py:1096 +#: furnitures/models.py:1106 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 msgid "Reference" msgstr "Référence" -#: furnitures/forms_items.py:207 furnitures/models.py:1083 -#: furnitures/models.py:1089 +#: furnitures/forms_items.py:208 furnitures/models.py:1099 +#: furnitures/models.py:1105 msgid "Container type" msgstr "Type de contenant" -#: furnitures/forms_items.py:234 +#: furnitures/forms_items.py:235 msgid "Resulting item" msgstr "Mobilier résultant" -#: furnitures/forms_items.py:238 +#: furnitures/forms_items.py:239 msgid "Precise description" msgstr "Description précise" -#: furnitures/forms_items.py:248 +#: furnitures/forms_items.py:249 msgid "Resulting items" msgstr "Mobiliers résultants" -#: furnitures/forms_items.py:251 +#: furnitures/forms_items.py:252 msgid "Upstream item" msgstr "Mobilier amont" -#: furnitures/forms_operations.py:182 +#: furnitures/forms_operations.py:183 msgid "" "Warning: No Archaelogical File is provided. If you have forget it return to " "the first step." @@ -629,36 +632,36 @@ msgstr "" "Attention : Aucun dossier archéologique n'a été précisé. S'il s'agit d'un " "oubli, définissez le à la première étape." -#: furnitures/forms_operations.py:189 furnitures/forms_operations.py:232 -#: furnitures/models.py:554 furnitures/models.py:583 +#: furnitures/forms_operations.py:190 furnitures/forms_operations.py:233 +#: furnitures/models.py:585 furnitures/models.py:614 msgid "Operation type" msgstr "Type d'opération" -#: furnitures/forms_operations.py:191 furnitures/models.py:585 +#: furnitures/forms_operations.py:192 furnitures/models.py:616 msgid "Remains" msgstr "Vestiges" -#: furnitures/forms_operations.py:201 +#: furnitures/forms_operations.py:202 msgid "Operation search" msgstr "Recherche d'opérations" -#: furnitures/forms_operations.py:212 +#: furnitures/forms_operations.py:213 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." -#: furnitures/forms_operations.py:221 furnitures/models.py:1043 +#: furnitures/forms_operations.py:222 furnitures/models.py:1059 msgid "Person in charge of the operation" msgstr "Responsable d'opération" -#: furnitures/forms_operations.py:253 +#: furnitures/forms_operations.py:254 msgid "References" msgstr "Référence" -#: furnitures/forms_operations.py:260 furnitures/models.py:579 +#: furnitures/forms_operations.py:261 furnitures/models.py:610 msgid "Operation code" msgstr "Code de l'opération" -#: furnitures/forms_operations.py:279 +#: furnitures/forms_operations.py:280 #, python-format msgid "" "Operation code already exist for year: %(year)d - use a value bigger than " @@ -667,79 +670,79 @@ msgstr "" "Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur " "plus grande que %(last_val)d" -#: furnitures/forms_operations.py:285 +#: furnitures/forms_operations.py:286 msgid "Preventive informations - excavation" msgstr "Information archéologie préventive - fouille" -#: furnitures/forms_operations.py:286 furnitures/models.py:587 +#: furnitures/forms_operations.py:287 furnitures/models.py:618 msgid "Cost (€)" msgstr "Cout (€)" -#: furnitures/forms_operations.py:294 +#: furnitures/forms_operations.py:295 msgid "Preventive informations - diagnostic" msgstr "Information archéologie préventive - diagnostic" -#: furnitures/forms_operations.py:297 furnitures/models.py:598 +#: furnitures/forms_operations.py:298 furnitures/models.py:629 msgid "Prescription on zoning" msgstr "Prescription sur zonage" -#: furnitures/forms_operations.py:299 furnitures/models.py:600 +#: furnitures/forms_operations.py:300 furnitures/models.py:631 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" -#: furnitures/forms_operations.py:301 furnitures/models.py:602 +#: furnitures/forms_operations.py:302 furnitures/models.py:633 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" -#: furnitures/forms_operations.py:360 furnitures/forms_operations.py:372 -#: furnitures/models.py:569 +#: furnitures/forms_operations.py:361 furnitures/forms_operations.py:373 +#: furnitures/models.py:600 msgid "Remain types" msgstr "Types de vestige" -#: furnitures/forms_operations.py:362 furnitures/models.py:568 +#: furnitures/forms_operations.py:363 furnitures/models.py:599 msgid "Remain type" msgstr "Type de vestige" -#: furnitures/forms_operations.py:375 furnitures/forms_operations.py:387 -#: furnitures/models.py:588 templates/sheet_contextrecord.html:106 +#: furnitures/forms_operations.py:376 furnitures/forms_operations.py:388 +#: furnitures/models.py:619 templates/sheet_contextrecord.html:106 #: templates/sheet_ope_modif.html:153 templates/sheet_operation.html:155 msgid "Periods" msgstr "Périodes" -#: furnitures/forms_operations.py:467 furnitures/forms_operations.py:468 -#: furnitures/models.py:575 +#: furnitures/forms_operations.py:468 furnitures/forms_operations.py:469 +#: furnitures/models.py:606 msgid "Closing date" msgstr "Date de clotûre" -#: furnitures/forms_operations.py:478 +#: furnitures/forms_operations.py:479 msgid "Would you like to close this operation?" msgstr "Voulez vous clôturer cette opération ?" -#: furnitures/forms_operations.py:491 +#: furnitures/forms_operations.py:492 msgid "Would you like to delete this operation?" msgstr "Voulez vous supprimer cette opération ?" -#: furnitures/forms_operations.py:550 +#: furnitures/forms_operations.py:551 msgid "Administrative act search" msgstr "Recherche d'actes administratifs" -#: furnitures/forms_operations.py:562 +#: furnitures/forms_operations.py:563 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: furnitures/forms_operations.py:571 furnitures/models.py:1049 +#: furnitures/forms_operations.py:572 furnitures/models.py:1065 msgid "Signatory" msgstr "Signataire" -#: furnitures/forms_operations.py:575 furnitures/models.py:1055 +#: furnitures/forms_operations.py:576 furnitures/models.py:1071 msgid "Object" msgstr "Objet" -#: furnitures/forms_operations.py:577 furnitures/models.py:1054 +#: furnitures/forms_operations.py:578 furnitures/models.py:1070 msgid "Signature date" msgstr "Date de signature" -#: furnitures/forms_operations.py:604 +#: furnitures/forms_operations.py:605 msgid "Would you like to delete this administrative act?" msgstr "Voulez vous supprimer cet acte administratif ?" @@ -772,8 +775,8 @@ msgstr "Recherche" msgid "Deletion" msgstr "Suppression" -#: furnitures/menus.py:116 furnitures/menus.py:155 furnitures/models.py:1061 -#: furnitures/models.py:1187 +#: furnitures/menus.py:116 furnitures/menus.py:155 furnitures/models.py:1077 +#: furnitures/models.py:1193 msgid "Administrative act" msgstr "Acte administratif" @@ -786,8 +789,8 @@ msgstr "Ajout" msgid "Closing" msgstr "Clotûre" -#: furnitures/menus.py:174 templates/sheet_contextrecord.html:105 -#: templates/sheet_operation.html:154 +#: furnitures/menus.py:174 furnitures/models.py:863 +#: templates/sheet_contextrecord.html:105 templates/sheet_operation.html:154 msgid "Context record" msgstr "Unité d'Enregistrement" @@ -795,7 +798,7 @@ msgstr "Unité d'Enregistrement" msgid "Add a treatment" msgstr "Ajouter un traitement" -#: furnitures/menus.py:212 furnitures/models.py:1014 +#: furnitures/menus.py:212 furnitures/models.py:1030 msgid "Warehouse" msgstr "Dépôt" @@ -823,15 +826,15 @@ msgstr "Tableau de bord" msgid "Files" msgstr "Dossiers" -#: furnitures/menus.py:232 furnitures/models.py:608 +#: furnitures/menus.py:232 furnitures/models.py:639 msgid "Operations" msgstr "Opérations" -#: furnitures/menus.py:235 furnitures/models.py:1159 +#: furnitures/menus.py:235 furnitures/models.py:1175 msgid "Treatments" msgstr "Traitements" -#: furnitures/menus.py:238 furnitures/models.py:1015 +#: furnitures/menus.py:238 furnitures/models.py:1031 msgid "Warehouses" msgstr "Dépôts" @@ -879,7 +882,7 @@ msgstr "Téléphone portable" msgid "Organization types" msgstr "Types d'organisation" -#: furnitures/models.py:359 furnitures/models.py:389 furnitures/models.py:826 +#: furnitures/models.py:359 furnitures/models.py:389 furnitures/models.py:452 #: templates/sheet_contextrecord.html:84 templates/sheet_file.html:70 #: templates/sheet_file.html.py:91 templates/sheet_file.html:118 #: templates/sheet_ope.html:85 templates/sheet_ope.html.py:105 @@ -970,156 +973,190 @@ msgstr "Utilisateur d'Ishtar" msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" +#: furnitures/models.py:431 furnitures/models.py:436 +msgid "Author type" +msgstr "Type d'auteur" + #: furnitures/models.py:432 +msgid "Author types" +msgstr "Types d'auteur" + +#: furnitures/models.py:439 +msgid "Author" +msgstr "Auteur" + +#: furnitures/models.py:440 furnitures/models.py:453 +#: templates/sheet_contextrecord.html:85 templates/sheet_ope.html:106 +#: templates/sheet_ope_modif.html:106 templates/sheet_operation.html:106 +msgid "Authors" +msgstr "Auteurs" + +#: furnitures/models.py:447 +msgid "Source type" +msgstr "Type de source" + +#: furnitures/models.py:448 +msgid "Source types" +msgstr "Types de source" + +#: furnitures/models.py:463 msgid "Archaeological file type" msgstr "Type de dossier archéologique" -#: furnitures/models.py:433 +#: furnitures/models.py:464 msgid "Archaeological file types" msgstr "Types de dossier archéologique" -#: furnitures/models.py:447 +#: furnitures/models.py:478 msgid "Permit types" msgstr "Types de permis" -#: furnitures/models.py:451 +#: furnitures/models.py:482 msgid "Delay (in days)" msgstr "Delai (en jours)" -#: furnitures/models.py:475 +#: furnitures/models.py:506 msgid "Is active?" msgstr "Est actif ?" -#: furnitures/models.py:486 +#: furnitures/models.py:517 msgid "Reference number" msgstr "Référence" -#: furnitures/models.py:501 +#: furnitures/models.py:532 msgid "Archaeological file" msgstr "Dossier archéologique" -#: furnitures/models.py:502 +#: furnitures/models.py:533 msgid "Archaeological files" msgstr "Dossiers archéologiques" -#: furnitures/models.py:504 +#: furnitures/models.py:535 msgid "Can view own Archaelogical file" msgstr "Peut voir son propre Dossier archéologique" -#: furnitures/models.py:505 +#: furnitures/models.py:536 msgid "Can add own Archaelogical file" msgstr "Peut ajouter son propre Dossier archéologique" -#: furnitures/models.py:506 +#: furnitures/models.py:537 msgid "Can change own Archaelogical file" msgstr "Peut changer son propre Dossier archéologique" -#: furnitures/models.py:507 +#: furnitures/models.py:538 msgid "Can delete own Archaelogical file" msgstr "Peut supprimer son propre Dossier archéologique" -#: furnitures/models.py:512 furnitures/models.py:617 +#: furnitures/models.py:543 furnitures/models.py:648 msgid "Intercommunal" msgstr "Intercommunal" -#: furnitures/models.py:555 +#: furnitures/models.py:586 msgid "Operation types" msgstr "Types d'opération" -#: furnitures/models.py:577 templates/sheet_file.html:92 +#: furnitures/models.py:608 templates/sheet_file.html:92 msgid "In charge" msgstr "Responsable" -#: furnitures/models.py:581 furnitures/models.py:646 +#: furnitures/models.py:612 furnitures/models.py:684 msgid "File" msgstr "Dossier" -#: furnitures/models.py:584 furnitures/models.py:1114 +#: furnitures/models.py:615 furnitures/models.py:1130 msgid "Surface (m²)" msgstr "Area (m²)" -#: furnitures/models.py:610 +#: furnitures/models.py:641 msgid "Can view own Operation" msgstr "Peut voir sa propre Opération" -#: furnitures/models.py:611 +#: furnitures/models.py:642 msgid "Can add own Operation" msgstr "Peut ajouter sa propre Opération" -#: furnitures/models.py:612 +#: furnitures/models.py:643 msgid "Can change own Operation" msgstr "Peut changer sa propre Opération" -#: furnitures/models.py:613 +#: furnitures/models.py:644 msgid "Can delete own Operation" msgstr "Peut supprimer sa propre Opération" -#: furnitures/models.py:673 furnitures/models.py:717 furnitures/models.py:729 -#: furnitures/models.py:739 furnitures/models.py:921 +#: furnitures/models.py:677 +msgid "Operation documentation" +msgstr "Documentation d'une opération" + +#: furnitures/models.py:678 +msgid "Operation documentations" +msgstr "Documentations des opérations" + +#: furnitures/models.py:711 furnitures/models.py:755 furnitures/models.py:767 +#: furnitures/models.py:777 furnitures/models.py:950 msgid "Order" msgstr "Ordre" -#: furnitures/models.py:676 +#: furnitures/models.py:714 msgid "Parent period" msgstr "Période parente" -#: furnitures/models.py:680 +#: furnitures/models.py:718 msgid "Type Period" msgstr "Type de période" -#: furnitures/models.py:681 +#: furnitures/models.py:719 msgid "Types Period" msgstr "Types de période" -#: furnitures/models.py:689 +#: furnitures/models.py:727 msgid "Dating types" msgstr "Types de datation" -#: furnitures/models.py:693 +#: furnitures/models.py:731 msgid "Dating quality" msgstr "Qualité de datation" -#: furnitures/models.py:694 +#: furnitures/models.py:732 msgid "Dating qualities" msgstr "Qualités de datation" -#: furnitures/models.py:707 +#: furnitures/models.py:745 msgid "Datings" msgstr "Datations" -#: furnitures/models.py:718 +#: furnitures/models.py:756 msgid "Parent unit" msgstr "Unité parente" -#: furnitures/models.py:722 +#: furnitures/models.py:760 msgid "Type Unit" msgstr "Type d'unité" -#: furnitures/models.py:723 +#: furnitures/models.py:761 msgid "Types Unit" msgstr "Types d'unité" -#: furnitures/models.py:732 +#: furnitures/models.py:770 msgid "Type Activity" msgstr "Type d'activité" -#: furnitures/models.py:733 +#: furnitures/models.py:771 msgid "Types Activity" msgstr "Types d'activités" -#: furnitures/models.py:741 +#: furnitures/models.py:779 msgid "Type Identification" msgstr "Type d'identification" -#: furnitures/models.py:742 +#: furnitures/models.py:780 msgid "Types Identification" msgstr "Types d'identification" -#: furnitures/models.py:763 +#: furnitures/models.py:803 msgid "A short description of the location of the context record" msgstr "Une courte description de la situation de l'Unité d'Enregistrement" -#: furnitures/models.py:773 +#: furnitures/models.py:813 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" @@ -1127,11 +1164,11 @@ msgstr "" "« Terminus Ante Quem » l'Unité d'Enregistrement ne peut avoir été crée après " "cette date" -#: furnitures/models.py:776 +#: furnitures/models.py:816 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "Estimation d'un « Terminus Ante Quem »" -#: furnitures/models.py:778 +#: furnitures/models.py:818 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" @@ -1139,205 +1176,205 @@ msgstr "" "« Terminus Post Quem » l'Unité d'Enregistrement ne peut avoir été crée avant " "cette date" -#: furnitures/models.py:781 +#: furnitures/models.py:821 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »" -#: furnitures/models.py:789 furnitures/models.py:790 furnitures/models.py:848 +#: furnitures/models.py:829 furnitures/models.py:830 furnitures/models.py:878 #: templates/sheet_contextrecord.html:6 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: furnitures/models.py:792 +#: furnitures/models.py:832 msgid "Can view own Context Record" msgstr "Peut voir sa propre Unité d'Enregistrement" -#: furnitures/models.py:793 +#: furnitures/models.py:833 msgid "Can add own Context Record" msgstr "Peut ajouter sa propre Unité d'Enregistrement" -#: furnitures/models.py:794 +#: furnitures/models.py:834 msgid "Can change own Context Record" msgstr "Peut changer sa propre Unité d'Enregistrement" -#: furnitures/models.py:795 +#: furnitures/models.py:835 msgid "Can delete own Context Record" msgstr "Peut supprimer sa propre Unité d'Enregistrement" -#: furnitures/models.py:821 -msgid "Source type" -msgstr "Type de source" - -#: furnitures/models.py:822 -msgid "Source types" -msgstr "Types de source" - -#: furnitures/models.py:829 furnitures/models.py:1174 -msgid "Source" -msgstr "Source" +#: furnitures/models.py:860 +msgid "Context record documentation" +msgstr "Documentation d'une Unité d'Enregistrement" -#: furnitures/models.py:830 -msgid "Sources" -msgstr "Sources" +#: furnitures/models.py:861 +msgid "Context record documentations" +msgstr "Documentations des Unités d'Enregistrement" -#: furnitures/models.py:836 +#: furnitures/models.py:866 msgid "Recommendation" msgstr "Recommendation" -#: furnitures/models.py:838 +#: furnitures/models.py:868 msgid "Parent material" msgstr "Matériau parent" -#: furnitures/models.py:842 +#: furnitures/models.py:872 msgid "Material types" msgstr "Types de matériaux" -#: furnitures/models.py:857 furnitures/models.py:919 +#: furnitures/models.py:886 furnitures/models.py:948 msgid "Base item" msgstr "Mobilier de base" -#: furnitures/models.py:858 +#: furnitures/models.py:887 msgid "Base items" msgstr "Mobiliers de base" -#: furnitures/models.py:860 +#: furnitures/models.py:889 msgid "Can view own Base item" msgstr "Peut voir son propre Mobilier de base" -#: furnitures/models.py:861 +#: furnitures/models.py:890 msgid "Can add own Base item" msgstr "Peut ajouter son propre Mobilier de base" -#: furnitures/models.py:862 +#: furnitures/models.py:891 msgid "Can change own Base item" msgstr "Peut changer son propre Mobilier de base" -#: furnitures/models.py:863 +#: furnitures/models.py:892 msgid "Can delete own Base item" msgstr "Peut supprimer son propre Mobilier de base" -#: furnitures/models.py:879 +#: furnitures/models.py:908 msgid ":" msgstr ": " -#: furnitures/models.py:930 +#: furnitures/models.py:959 msgid "Upstream treatment" msgstr "Traitement amont" -#: furnitures/models.py:932 +#: furnitures/models.py:961 msgid "Downstream treatment" msgstr "Traitement aval" -#: furnitures/models.py:938 +#: furnitures/models.py:967 msgid "Items" msgstr "Mobiliers" -#: furnitures/models.py:940 +#: furnitures/models.py:969 msgid "Can view own Item" msgstr "Peut voir son propre Mobilier" -#: furnitures/models.py:941 +#: furnitures/models.py:970 msgid "Can add own Item" msgstr "Peut ajouter son propre Mobilier" -#: furnitures/models.py:942 +#: furnitures/models.py:971 msgid "Can change own Item" msgstr "Peut changer son propre Mobilier" -#: furnitures/models.py:943 +#: furnitures/models.py:972 msgid "Can delete own Item" msgstr "Peut supprimer son propre Mobilier" -#: furnitures/models.py:988 templates/sheet_ope.html:64 +#: furnitures/models.py:998 +msgid "Item documentation" +msgstr "Documentation du mobilier" + +#: furnitures/models.py:999 +msgid "Item documentations" +msgstr "Documentations des mobiliers" + +#: furnitures/models.py:1004 templates/sheet_ope.html:64 #: templates/sheet_ope_modif.html:64 msgid "Owner" msgstr "Propriétaire" -#: furnitures/models.py:994 +#: furnitures/models.py:1010 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: furnitures/models.py:995 +#: furnitures/models.py:1011 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: furnitures/models.py:1003 +#: furnitures/models.py:1019 msgid "Warehouse types" msgstr "Types de dépôts" -#: furnitures/models.py:1017 +#: furnitures/models.py:1033 msgid "Can view own Warehouse" msgstr "Peut voir son propre Dépôt" -#: furnitures/models.py:1018 +#: furnitures/models.py:1034 msgid "Can add own Warehouse" msgstr "Peut ajouter son propre Dépôt" -#: furnitures/models.py:1019 +#: furnitures/models.py:1035 msgid "Can change own Warehouse" msgstr "Peut changer son propre Dépôt" -#: furnitures/models.py:1020 +#: furnitures/models.py:1036 msgid "Can delete own Warehouse" msgstr "Peut supprimer son propre Dépôt" -#: furnitures/models.py:1030 +#: furnitures/models.py:1046 msgid "Intended to" msgstr "Destiné à" -#: furnitures/models.py:1034 +#: furnitures/models.py:1050 msgid "Act types" msgstr "Types d'acte" -#: furnitures/models.py:1045 +#: furnitures/models.py:1061 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: furnitures/models.py:1047 +#: furnitures/models.py:1063 msgid "Person in charge of the scientific part" msgstr "Responsable scientifique" -#: furnitures/models.py:1062 +#: furnitures/models.py:1078 msgid "Administrative acts" msgstr "Actes administratifs" -#: furnitures/models.py:1064 +#: furnitures/models.py:1080 msgid "Can view own Administrative act" msgstr "Peut voir son propre Acte administratif" -#: furnitures/models.py:1065 +#: furnitures/models.py:1081 msgid "Can add own Administrative act" msgstr "Peut ajouter son propre Acte administratif" -#: furnitures/models.py:1066 +#: furnitures/models.py:1082 msgid "Can change own Administrative act" msgstr "Peut changer son propre Acte administratif" -#: furnitures/models.py:1067 +#: furnitures/models.py:1083 msgid "Can delete own Administrative act" msgstr "Peut supprimer son propre Acte administratif" -#: furnitures/models.py:1076 +#: furnitures/models.py:1092 msgid "Length (mm)" msgstr "Longueur (mm) :" -#: furnitures/models.py:1077 +#: furnitures/models.py:1093 msgid "Width (mm)" msgstr "Largeur (mm) :" -#: furnitures/models.py:1078 +#: furnitures/models.py:1094 msgid "Height (mm)" msgstr "Hauteur (mm)" -#: furnitures/models.py:1084 +#: furnitures/models.py:1100 msgid "Container types" msgstr "Types de contenant" -#: furnitures/models.py:1095 +#: furnitures/models.py:1111 msgid "Containers" msgstr "Contenants" -#: furnitures/models.py:1115 templates/sheet_contextrecord.html:72 +#: furnitures/models.py:1131 templates/sheet_contextrecord.html:72 #: templates/sheet_contextrecord.html:86 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 @@ -1345,57 +1382,47 @@ msgstr "Contenants" msgid "Localisation" msgstr "Localisation" -#: furnitures/models.py:1138 +#: furnitures/models.py:1154 msgid "Virtual" msgstr "Virtuel" -#: furnitures/models.py:1141 +#: furnitures/models.py:1157 msgid "Treatment types" msgstr "Types de traitements" -#: furnitures/models.py:1158 +#: furnitures/models.py:1174 furnitures/models.py:1187 msgid "Treatment" msgstr "Traitement" -#: furnitures/models.py:1161 +#: furnitures/models.py:1177 msgid "Can view own Treatment" msgstr "Peut voir son propre Traitement" -#: furnitures/models.py:1162 +#: furnitures/models.py:1178 msgid "Can add own Treatment" msgstr "Peut ajouter son propre Traitement" -#: furnitures/models.py:1163 +#: furnitures/models.py:1179 msgid "Can change own Treatment" msgstr "Peut changer son propre Traitement" -#: furnitures/models.py:1164 +#: furnitures/models.py:1180 msgid "Can delete own Treatment" msgstr "Peut supprimer son propre traitement" -#: furnitures/models.py:1169 furnitures/models.py:1175 -msgid "Author type" -msgstr "Type d'auteur" - -#: furnitures/models.py:1170 -msgid "Author types" -msgstr "Types d'auteur" +#: furnitures/models.py:1185 +msgid "Treatment documentation" +msgstr "Documentation d'un traitement" -#: furnitures/models.py:1178 -msgid "Author" -msgstr "Auteur" +#: furnitures/models.py:1186 +msgid "Treament documentations" +msgstr "Documentations des traitements" -#: furnitures/models.py:1179 templates/sheet_contextrecord.html:85 -#: templates/sheet_ope.html:106 templates/sheet_ope_modif.html:106 -#: templates/sheet_operation.html:106 -msgid "Authors" -msgstr "Auteurs" - -#: furnitures/models.py:1193 +#: furnitures/models.py:1199 msgid "Property" msgstr "Propriété" -#: furnitures/models.py:1194 +#: furnitures/models.py:1200 msgid "Properties" msgstr "Propriétés" @@ -1410,15 +1437,15 @@ msgstr "Non" #: furnitures/views.py:255 templates/sheet_contextrecord.html:128 #: templates/sheet_file.html:106 templates/sheet_ope.html:139 #: templates/sheet_ope_modif.html:139 templates/sheet_ope_modif.html.py:175 -#: templates/sheet_operation.html:139 templates/sheet_operation.html.py:179 +#: templates/sheet_operation.html:139 templates/sheet_operation.html.py:178 msgid "Details" msgstr "Détails" -#: furnitures/views.py:511 furnitures/views.py:543 +#: furnitures/views.py:514 furnitures/views.py:546 msgid "Operation not permitted." msgstr "Opération non permise" -#: furnitures/views.py:514 +#: furnitures/views.py:517 #, python-format msgid "New %s" msgstr "Nouveau %s" @@ -2001,22 +2028,18 @@ msgid "No context record associated to this operation (no parcel)" msgstr "" "Pas d'Unité d'Enregistrement associée à cette opération (pas de parcelle)" -#: templates/sheet_operation.html:183 +#: templates/sheet_operation.html:182 msgid "No find associated to context record" msgstr "Pas de mobilier associé à cette Unité d'Enregistrement" -#: templates/sheet_operation.html:186 +#: templates/sheet_operation.html:185 msgid "No find associated to parcel" msgstr "Pas de mobilier associé à cette parcelle" -#: templates/sheet_operation.html:186 +#: templates/sheet_operation.html:185 msgid "(no context record)" msgstr "(pas d'Unité d'Enregistrement)" -#: templates/sheet_operation.html:189 -msgid "No find associated to this operation (no parcel)" -msgstr "Pas de mobilier associé à cette opération (pas de parcelle)" - #: templates/towns_wizard.html:33 msgid "No town set in the associated file." msgstr "" @@ -2110,3 +2133,12 @@ msgid "You are now registered. Activation email sent." msgstr "" "Vous être maintenant enregistré. Un courriel d'activation de votre compte " "vous a été envoyé." + +#~ msgid "Source" +#~ msgstr "Source" + +#~ msgid "Sources" +#~ msgstr "Sources" + +#~ msgid "No find associated to this operation (no parcel)" +#~ msgstr "Pas de mobilier associé à cette opération (pas de parcelle)" |