Merge branch 'master' into v0.9

4 files changed, 203 insertions, 195 deletions

diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index 3bb65fc21..2ab5ba28f 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -156,7 +156,7 @@ class ChoiceChecker(object):
 class UnicodeFormater(Formater):
     def __init__(self, max_length=None, clean=False, re_filter=None,
                  notnull=False, prefix=u'', db_target=None,
-                 import_instance=None):
+                 import_instance=None, many_split=None):
         self.max_length = max_length
         self.db_target = db_target
         self.clean = clean
@@ -164,6 +164,7 @@ class UnicodeFormater(Formater):
         self.notnull = notnull
         self.prefix = prefix
         self.import_instance = import_instance
+        self.many_split = many_split
 
     def format(self, value):
         try:
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index 4a7e66801..c43a1e9ae 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -26,125 +26,125 @@ msgstr ""
 msgid "Export selected as CSV file"
 msgstr ""
 
-#: data_importer.py:192
+#: data_importer.py:193
 #, python-format
 msgid "\"%(value)s\" is too long. The max length is %(length)d characters."
 msgstr ""
 
-#: data_importer.py:209
+#: data_importer.py:210
 #, python-format
 msgid "\"%(value)s\" not equal to yes or no"
 msgstr ""
 
-#: data_importer.py:221
+#: data_importer.py:222
 #, python-format
 msgid "\"%(value)s\" is not a float"
 msgstr ""
 
-#: data_importer.py:234 data_importer.py:248 data_importer.py:502
+#: data_importer.py:235 data_importer.py:249 data_importer.py:503
 #, python-format
 msgid "\"%(value)s\" is not a valid date"
 msgstr ""
 
-#: data_importer.py:261
+#: data_importer.py:262
 #, python-format
 msgid "\"%(value)s\" is not an integer"
 msgstr ""
 
-#: data_importer.py:318 data_importer.py:567
+#: data_importer.py:319 data_importer.py:568
 #, python-format
 msgid "Choice for \"%s\" is not available. Which one is relevant?\n"
 msgstr ""
 
-#: data_importer.py:325
+#: data_importer.py:326
 #, python-format
 msgid "%d. None of the above - create new"
 msgstr ""
 
-#: data_importer.py:328
+#: data_importer.py:329
 #, python-format
 msgid "%d. None of the above - skip"
 msgstr ""
 
-#: data_importer.py:528
+#: data_importer.py:529
 #, python-format
 msgid "\"%(value)s\" is not a valid path for the given archive"
 msgstr ""
 
-#: data_importer.py:644
+#: data_importer.py:645
 msgid ""
 "The given file is not correct. Check the file format. If you use a CSV file: "
 "check that column separator and encoding are similar to the ones used by the "
 "reference file."
 msgstr ""
 
-#: data_importer.py:648
+#: data_importer.py:649
 #, python-format
 msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d"
 msgstr ""
 
-#: data_importer.py:650
+#: data_importer.py:651
 msgid "No data provided"
 msgstr ""
 
-#: data_importer.py:651
+#: data_importer.py:652
 msgid "Value is required"
 msgstr ""
 
-#: data_importer.py:652
+#: data_importer.py:653
 #, python-format
 msgid "At least %d columns must be filled"
 msgstr ""
 
-#: data_importer.py:653
+#: data_importer.py:654
 msgid "The regexp doesn't match."
 msgstr ""
 
-#: data_importer.py:655
+#: data_importer.py:656
 msgid ""
 "Forced creation is set for model {} but this model is not in the list of "
 "models allowed to be created."
 msgstr ""
 
-#: data_importer.py:657
+#: data_importer.py:658
 msgid ""
 "{} with values {} doesn't exist in the database. Create it first or fix your "
 "source file."
 msgstr ""
 
-#: data_importer.py:1110
+#: data_importer.py:1111
 msgid "Not imported"
 msgstr ""
 
