diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml
index a6926ed8f9fd30d4f681f2ec2940e8adac2c3f8f..44248cd60083db64962ed1b69a083c659be74d8a 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml
@@ -9,22 +9,10 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>Python_magic</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>_bind_names</string> </key>
<value>
@@ -68,10 +56,10 @@
<value> <string>item_list = []\n
\n
for line in kw.get(\'listbox\'):\n
- if not (line[\'type\'] and line[\'title\']):\n
+ if not (line[\'title\']):\n
continue\n
- module = context.getDefaultModule(line[\'type\'])\n
- item = module.newContent(portal_type=line[\'type\'],\n
+ module = context.getDefaultModule("Item")\n
+ item = module.newContent(portal_type="Item",\n
title=line[\'title\'],\n
reference=line[\'reference\'],\n
quantity=line[\'quantity\'])\n
@@ -90,18 +78,6 @@ context.REQUEST.response.redirect(\'%s/view?portal_status_message=%s\' % (contex
<none/>
</value>
</item>
- <item>
- <key> <string>_filepath</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kw</string> </value>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getTempItemList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getTempItemList.xml
index 526450bd3a870880cf90cc640a7773657494cecf..5d3ea9bd6a11b89e9749e253dab83c943391c0ab 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getTempItemList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getTempItemList.xml
@@ -9,22 +9,10 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>Python_magic</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>_bind_names</string> </key>
<value>
@@ -71,7 +59,7 @@ portal = context.getPortalObject()\n
try:\n
count = int(context.REQUEST.get(\'field_your_item_count\', \'\'))\n
except ValueError:\n
- count = 1\n
+ count = 10\n
\n
result = []\n
\n
@@ -88,18 +76,6 @@ return result\n
<none/>
</value>
</item>
- <item>
- <key> <string>_filepath</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kw</string> </value>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog.xml
index 7fd1c297c2db7274adda7fc288cda342928a43bf..c7b53954b000b01be03aa34bef6773b910679bc2 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog.xml
@@ -9,12 +9,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>_bind_names</string> </key>
<value>
@@ -42,12 +36,6 @@
<tuple/>
</value>
</item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>action</string> </key>
<value> <string>DeliveryLine_createItemList</string> </value>
@@ -106,8 +94,8 @@
<list>
<string>listbox_title</string>
<string>listbox_reference</string>
- <string>listbox_type</string>
<string>listbox_quantity</string>
+ <string>listbox_variation_category_list</string>
</list>
</value>
</item>
@@ -117,7 +105,9 @@
<list>
<string>my_resource_title</string>
<string>my_total_quantity</string>
+ <string>my_quantity_unit</string>
<string>your_item_count</string>
+ <string>my_type</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox.xml
index 6317105d81f2be7ca0aaad97ff5183a6416675f7..4488ffa0b41c54b4a1b0c4fcf93ccb31e61aaadc 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox.xml
@@ -345,8 +345,8 @@
<string>Quantity</string>
</tuple>
<tuple>
- <string>type</string>
- <string>Type</string>
+ <string>variation_category_list</string>
+ <string>Variation</string>
</tuple>
</list>
</value>
@@ -400,8 +400,8 @@
<string>Quantity</string>
</tuple>
<tuple>
- <string>type</string>
- <string>Type</string>
+ <string>variation_category_list</string>
+ <string>Variation</string>
</tuple>
</list>
</value>
@@ -508,6 +508,12 @@
<key> <string>title</string> </key>
<value> <string>Items</string> </value>
</item>
+ <item>
+ <key> <string>untranslatable_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
<item>
<key> <string>url_columns</string> </key>
<value>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_variation_category_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_variation_category_list.xml
new file mode 100644
index 0000000000000000000000000000000000000000..faaa6b862f7fe1211ca657dbc4cf9b470fd028f1
--- /dev/null
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_variation_category_list.xml
@@ -0,0 +1,295 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_variation_category_list</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ <item>
+ <key> <string>required_not_found</string> </key>
+ <value> <string>Input is required but no input given.</string> </value>
+ </item>
+ <item>
+ <key> <string>unknown_selection</string> </key>
+ <value> <string>You selected an item that was not in the list.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <int>5</int> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Variation</string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<br />
+
+]]></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: here.getVariationRangeCategoryItemList(display_base_category = 0)</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: here.getVariationRangeCategoryItemList(display_base_category = 0)</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_quantity_unit.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_quantity_unit.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eb8c2bfcb7505974891f098518c82ad3232b76ae
--- /dev/null
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_quantity_unit.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>enabled</string>
+ <string>editable</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_quantity_unit</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>extra_context</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra_context</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>extra_context</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_quantity_unit</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>PackingListLine_viewFieldLibrary</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_type.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_type.xml
similarity index 97%
rename from bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_type.xml
rename to bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_type.xml
index 1ab540e1c0b36826a163840b6a4137e6fa7e0c78..ce097ce097e94bb677204d47187303383d853f65 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_type.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/my_type.xml
@@ -11,7 +11,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
- <value> <string>listbox_type</string> </value>
+ <value> <string>my_type</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -248,7 +248,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>listbox_type</string> </value>
+ <value> <string>Type</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
@@ -275,7 +275,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.getResource() and [(\'\', \'\')] + [(x, x) for x in here.getResourceValue().getAggregatedPortalTypeList()] or [(\'\', \'\')]</string> </value>
+ <value> <string>python: here.getResource() and [(x, x) for x in here.getResourceValue().getAggregatedPortalTypeList()] or [(\'\', \'\')]</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_item_count.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_item_count.xml
index 3cd1ec15e1079f6ae109917cc6aa23ee4e46d5e3..bee51fad5442b41f6831a818dcc7a49efa1f66dc 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_item_count.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/your_item_count.xml
@@ -192,7 +192,7 @@
</item>
<item>
<key> <string>default</string> </key>
- <value> <string>1</string> </value>
+ <value> <string>10</string> </value>
</item>
<item>
<key> <string>description</string> </key>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml
index 463d1f9060fe5e1985584d3026ef8f3628f75b18..79ea77f6adc17d77c2898f70c31870540bca4d59 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml
@@ -58,7 +58,7 @@
#kw[\'at_date\'] = DateTime()\n
kw[\'item\'] = context.getRelativeUrl()\n
\n
-last_affectation_list = context.portal_simulation.getCurrentTrackingList(**kw)\n
+last_affectation_list = context.portal_simulation.getTrackingList(**kw)\n
\n
if kw.get(\'src__\',0):\n
return last_affectation_list\n
@@ -68,6 +68,7 @@ if len(last_affectation_list):\n
resource_value = context.portal_catalog.getObject(last_affectation.resource_uid)\n
\n
return resource_value\n
+\n
return None\n
</string> </value>
</item>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationOnMovement.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationOnMovement.xml
new file mode 100644
index 0000000000000000000000000000000000000000..26cddc868e8de50331033473538e33d9bd61331b
--- /dev/null
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationOnMovement.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>from DateTime import DateTime\n
+\n
+#kw[\'at_date\'] = DateTime()\n
+kw[\'item\'] = context.getRelativeUrl()\n
+\n
+last_affectation_list = context.portal_simulation.getTrackingList(**kw)\n
+\n
+if kw.get(\'src__\',0):\n
+ return last_affectation_list\n
+if len(last_affectation_list):\n
+ last_affectation = last_affectation_list[0]\n
+ if last_affectation.resource_uid is not None:\n
+ resource_value = context.portal_catalog.getObject(last_affectation.resource_uid)\n
+ mvt_aggregated = context.getAggregateRelatedValue()\n
+ variation_list = mvt_aggregated.getVariationCategoryList()\n
+ return variation_list\n
+\n
+return None\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>**kw</string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>kw</string>
+ <string>DateTime</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>_write_</string>
+ <string>_apply_</string>
+ <string>last_affectation_list</string>
+ <string>len</string>
+ <string>_getitem_</string>
+ <string>last_affectation</string>
+ <string>None</string>
+ <string>resource_value</string>
+ <string>mvt_aggregated</string>
+ <string>variation_list</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Item_getVariationOnMovement</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view.xml
index 691d0cea6ac52947ac4ba0757967372b782c0d51..708eb18f9c5f13bbd6c1d4ec096d8b724911efd1 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view.xml
@@ -90,11 +90,13 @@
<list>
<string>my_title</string>
<string>my_resource_title</string>
+ <string>my_variation_category_list</string>
<string>my_reference</string>
<string>my_serial_number</string>
<string>my_current_owner</string>
<string>my_current_site</string>
<string>my_expiration_date</string>
+ <string>my_fishing_zone</string>
</list>
</value>
</item>
@@ -102,7 +104,6 @@
<key> <string>right</string> </key>
<value>
<list>
- <string>my_variation_category_list</string>
<string>my_translated_validation_state_title</string>
<string>my_quantity</string>
<string>my_quantity_unit</string>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_comment.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_comment.xml
index 39a338298f601c8976ff07bcf0807946378fdeef..86e95c82c03f2a7e3a694f21c559074861c7ed72 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_comment.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_comment.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ProxyField</string>
- <string>ProxyField</string>
- </tuple>
- <none/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_description.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_description.xml
index ba2684f7fc512acc64d1a85d9afdce5f38523a6c..f16a4e49738d0603d60781647533c33f3a9d2e09 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_description.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_description.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ProxyField</string>
- <string>ProxyField</string>
- </tuple>
- <none/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity.xml
index 241b1f1dafb4d6231c6b647bfa3308a83f74fa6d..7d345a4d92769c81763099435dd1232cc99fb961 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ProxyField</string>
- <string>ProxyField</string>
- </tuple>
- <none/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity_unit.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity_unit.xml
index e8607818f6ced3c6cf22db94abb5ee86a23e5c07..2fabeddfb127ae5d62dfdb2d7cec565b29863ee2 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity_unit.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_quantity_unit.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ProxyField</string>
- <string>ProxyField</string>
- </tuple>
- <none/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -15,7 +12,9 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list/>
+ <list>
+ <string>items</string>
+ </list>
</value>
</item>
<item>
@@ -68,6 +67,16 @@
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -89,10 +98,32 @@
<key> <string>form_id</string> </key>
<value> <string>Item_viewFieldLibrary</string> </value>
</item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: here.Item_getResourceValue() and here.Item_getResourceValue().getQuantityUnitList() and [(\'\', \'\')] + [(x.getTranslatedLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in here.Item_getResourceValue().getQuantityUnitValueList()] or [(\'\', \'\')]</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_resource_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_resource_title.xml
index 1e877fd3f9b0c371f3b2b7709b1ed56ac346261a..1f8372c08cc0838bfd0d64409eebdf2eb49a23f7 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_resource_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_resource_title.xml
@@ -12,9 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>default</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -55,12 +53,6 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
<item>
<key> <string>extra_context</string> </key>
<value> <string></string> </value>
@@ -84,10 +76,6 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>extra_context</string> </key>
<value>
@@ -108,20 +96,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: here.Item_getResourceTitle()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_title.xml
index 9d2f6659a56094965ffdff13d759ca3d71c183ed..59f3ed941ff014c18e5845ea42fc0b1499a06ed4 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_title.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ProxyField</string>
- <string>ProxyField</string>
- </tuple>
- <none/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_translated_validation_state_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_translated_validation_state_title.xml
index 56de445dfe94b7c5398fbf610476cc1ff38fdbfe..09b130ec8dc4c4de9f6b06bc8ba79e2b8f5b2ebe 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_translated_validation_state_title.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ProxyField</string>
- <string>ProxyField</string>
- </tuple>
- <none/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_variation_category_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_variation_category_list.xml
index 0a899e31c6b55deb2a6d8fdecbd1d8c3c71d089f..7d5de4c495887c29eb770e5998f436dd12dc7ea4 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_variation_category_list.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_variation_category_list.xml
@@ -3,20 +3,12 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>delegated_list</string> </key>
- <value>
- <list>
- <string>items</string>
- </list>
- </value>
- </item>
<item>
<key> <string>id</string> </key>
<value> <string>my_variation_category_list</string> </value>
@@ -29,6 +21,14 @@
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
+ <item>
+ <key> <string>required_not_found</string> </key>
+ <value> <string>Input is required but no input given.</string> </value>
+ </item>
+ <item>
+ <key> <string>unknown_selection</string> </key>
+ <value> <string>You selected an item that was not in the list.</string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -37,15 +37,75 @@
<value>
<dictionary>
<item>
- <key> <string>extra_context</string> </key>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>first_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hash_script_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>field_id</string> </key>
+ <key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>form_id</string> </key>
+ <key> <string>view_separator</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -56,25 +116,79 @@
<value>
<dictionary>
<item>
- <key> <string>extra_context</string> </key>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>field_id</string> </key>
+ <key> <string>hash_script_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>form_id</string> </key>
+ <key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
- <key> <string>target</string> </key>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -85,18 +199,54 @@
<value>
<dictionary>
<item>
- <key> <string>extra_context</string> </key>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
<value>
<list/>
</value>
</item>
<item>
- <key> <string>field_id</string> </key>
- <value> <string>my_variation_category_list</string> </value>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>first_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>hash_script_id</string> </key>
+ <value> <string>Base_getMultiListFieldPropertyDictList</string> </value>
</item>
<item>
- <key> <string>form_id</string> </key>
- <value> <string>Item_viewFieldLibrary</string> </value>
+ <key> <string>hidden</string> </key>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>items</string> </key>
@@ -104,6 +254,30 @@
<list/>
</value>
</item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <int>5</int> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Variation</string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<br />
+
+]]></string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -121,7 +295,23 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.getVariationRangeCategoryItemList(display_base_category = 0)</string> </value>
+ <value> <string>python: here.Item_getVariationOnMovement()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: here.getAggregateRelatedValue().getVariationRangeCategoryItemList(display_base_category = 0)</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList.xml
index 7286b3c8de2d229afa9eadcd3d163c7f1fa7f93c..e1279299663301625accb9e06abe3a8ca700c0d8 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList.xml
@@ -9,12 +9,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>_bind_names</string> </key>
<value>
@@ -42,12 +36,6 @@
<tuple/>
</value>
</item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>action</string> </key>
<value> <string></string> </value>
@@ -105,6 +93,7 @@
<value>
<list>
<string>listbox_date</string>
+ <string>listbox_variation_category_list</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml
index 40a0f8d553fcc601e449b42f2b044ea79eafd4c4..ee3761ec9fa94b549d10fcfa69d73ef936d36034 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml
@@ -82,7 +82,7 @@
<value>
<dictionary>
<item>
- <key> <string>columns</string> </key>
+ <key> <string>columns</string> </key>
<value>
<list>
<tuple>
@@ -105,6 +105,10 @@
<string>resource_title</string>
<string>Resource</string>
</tuple>
+ <tuple>
+ <string>variation_category_list</string>
+ <string>Variation</string>
+ </tuple>
<tuple>
<string>simulation_state</string>
<string>Explanation State</string>
@@ -113,7 +117,7 @@
</value>
</item>
<item>
- <key> <string>editable_columns</string> </key>
+ <key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
@@ -132,21 +136,21 @@
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
- <key> <string>list_action</string> </key>
+ <key> <string>list_action</string> </key>
<value> <string>Item_viewTrackingList</string> </value>
</item>
<item>
- <key> <string>list_method</string> </key>
+ <key> <string>list_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
- <key> <string>selection_name</string> </key>
+ <key> <string>selection_name</string> </key>
<value> <string>item_tracking_selection</string> </value>
</item>
<item>
- <key> <string>sort</string> </key>
+ <key> <string>sort</string> </key>
<value>
<list>
<tuple>
@@ -161,11 +165,11 @@
<value> <string>Click to edit the target</string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>title</string> </key>
<value> <string>Item Tracking</string> </value>
</item>
<item>
- <key> <string>url_columns</string> </key>
+ <key> <string>url_columns</string> </key>
<value>
<list>
<tuple>
@@ -177,19 +181,23 @@
<string>Brain_getItemExplanationUrl</string>
</tuple>
<tuple>
- <string>node_uid</string>
+ <string>node_title</string>
+ <string>Brain_getItemExplanationUrl</string>
+ </tuple>
+ <tuple>
+ <string>section_title</string>
<string>Brain_getItemExplanationUrl</string>
</tuple>
<tuple>
- <string>section_uid</string>
+ <string>resource_title</string>
<string>Brain_getItemExplanationUrl</string>
</tuple>
<tuple>
- <string>resource_uid</string>
+ <string>variation_category_list</string>
<string>Brain_getItemExplanationUrl</string>
</tuple>
<tuple>
- <string>explanation</string>
+ <string>simulation_state</string>
<string>Brain_getItemExplanationUrl</string>
</tuple>
</list>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_variation_category_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_variation_category_list.xml
new file mode 100644
index 0000000000000000000000000000000000000000..976bf563c41813fa120b1cb9b6b1215d09837f02
--- /dev/null
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_variation_category_list.xml
@@ -0,0 +1,319 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="LinesField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_variation_category_list</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ <item>
+ <key> <string>line_too_long</string> </key>
+ <value> <string>A line was too long.</string> </value>
+ </item>
+ <item>
+ <key> <string>required_not_found</string> </key>
+ <value> <string>Input is required but no input given.</string> </value>
+ </item>
+ <item>
+ <key> <string>too_long</string> </key>
+ <value> <string>You entered too many characters.</string> </value>
+ </item>
+ <item>
+ <key> <string>too_many_lines</string> </key>
+ <value> <string>You entered too many lines.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>height</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_length</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_linelength</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_lines</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>width</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>height</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_length</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_linelength</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_lines</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>width</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>height</string> </key>
+ <value> <int>5</int> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>max_length</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_linelength</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_lines</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>listbox_variation_category_list</string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<br />
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>width</string> </key>
+ <value> <int>40</int> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python:[x[0] for x in here.getAggregateRelatedValue().getVariationCategoryItemList()]</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/testItemDefinedOnResource.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/testItemDefinedOnResource.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e65d9876ad07507fed17e74b16e6d0374ddcc378
--- /dev/null
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/testItemDefinedOnResource.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>if (context.getResource() and context.getResourceValue().getAggregatedPortalTypeList()) or (context.getAggregate()) or (context.getResource() is None and context.getPortalItemTypeList()):\n
+ return 0\n
+else:\n
+ return 1\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>None</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>testItemDefinedOnResource</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_item/bt/revision b/bt5/erp5_item/bt/revision
index b2412e34dff05e77952f3f930772631cac5a3be7..4b6f9c39e5c757bf387d465c53026b336dd8b96c 100644
--- a/bt5/erp5_item/bt/revision
+++ b/bt5/erp5_item/bt/revision
@@ -1 +1 @@
-62
\ No newline at end of file
+64
\ No newline at end of file