Add some criteria to find search (closes #449)

3 files changed, 40 insertions, 30 deletions

diff --git a/ishtar/furnitures/forms_items.py b/ishtar/furnitures/forms_items.py
index 2212ec253..6efb705e2 100644
--- a/ishtar/furnitures/forms_items.py
+++ b/ishtar/furnitures/forms_items.py
@@ -137,12 +137,16 @@ item_creation_wizard = ItemWizard([
 class ItemSelect(forms.Form):
     base_items__context_record__parcel__town = get_town_field()
     base_items__context_record__parcel__operation__year = forms.IntegerField(
-                                                             label=_("Year"))
+                                                             label=_(u"Year"))
+    base_items__context_record__parcel__operation__code_patriarche = \
+                                 forms.IntegerField(label=_(u"Code PATRIARCHE"))
     dating__period = forms.ChoiceField(
-            label=_("Period"), choices=models.Period.get_types())
+            label=_(u"Period"), choices=models.Period.get_types())
+    # TODO search by warehouse
     material_type = forms.ChoiceField(
             label=_("Material type"), choices=models.MaterialType.get_types())
-    base_items__is_isolated = forms.NullBooleanField(label=_("Is isolated?"))
+    base_items__item__description = forms.CharField(label=_(u"Description"))
+    base_items__is_isolated = forms.NullBooleanField(label=_(u"Is isolated?"))
 
 class ItemFormSelection(forms.Form):
     form_label = _("Item search")
diff --git a/ishtar/furnitures/views.py b/ishtar/furnitures/views.py
index 31cb91767..7516fdcda 100644
--- a/ishtar/furnitures/views.py
+++ b/ishtar/furnitures/views.py
@@ -482,7 +482,10 @@ get_archaeologicalitem = get_item(models.Item,
                 'base_items__context_record__parcel__town',
 'base_items__context_record__parcel__operation__year':
                 'base_items__context_record__parcel__operation__year__contains',
+'base_items__context_record__parcel__operation__code_patriarche':
+               'base_items__context_record__parcel__operation__code_patriarche',
 'dating__period':'dating__period__pk',
+'base_items__item__description':'base_items__item__description__icontains',
 'base_items__is_isolated':'base_items__is_isolated'})
 
 def autocomplete_warehouse(request):
diff --git a/ishtar/locale/fr/LC_MESSAGES/django.po b/ishtar/locale/fr/LC_MESSAGES/django.po
index ecf604e91..09f382ea7 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:13+0200\n"
+"POT-Creation-Date: 2011-06-14 00:19+0200\n"
 "PO-Revision-Date: 2010-12-09\n"
 "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
 "Language-Team: \n"
@@ -119,7 +119,7 @@ msgid "Person in charge"
 msgstr "Responsable"
 
 #: furnitures/forms_common.py:67 furnitures/forms_files.py:180
-#: furnitures/forms_items.py:207 furnitures/forms_operations.py:244
+#: 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
 msgid "Comment"
@@ -158,7 +158,7 @@ msgstr "Type d'organisation"
 msgid "Person search"
 msgstr "Recherche d'individus"
 
-#: furnitures/forms_common.py:142 furnitures/forms_items.py:179
+#: furnitures/forms_common.py:142 furnitures/forms_items.py:181
 #: furnitures/menus.py:89 furnitures/models.py:398 furnitures/models.py:423
 #: furnitures/models.py:1151 furnitures/models.py:1173
 #: furnitures/models.py:1188
@@ -280,7 +280,7 @@ msgstr "Opération : "
 
 #: furnitures/forms_context_records.py:115
 #: furnitures/forms_context_records.py:204 furnitures/forms_items.py:115
-#: furnitures/forms_items.py:142 furnitures/forms_operations.py:377
+#: furnitures/forms_items.py:144 furnitures/forms_operations.py:377
 #: furnitures/models.py:697
 msgid "Period"
 msgstr "Période"
@@ -315,7 +315,7 @@ msgid "Parcel"
 msgstr "Parcelle"
 
 #: furnitures/forms_context_records.py:143 furnitures/forms_items.py:97
-#: furnitures/forms_items.py:234 furnitures/models.py:755
+#: furnitures/forms_items.py:236 furnitures/models.py:755
 #: furnitures/models.py:845 furnitures/models.py:922
 #: templates/sheet_ope.html:125 templates/sheet_ope_modif.html:125
 #: templates/sheet_operation.html:124
@@ -323,7 +323,7 @@ msgid "ID"
 msgstr "Identifiant"
 
 #: furnitures/forms_context_records.py:145 furnitures/forms_items.py:99
-#: furnitures/forms_items.py:177 furnitures/models.py:756
+#: 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
 #: templates/sheet_contextrecord.html:107 templates/sheet_ope.html:128
@@ -352,7 +352,7 @@ msgstr "Profondeur (cm)"
 msgid "Unit"
 msgstr "Unité"
 