-#: data_importer.py:1247
+#: data_importer.py:1248
 msgid "Importer configuration error: field \"{}\" does not exist for {}."
 msgstr ""
 
-#: data_importer.py:1574
+#: data_importer.py:1577
 msgid "line"
 msgstr ""
 
-#: data_importer.py:1574
+#: data_importer.py:1577
 msgid "col"
 msgstr ""
 
-#: data_importer.py:1574
+#: data_importer.py:1577
 msgid "error"
 msgstr ""
 
-#: data_importer.py:1580
+#: data_importer.py:1583
 msgid "field"
 msgstr ""
 
-#: data_importer.py:1580
+#: data_importer.py:1583
 msgid "source"
 msgstr ""
 
-#: data_importer.py:1580
+#: data_importer.py:1583
 msgid "result"
 msgstr ""
 
-#: data_importer.py:1596
+#: data_importer.py:1599
 #, python-format
 msgid "\"%(value)s\" not in %(values)s"
 msgstr ""
@@ -182,7 +182,7 @@ msgid "Template"
 msgstr ""
 
 #: forms_common.py:41 forms_common.py:59 forms_common.py:184
-#: forms_common.py:408 models.py:1624 models.py:3087
+#: forms_common.py:408 models.py:1624 models.py:3089
 #: templates/blocks/JQueryAdvancedTown.html:19
 #: templates/ishtar/sheet_organization.html:13
 msgid "Town"
@@ -198,8 +198,8 @@ msgid ""
 "french town Saint-Denis in the Seine-Saint-Denis department.</p>"
 msgstr ""
 
-#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2687
-#: models.py:2880 models.py:2942 templates/ishtar/sheet_person.html:4
+#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2689
+#: models.py:2882 models.py:2944 templates/ishtar/sheet_person.html:4
 msgid "Person"
 msgstr ""
 
@@ -210,15 +210,15 @@ msgid ""
 msgstr ""
 
 #: forms_common.py:172 forms_common.py:329 forms_common.py:453
-#: ishtar_menu.py:75 models.py:2570 models.py:2661
+#: ishtar_menu.py:75 models.py:2572 models.py:2663
 #: templates/ishtar/sheet_organization.html:4
 msgid "Organization"
 msgstr ""
 
 #: forms_common.py:175 forms_common.py:212 forms_common.py:324
 #: forms_common.py:378 forms_common.py:448 models.py:1161 models.py:1557
-#: models.py:1826 models.py:1842 models.py:2080 models.py:2358 models.py:2564
-#: models.py:2673 models.py:3073 models.py:3170
+#: models.py:1826 models.py:1842 models.py:2080 models.py:2360 models.py:2566
+#: models.py:2675 models.py:3075 models.py:3172
 #: templates/ishtar/import_list.html:13
 #: templates/ishtar/sheet_organization.html:8
 #: templates/ishtar/sheet_organization.html:21
@@ -267,8 +267,8 @@ msgstr ""
 msgid "Mobile phone"
 msgstr ""
 
-#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2249
-#: models.py:2566 models.py:3008 templates/sheet_ope.html:85
+#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2251
+#: models.py:2568 models.py:3010 templates/sheet_ope.html:85
 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126
 #: templates/ishtar/import_list.html:14
 #: templates/ishtar/sheet_organization.html:23
@@ -292,7 +292,7 @@ msgstr ""
 msgid "Organization to merge"
 msgstr ""
 
-#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2671
+#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2673
 #: templates/ishtar/sheet_organization.html:22
 msgid "Surname"
 msgstr ""
@@ -311,16 +311,16 @@ msgid "Identity"
 msgstr ""
 
 #: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2212
-#: models.py:2665 models.py:2667 models.py:3005 templates/sheet_ope.html:104
+#: models.py:2667 models.py:2669 models.py:3007 templates/sheet_ope.html:104
 #: templates/ishtar/blocks/window_tables/documents.html:7
 msgid "Title"
 msgstr ""
 
