summaryrefslogtreecommitdiff
path: root/ishtar/ishtar_base/forms_items.py
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar/ishtar_base/forms_items.py')
-rw-r--r--ishtar/ishtar_base/forms_items.py20
1 files changed, 15 insertions, 5 deletions
diff --git a/ishtar/ishtar_base/forms_items.py b/ishtar/ishtar_base/forms_items.py
index 7e3047741..484902341 100644
--- a/ishtar/ishtar_base/forms_items.py
+++ b/ishtar/ishtar_base/forms_items.py
@@ -206,10 +206,10 @@ class BaseTreatmentForm(forms.Form):
class ItemMultipleFormSelection(forms.Form):
form_label = _(u"Upstream items")
associated_models = {'items':models.Item}
- items = forms.IntegerField(label="", required=False,
+ items = forms.CharField(label="", required=False,
widget=widgets.JQueryJqGrid(reverse_lazy('get-item'),
- ItemSelect(), models.Item, multiple=True),
- validators=[models.valid_id(models.Item)])
+ ItemSelect(), models.Item, multiple=True, multiple_cols=[2, 3, 4]),
+ validators=[models.valid_ids(models.Item)])
class ContainerForm(forms.Form):
form_label = _(u"Container")
@@ -272,10 +272,10 @@ treatment_creation_wizard = TreatmentWizard([
condition_list={
'selecitem-treatment_creation':
check_treatment('basetreatment-treatment_creation', 'treatment_type',
- not_type_list=['physical_grouping']),
+ not_type_list=['physical_grouping', 'packaging']),
'multiselecitems-treatment_creation':
check_treatment('basetreatment-treatment_creation', 'treatment_type',
- ['physical_grouping']),
+ ['physical_grouping', 'packaging']),
'resultitems-treatment_creation':
check_treatment('basetreatment-treatment_creation', 'treatment_type',
['split']),
@@ -288,6 +288,16 @@ treatment_creation_wizard = TreatmentWizard([
},
url_name='treatment_creation',)
+########################
+# Warehouse management #
+########################
+
+"""
+warehouse_packaging_wizard = ItemSourceWizard([
+ ('selec-warehouse_packaging', ItemsSelection),
+ ('final-warehouse_packaging', FinalForm)],
+ url_name='warehouse_packaging',)
+"""
#############################################
# Source management for archaelogical items #
#############################################