-#: furnitures/forms_context_records.py:153 furnitures/forms_items.py:183
+#: furnitures/forms_context_records.py:153 furnitures/forms_items.py:185
 #: furnitures/models.py:761 furnitures/models.py:1087
 #: furnitures/models.py:1149
 msgid "Location"
@@ -369,7 +369,7 @@ msgid "Dating"
 msgstr "Datation"
 
 #: furnitures/forms_context_records.py:206 furnitures/forms_items.py:117
-#: furnitures/forms_items.py:188 furnitures/forms_operations.py:234
+#: 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
@@ -377,7 +377,7 @@ msgid "Start date"
 msgstr "Date de début"
 
 #: furnitures/forms_context_records.py:207 furnitures/forms_items.py:119
-#: furnitures/forms_items.py:190 furnitures/models.py:675
+#: 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
 msgid "End date"
@@ -539,56 +539,60 @@ msgstr "Unité d'Enregistrement : "
 msgid "Item"
 msgstr "Mobilier"
 
-#: furnitures/forms_items.py:101 furnitures/forms_items.py:145
+#: furnitures/forms_items.py:101 furnitures/forms_items.py:147
 #: furnitures/models.py:849
 msgid "Is isolated?"
 msgstr "Est isolé ?"
 
-#: furnitures/forms_items.py:103 furnitures/forms_items.py:144
-#: furnitures/forms_items.py:238 furnitures/models.py:841
+#: 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
 #: templates/sheet_operation.html:153
 msgid "Material type"
 msgstr "Type de matériau"
 
-#: furnitures/forms_items.py:105 furnitures/forms_items.py:240
+#: furnitures/forms_items.py:105 furnitures/forms_items.py:242
 #: furnitures/models.py:926 furnitures/models.py:1079
 msgid "Volume (l)"
 msgstr "Volume (l)"
 
-#: furnitures/forms_items.py:106 furnitures/forms_items.py:241
+#: furnitures/forms_items.py:106 furnitures/forms_items.py:243
 #: furnitures/models.py:927
 msgid "Weight (g)"
 msgstr "Poids (g)"
 
-#: furnitures/forms_items.py:107 furnitures/forms_items.py:242
+#: furnitures/forms_items.py:107 furnitures/forms_items.py:244
 #: furnitures/models.py:928
 msgid "Item number"
 msgstr "Nombre d'éléments"
 
-#: furnitures/forms_items.py:148
+#: furnitures/forms_items.py:142
+msgid "Code PATRIARCHE"
+msgstr ""
+
+#: furnitures/forms_items.py:150
 msgid "Item search"
 msgstr "Recherche de mobilier"
 
-#: furnitures/forms_items.py:171
+#: furnitures/forms_items.py:173
 msgid "Base treatment"
 msgstr "Traitement de base"
 
-#: furnitures/forms_items.py:175 furnitures/models.py:1140
+#: furnitures/forms_items.py:177 furnitures/models.py:1140
 #: furnitures/models.py:1148
 msgid "Treatment type"
 msgstr "Type de traitement"
 
-#: furnitures/forms_items.py:194
+#: furnitures/forms_items.py:196
 msgid "Upstream items"
 msgstr "Mobilier amont"
 
-#: furnitures/forms_items.py:202 furnitures/models.py:1094
+#: furnitures/forms_items.py:204 furnitures/models.py:1094
 #: furnitures/models.py:1144
 msgid "Container"
 msgstr "Contenant"
 
-#: furnitures/forms_items.py:204 furnitures/models.py:1080
+#: furnitures/forms_items.py:206 furnitures/models.py:1080
 #: furnitures/models.py:1090 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
@@ -596,24 +600,24 @@ msgstr "Contenant"
 msgid "Reference"
 msgstr "Référence"
 
-#: furnitures/forms_items.py:205 furnitures/models.py:1083
+#: furnitures/forms_items.py:207 furnitures/models.py:1083
 #: furnitures/models.py:1089
 msgid "Container type"
 msgstr "Type de contenant"
 
-#: furnitures/forms_items.py:232
+#: furnitures/forms_items.py:234
 msgid "Resulting item"
 msgstr "Mobilier résultant"
 
-#: furnitures/forms_items.py:236
+#: furnitures/forms_items.py:238
 msgid "Precise description"
 msgstr "Description précise"
 
-#: furnitures/forms_items.py:246
+#: furnitures/forms_items.py:248
 msgid "Resulting items"
 msgstr "Mobiliers résultants"
 
-#: furnitures/forms_items.py:249
+#: furnitures/forms_items.py:251
 msgid "Upstream item"
 msgstr "Mobilier amont"
 
@@ -2106,4 +2110,3 @@ msgid "You are now registered. Activation email sent."
 msgstr ""
 "Vous être maintenant enregistré. Un courriel d'activation de votre compte "
 "vous a été envoyé."
-