-#: forms_common.py:374 models.py:2669
+#: forms_common.py:374 models.py:2671
 msgid "Salutation"
 msgstr ""
 
-#: forms_common.py:380 models.py:2675
+#: forms_common.py:380 models.py:2677
 msgid "Raw name"
 msgstr ""
 
@@ -380,7 +380,7 @@ msgstr ""
 msgid "Account search"
 msgstr ""
 
-#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2618
+#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2620
 msgid "Person type"
 msgstr ""
 
@@ -388,7 +388,7 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: forms_common.py:577 wizards.py:1347
+#: forms_common.py:577 wizards.py:1352
 msgid "New password"
 msgstr ""
 
@@ -412,7 +412,7 @@ msgstr ""
 msgid "Send the new password by email?"
 msgstr ""
 
-#: forms_common.py:636 forms_common.py:649 models.py:3088
+#: forms_common.py:636 forms_common.py:649 models.py:3090
 msgid "Towns"
 msgstr ""
 
@@ -428,7 +428,7 @@ msgstr ""
 msgid "Documentation informations"
 msgstr ""
 
-#: forms_common.py:783 forms_common.py:831 models.py:2213 models.py:2980
+#: forms_common.py:783 forms_common.py:831 models.py:2213 models.py:2982
 msgid "Source type"
 msgstr ""
 
@@ -440,37 +440,37 @@ msgstr ""
 msgid "Internal reference"
 msgstr ""
 
-#: forms_common.py:791 models.py:3019
+#: forms_common.py:791 models.py:3021
 msgid "Numerical ressource (web address)"
 msgstr ""
 
-#: forms_common.py:792 models.py:3021
+#: forms_common.py:792 models.py:3023
 msgid "Receipt date"
 msgstr ""
 
-#: forms_common.py:794 models.py:2384 models.py:3023
+#: forms_common.py:794 models.py:2386 models.py:3025
 msgid "Creation date"
 msgstr ""
 
-#: forms_common.py:797 models.py:3026
+#: forms_common.py:797 models.py:3028
 msgid "Receipt date in documentation"
 msgstr ""
 
 #: forms_common.py:799 forms_common.py:835 models.py:421 models.py:748
-#: models.py:2107 models.py:2679 models.py:3033
+#: models.py:2107 models.py:2681 models.py:3035
 msgid "Comment"
 msgstr ""
 
 #: forms_common.py:801 forms_common.py:834 models.py:1163 models.py:1846
-#: models.py:2034 models.py:2081 models.py:3032 templates/sheet_ope.html:128
+#: models.py:2034 models.py:2081 models.py:3034 templates/sheet_ope.html:128
 msgid "Description"
 msgstr ""
 
-#: forms_common.py:804 models.py:3034
+#: forms_common.py:804 models.py:3036
 msgid "Additional information"
 msgstr ""
 
-#: forms_common.py:806 forms_common.py:838 models.py:3036
+#: forms_common.py:806 forms_common.py:838 models.py:3038
 msgid "Has a duplicate"
 msgstr ""
 
@@ -485,7 +485,7 @@ msgid ""
 "p>"
 msgstr ""
 
-#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2947
+#: forms_common.py:827 forms_common.py:856 forms_common.py:891 models.py:2949
 #: templates/ishtar/wizard/wizard_person_deletion.html:124
 msgid "Author"
 msgstr ""
@@ -498,7 +498,7 @@ msgstr ""
 msgid "Would you like to delete this documentation?"
 msgstr ""
 
-#: forms_common.py:864 models.py:2214 models.py:2934 models.py:2944
+#: forms_common.py:864 models.py:2214 models.py:2936 models.py:2946
 msgid "Author type"
 msgstr ""
 
@@ -506,11 +506,11 @@ msgstr ""
 msgid "Author selection"
 msgstr ""
 
-#: forms_common.py:897
+#: forms_common.py:898
 msgid "There are identical authors."
 msgstr ""
 
-#: forms_common.py:901 models.py:2948 models.py:3015
+#: forms_common.py:902 models.py:2950 models.py:3017
 #: templates/sheet_ope.html:106
 #: templates/ishtar/blocks/window_tables/documents.html:9
 msgid "Authors"
@@ -528,7 +528,7 @@ msgstr ""
 msgid "Deletion"
 msgstr ""
 
-#: ishtar_menu.py:39 models.py:1340 views.py:1648
+#: ishtar_menu.py:39 models.py:1340 views.py:1649
 msgid "Global variables"
 msgstr ""
 
@@ -556,19 +556,19 @@ msgstr ""
 msgid "Manual merge"
 msgstr ""
 
-#: ishtar_menu.py:109 models.py:2392
+#: ishtar_menu.py:109 models.py:2394
 msgid "Imports"
 msgstr ""
 
-#: ishtar_menu.py:112 views.py:1656
+#: ishtar_menu.py:112 views.py:1657
 msgid "New import"
 msgstr ""
 
-#: ishtar_menu.py:116 views.py:1670
+#: ishtar_menu.py:116 views.py:1671
 msgid "Current imports"
 msgstr ""
 
-#: ishtar_menu.py:120 views.py:1709
+#: ishtar_menu.py:120 views.py:1710
 msgid "Old imports"
 msgstr ""
 
@@ -612,7 +612,7 @@ msgstr ""
 msgid "Creator"
 msgstr ""
 
-#: models.py:1021 models.py:2931 models.py:3099 models.py:3155
+#: models.py:1021 models.py:2933 models.py:3101 models.py:3157
 msgid "Order"
 msgstr ""
 
@@ -869,7 +869,7 @@ msgstr ""
 msgid "Document templates"
 msgstr ""
 
-#: models.py:1596 models.py:1606 models.py:2378 models.py:3193
+#: models.py:1596 models.py:1606 models.py:2380 models.py:3195
 msgid "State"
 msgstr ""
 
@@ -1059,11 +1059,11 @@ msgstr ""
 msgid "Importer - Targets keys"
 msgstr ""
 
-#: models.py:2215 models.py:3011
+#: models.py:2215 models.py:3013
 msgid "Format"
 msgstr ""
 
-#: models.py:2216 models.py:3103
+#: models.py:2216 models.py:3105
 msgid "Operation type"
 msgstr ""
 
@@ -1087,486 +1087,490 @@ msgstr ""
 msgid "Activity type"
 msgstr ""
 
-#: models.py:2223
-msgid "Material"
+#: models.py:2224
+msgid "Documentation type"
 msgstr ""
 
 #: models.py:2225
+msgid "Material"
+msgstr ""
+
+#: models.py:2227
 msgid "Conservatory state"
 msgstr ""
 
-#: models.py:2226
+#: models.py:2228
 msgid "Container type"
 msgstr ""
 
-#: models.py:2227
+#: models.py:2229
 msgid "Preservation type"
 msgstr ""
 
-#: models.py:2228
+#: models.py:2230
 msgid "Object type"
 msgstr ""
 
-#: models.py:2229
+#: models.py:2231
 msgid "Integrity type"
 msgstr ""
 
-#: models.py:2231
+#: models.py:2233
 msgid "Remarkability type"
 msgstr ""
 
-#: models.py:2232
+#: models.py:2234
 msgid "Batch type"
 msgstr ""
 
-#: models.py:2234
+#: models.py:2236
 msgid "Identification type"
 msgstr ""
 
-#: models.py:2236
+#: models.py:2238
 msgid "Context record relation type"
 msgstr ""
 
-#: models.py:2237 models.py:3161
+#: models.py:2239 models.py:3163
 msgid "Spatial reference system"
 msgstr ""
 
-#: models.py:2238 models.py:2989
+#: models.py:2240 models.py:2991
 msgid "Support type"
 msgstr ""
 
-#: models.py:2239 models.py:2630
+#: models.py:2241 models.py:2632
 msgid "Title type"
 msgstr ""
 
-#: models.py:2245
+#: models.py:2247
 msgid "Integer"
 msgstr ""
 
-#: models.py:2246
+#: models.py:2248
 msgid "Float"
 msgstr ""
 
-#: models.py:2247
+#: models.py:2249
 msgid "String"
 msgstr ""
 
-#: models.py:2248 templates/sheet_ope.html:86
+#: models.py:2250 templates/sheet_ope.html:86
 msgid "Date"
 msgstr ""
 
-#: models.py:2250 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
+#: models.py:2252 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
 #: templates/ishtar/dashboards/dashboard_main_detail.html:126
 msgid "Year"
 msgstr ""
 
-#: models.py:2251
+#: models.py:2253
 msgid "String to boolean"
 msgstr ""
 
-#: models.py:2252
+#: models.py:2254
 msgctxt "filesystem"
 msgid "File"
 msgstr ""
 
-#: models.py:2253
+#: models.py:2255
 msgid "Unknow type"
 msgstr ""
 
-#: models.py:2269
+#: models.py:2271
 msgid "4 digit year. e.g.: \"2015\""
 msgstr ""
 
-#: models.py:2270
+#: models.py:2272
 msgid "4 digit year/month/day. e.g.: \"2015/02/04\""
 msgstr ""
 
-#: models.py:2271
+#: models.py:2273
 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\""
 msgstr ""
 
-#: models.py:2281
+#: models.py:2283
 msgid "Options"
 msgstr ""
 
-#: models.py:2283
+#: models.py:2285
 msgid "Split character(s)"
 msgstr ""
 
-#: models.py:2287
+#: models.py:2289
 msgid "Importer - Formater type"
 msgstr ""
 
-#: models.py:2288
+#: models.py:2290
 msgid "Importer - Formater types"
 msgstr ""
 
-#: models.py:2340 templates/ishtar/dashboards/dashboard_main_detail.html:63
+#: models.py:2342 templates/ishtar/dashboards/dashboard_main_detail.html:63
 msgid "Created"
 msgstr ""
 
-#: models.py:2341
+#: models.py:2343
 msgid "Analyse in progress"
 msgstr ""
 
-#: models.py:2342
+#: models.py:2344
 msgid "Analysed"
 msgstr ""
 
-#: models.py:2343
+#: models.py:2345
 msgid "Import pending"
 msgstr ""
 
-#: models.py:2344
+#: models.py:2346
 msgid "Import in progress"
 msgstr ""
 
-#: models.py:2345 models.py:3184
+#: models.py:2347 models.py:3186
 msgid "Finished with errors"
 msgstr ""
 
-#: models.py:2346 models.py:3185
+#: models.py:2348 models.py:3187
 msgid "Finished"
 msgstr ""
 
-#: models.py:2347
+#: models.py:2349
 msgid "Archived"
 msgstr ""
 
-#: models.py:2362
+#: models.py:2364
 msgid "Imported file"
 msgstr ""
 
-#: models.py:2364
+#: models.py:2366
 msgid "Associated images (zip file)"
 msgstr ""
 
-#: models.py:2366
+#: models.py:2368
 msgid "Encoding"
 msgstr ""
 
-#: models.py:2368
+#: models.py:2370
 msgid "Skip lines"
 msgstr ""
 
-#: models.py:2369 templates/ishtar/import_list.html:51
+#: models.py:2371 templates/ishtar/import_list.html:51
 msgid "Error file"
 msgstr ""
 
-#: models.py:2372
+#: models.py:2374
 msgid "Result file"
 msgstr ""
 
-#: models.py:2375 templates/ishtar/import_list.html:57
+#: models.py:2377 templates/ishtar/import_list.html:57
 msgid "Match file"
 msgstr ""
 
-#: models.py:2381
+#: models.py:2383
 msgid "Conservative import"
 msgstr ""
 
-#: models.py:2385
+#: models.py:2387
 msgid "End date"
 msgstr ""
 
-#: models.py:2388
+#: models.py:2390
 msgid "Remaining seconds"
 msgstr ""
 
-#: models.py:2391
+#: models.py:2393
 msgid "Import"
 msgstr ""
 
-#: models.py:2420
+#: models.py:2422
 msgid "Analyse"
 msgstr ""
 
-#: models.py:2422 models.py:2425
+#: models.py:2424 models.py:2427
 msgid "Re-analyse"
 msgstr ""
 
-#: models.py:2423
+#: models.py:2425
 msgid "Launch import"
 msgstr ""
 
-#: models.py:2426
+#: models.py:2428
 msgid "Re-import"
 msgstr ""
 
-#: models.py:2427
+#: models.py:2429
 msgid "Archive"
 msgstr ""
 
-#: models.py:2429
+#: models.py:2431
 msgid "Unarchive"
 msgstr ""
 
-#: models.py:2430 widgets.py:198 templates/ishtar/form_delete.html:11
+#: models.py:2432 widgets.py:198 templates/ishtar/form_delete.html:11
 msgid "Delete"
 msgstr ""
 
-#: models.py:2571
+#: models.py:2573
 msgid "Organizations"
 msgstr ""
 
-#: models.py:2573
+#: models.py:2575
 msgid "Can view all Organizations"
 msgstr ""
 
-#: models.py:2574
+#: models.py:2576
 msgid "Can view own Organization"
 msgstr ""
 
-#: models.py:2575
+#: models.py:2577
 msgid "Can add own Organization"
 msgstr ""
 
-#: models.py:2577
+#: models.py:2579
 msgid "Can change own Organization"
 msgstr ""
 
-#: models.py:2579
+#: models.py:2581
 msgid "Can delete own Organization"
 msgstr ""
 
-#: models.py:2614
+#: models.py:2616
 msgid "Groups"
 msgstr ""
 
-#: models.py:2619
+#: models.py:2621
 msgid "Person types"
 msgstr ""
 
-#: models.py:2631
+#: models.py:2633
 msgid "Title types"
 msgstr ""
 
-#: models.py:2640
+#: models.py:2642
 msgid "Mr"
 msgstr ""
 
-#: models.py:2641
+#: models.py:2643
 msgid "Miss"
 msgstr ""
 
-#: models.py:2642
+#: models.py:2644
 msgid "Mr and Mrs"
 msgstr ""
 
-#: models.py:2643
+#: models.py:2645
 msgid "Mrs"
 msgstr ""
 
-#: models.py:2644
+#: models.py:2646
 msgid "Doctor"
 msgstr ""
 
-#: models.py:2677
+#: models.py:2679
 msgid "Contact type"
 msgstr ""
 
-#: models.py:2680 models.py:2744
+#: models.py:2682 models.py:2746
 msgid "Types"
 msgstr ""
 
-#: models.py:2683
+#: models.py:2685
 msgid "Is attached to"
 msgstr ""
 
-#: models.py:2688
+#: models.py:2690
 msgid "Persons"
 msgstr ""
 
-#: models.py:2690
+#: models.py:2692
 msgid "Can view all Persons"
 msgstr ""
 
-#: models.py:2691
+#: models.py:2693
 msgid "Can view own Person"
 msgstr ""
 
-#: models.py:2692
+#: models.py:2694
 msgid "Can add own Person"
 msgstr ""
 
-#: models.py:2693
+#: models.py:2695
 msgid "Can change own Person"
 msgstr ""
 
-#: models.py:2694
+#: models.py:2696
 msgid "Can delete own Person"
 msgstr ""
 
-#: models.py:2883
+#: models.py:2885
 msgid "Advanced shortcut menu"
 msgstr ""
 
-#: models.py:2886
+#: models.py:2888
 msgid "Ishtar user"
 msgstr ""
 
-#: models.py:2887
+#: models.py:2889
 msgid "Ishtar users"
 msgstr ""
 
-#: models.py:2927
+#: models.py:2929
 msgid "To modify the password use the form in Auth > User"
 msgstr ""
 
-#: models.py:2935
+#: models.py:2937
 msgid "Author types"
 msgstr ""
 
-#: models.py:2952
+#: models.py:2954
 msgid "Can view all Authors"
 msgstr ""
 
-#: models.py:2954
+#: models.py:2956
 msgid "Can view own Author"
 msgstr ""
 
-#: models.py:2956
+#: models.py:2958
 msgid "Can add own Author"
 msgstr ""
 
-#: models.py:2958
+#: models.py:2960
 msgid "Can change own Author"
 msgstr ""
 
-#: models.py:2960
+#: models.py:2962
 msgid "Can delete own Author"
 msgstr ""
 
-#: models.py:2981
+#: models.py:2983
 msgid "Source types"
 msgstr ""
 
-#: models.py:2990
+#: models.py:2992
 msgid "Support types"
 msgstr ""
 
-#: models.py:2997
+#: models.py:2999
 msgid "Format type"
 msgstr ""
 
-#: models.py:2998
+#: models.py:3000
 msgid "Format types"
 msgstr ""
 
-#: models.py:3006
+#: models.py:3008
 msgid "External ID"
 msgstr ""
 
-#: models.py:3009
+#: models.py:3011
 msgid "Support"
 msgstr ""
 
-#: models.py:3013
+#: models.py:3015
 msgid "Scale"
 msgstr ""
 
-#: models.py:3027
+#: models.py:3029
 msgid "Item number"
 msgstr ""
 
-#: models.py:3028
+#: models.py:3030
 msgid "Ref."
 msgstr ""
 
-#: models.py:3031
+#: models.py:3033
 msgid "Internal ref."
 msgstr ""
 
-#: models.py:3074
+#: models.py:3076
 msgid "Surface (m2)"
 msgstr ""
 
-#: models.py:3075 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:3077 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
 msgid "Localisation"
 msgstr ""
 
-#: models.py:3100
+#: models.py:3102
 msgid "Is preventive"
 msgstr ""
 
-#: models.py:3104
+#: models.py:3106
 msgid "Operation types"
 msgstr ""
 
-#: models.py:3133
+#: models.py:3135
 msgid "Preventive"
 msgstr ""
 
-#: models.py:3134
+#: models.py:3136
 msgid "Research"
 msgstr ""
 
-#: models.py:3157
+#: models.py:3159
 msgid "Authority name"
 msgstr ""
 
-#: models.py:3158
+#: models.py:3160
 msgid "Authority SRID"
 msgstr ""
 
-#: models.py:3162
+#: models.py:3164
 msgid "Spatial reference systems"
 msgstr ""
 
-#: models.py:3169
+#: models.py:3171
 msgid "Filename"
 msgstr ""
 
-#: models.py:3174
+#: models.py:3176
 msgid "Administration script"
 msgstr ""
 
-#: models.py:3175
+#: models.py:3177
 msgid "Administration scripts"
 msgstr ""
 
-#: models.py:3182
+#: models.py:3184
 msgid "Scheduled"
 msgstr ""
 
-#: models.py:3183
+#: models.py:3185
 msgid "In progress"
 msgstr ""
 
-#: models.py:3198
+#: models.py:3200
 msgid "Result"
 msgstr ""
 
-#: models.py:3201
+#: models.py:3203
 msgid "Administration task"
 msgstr ""
 
-#: models.py:3202
+#: models.py:3204
 msgid "Administration tasks"
 msgstr ""
 
-#: models.py:3206
+#: models.py:3208
 msgid "Unknown"
 msgstr ""
 
-#: models.py:3221
+#: models.py:3223
 msgid ""
 "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your "
 "administrator."
 msgstr ""
 
-#: models.py:3230
+#: models.py:3232
 msgid ""
 "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to "
 "relative paths, it can be a security issue and this is not allowed. Only put "
 "a full path."
 msgstr ""
 
-#: models.py:3241
+#: models.py:3243
 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory."
 msgstr ""
 
-#: models.py:3257
+#: models.py:3259
 msgid ""
 "Script \"{}\" is not available in your script directory. Check your "
 "configuration."
@@ -1673,31 +1677,31 @@ msgstr ""
 msgid "Treatments"
 msgstr ""
 
-#: views.py:1723 templates/ishtar/import_list.html:47
+#: views.py:1724 templates/ishtar/import_list.html:47
 msgid "Link unmatched items"
 msgstr ""
 
-#: views.py:1738
+#: views.py:1739
 msgid "Delete import"
 msgstr ""
 
-#: views.py:1777
+#: views.py:1778
 msgid "Merge persons"
 msgstr ""
 
-#: views.py:1801
+#: views.py:1802
 msgid "Select the main person"
 msgstr ""
 
-#: views.py:1810
+#: views.py:1811
 msgid "Merge organization"
 msgstr ""
 
-#: views.py:1820
+#: views.py:1821
 msgid "Select the main organization"
 msgstr ""
 
-#: views.py:1860 views.py:1876
+#: views.py:1861 views.py:1877
 msgid "Corporation manager"
 msgstr ""
 
@@ -1725,7 +1729,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: wizards.py:1404
+#: wizards.py:1409
 #, python-format
 msgid "[%(app_name)s] Account creation/modification"
 msgstr ""
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_address_section.html b/ishtar_common/templates/ishtar/blocks/sheet_address_section.html
new file mode 100644
index 000000000..917258173
--- /dev/null
+++ b/ishtar_common/templates/ishtar/blocks/sheet_address_section.html
@@ -0,0 +1,6 @@
+{% load i18n %}
+{% if item.address or item.address_complement or item.postal_code or item.town %}
+<p><label>{% trans "Address" %}</label><pre>{% if item.address %}{{item.address}}{% endif %}{% if item.address_complement %}
+{{item.address_complement}}{% endif %}{% if item.postal_code or item.town %}
+{{item.postal_code}} {{item.town}}{% endif %}</pre>
+</p>{% endif %}
diff --git a/ishtar_common/templates/ishtar/sheet_organization.html b/ishtar_common/templates/ishtar/sheet_organization.html
index 66048095b..411aa2de3 100644
--- a/ishtar_common/templates/ishtar/sheet_organization.html
+++ b/ishtar_common/templates/ishtar/sheet_organization.html
@@ -7,10 +7,7 @@
 {% window_nav item window_id 'show-organization' 'organization_modify' %}
 <p><label>{% trans "Name" %}</label> <span class='value'>{{item.name}}</span></p>
 <p><label>{%trans "Created by:"%}</label> <span class='value'>{{ item.history_creator.ishtaruser.person }}</span></p>
-{% if item.address %}<p><label>{% trans "Address" %}</label> <span class='value'>{{item.address}}</span></p> {% endif %}
-{% if item.address_complement %}<p><label>{% trans "Address complement" %}</label> <span class='value'>{{item.address_complement}}</span></p> {% endif %}
-{% if item.postal_code %}<p><label>{% trans "Postal code" %}</label> <span class='value'>{{item.postal_code}}</span></p> {% endif %}
-{% if item.town %}<p><label>{% trans "Town" %}</label> <span class='value'>{{item.town}}</span></p> {% endif %}
+{% include "ishtar/blocks/sheet_address_section.html" %}
 {% if item.phone %}<p><label>{% trans "Phone" %}</label> <span class='value'>{{item.phone}}</span></p> {% endif %}
 {% if item.mobile_phone %}<p><label>{% trans "Mobile phone" %}</label> <span class='value'>{{item.mobile_phone}}</span></p> {% endif %}