From 6f56bfa53960f9acf79fe118f25eb32c59a405e5 Mon Sep 17 00:00:00 2001
From: Fabien Morin <fabien@nexedi.com>
Date: Wed, 30 Sep 2009 13:30:07 +0000
Subject: [PATCH] - use parallel list field instead of the dusty fields - bt
format update - use quantity instead of measure - use a much better
ApparelCloth_asCellRange method - add quantity_unit_list field to be able to
chose a quantity unit
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29324 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_types/Apparel%20Cloth.xml | 14 +
.../ApparelBath_view/my_resource_title.xml | 7 +-
.../ApparelBath_view/my_title.xml | 7 +-
.../my_variation_category_list.xml | 7 +-
.../erp5_apparel/ApparelCloth_asCellRange.xml | 62 ++--
.../erp5_apparel/ApparelCloth_view.xml | 4 +-
.../ApparelCloth_view/my_size_list.xml | 301 ------------------
.../my_variation_base_category_list.xml | 93 ++++++
...ist.xml => my_variation_category_list.xml} | 80 +++--
.../erp5_apparel/ApparelCloth_viewMeasure.xml | 11 +-
.../ApparelCloth_viewMeasure/matrixbox.xml | 8 +-
.../matrixbox_measure.xml | 248 ---------------
.../matrixbox_quantity.xml | 121 +++++++
.../my_quantity_unit_list.xml | 87 +++++
..._apparel_fabric_colour_variation_title.xml | 7 +-
.../my_title.xml | 7 +-
.../ApparelFabricItem_view/listbox.xml | 7 +-
.../ApparelFabricItem_view/my_net_width.xml | 7 +-
.../ApparelFabricItem_view/my_quantity.xml | 7 +-
.../my_quantity_unit.xml | 7 +-
.../my_resource_title.xml | 7 +-
.../my_source_title.xml | 7 +-
.../ApparelFabricItem_view/my_title.xml | 7 +-
.../my_variation_category_list.xml | 7 +-
.../ApparelFabric_viewComposition.xml | 2 +-
.../matrixbox.xml | 22 +-
.../matrixbox_quantity.xml | 196 ++----------
.../listbox.xml | 7 +-
.../ApparelModel_view/apparel_model_state.xml | 7 +-
.../my_apparel_cloth_title_list.xml | 7 +-
.../ApparelModel_view/my_brand.xml | 7 +-
.../my_cleaning_code_list.xml | 7 +-
.../ApparelModel_view/my_collection.xml | 7 +-
.../ApparelModel_view/my_comment.xml | 7 +-
.../ApparelModel_view/my_description.xml | 7 +-
.../my_destination_reference.xml | 7 +-
.../ApparelModel_view/my_ean13_code.xml | 7 +-
.../my_industrial_phase_list.xml | 7 +-
.../ApparelModel_view/my_origin.xml | 7 +-
.../ApparelModel_view/my_segment.xml | 7 +-
.../ApparelModel_view/my_size_list.xml | 7 +-
.../my_tariff_nomenclature.xml | 7 +-
.../ApparelModel_view/my_title.xml | 7 +-
.../my_trade_description.xml | 7 +-
.../my_transformation_state_list.xml | 7 +-
bt5/erp5_apparel/bt/revision | 2 +-
46 files changed, 531 insertions(+), 937 deletions(-)
delete mode 100644 bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/my_size_list.xml
create mode 100644 bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/my_variation_base_category_list.xml
rename bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/{my_measure_list.xml => my_variation_category_list.xml} (81%)
delete mode 100644 bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/matrixbox_measure.xml
create mode 100644 bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/matrixbox_quantity.xml
create mode 100644 bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/my_quantity_unit_list.xml
diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth.xml
index 2c4b3cafb6..e900cc1cff 100644
--- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth.xml
+++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Cloth.xml
@@ -27,6 +27,10 @@
<list/>
</value>
</item>
+ <item>
+ <key> <string>acquire_local_roles</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>allowed_content_types</string> </key>
<value>
@@ -60,6 +64,12 @@
<key> <string>filter_content_types</string> </key>
<value> <int>1</int> </value>
</item>
+ <item>
+ <key> <string>group_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
<item>
<key> <string>hidden_content_type_list</string> </key>
<value>
@@ -74,6 +84,10 @@
<key> <string>init_script</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>permission</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>property_sheet_list</string> </key>
<value>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBath_view/my_resource_title.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBath_view/my_resource_title.xml
index 97137c1b0a..adac64c086 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBath_view/my_resource_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBath_view/my_resource_title.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.RelationField</string>
- <string>RelationStringField</string>
- </tuple>
- <none/>
+ <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBath_view/my_title.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBath_view/my_title.xml
index 26db111463..92af4868e0 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBath_view/my_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBath_view/my_title.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
- </tuple>
- <none/>
+ <global name="StringField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBath_view/my_variation_category_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBath_view/my_variation_category_list.xml
index c0a7168b6f..b79eb02655 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBath_view/my_variation_category_list.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBath_view/my_variation_category_list.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ParallelListField</string>
- <string>ParallelListField</string>
- </tuple>
- <none/>
+ <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_asCellRange.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_asCellRange.xml
index 03ecf5933f..d0ab332597 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_asCellRange.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_asCellRange.xml
@@ -53,21 +53,35 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>if matrixbox == 1:\n
- line = [ (\'measure/\'+x[0],x[0]) for x in context.getMeasureItemList()]\n
- column = [ (\'size/\'+x[0],x[0]) for x in context.getSizeItemList()]\n
- tab = []\n
+ <value> <string encoding="cdata"><![CDATA[
+
+cell_range = []\n
\n
+# Get base category list\n
+selected_base_category_list = context.getVariationBaseCategoryList()\n
\n
-else:\n
- line = [ \'measure/\'+x[0] for x in context.getMeasureItemList()]\n
- column = [ \'size/\'+x[0] for x in context.getSizeItemList()]\n
- tab = []\n
-\n
-cell_range = [line, column]\n
+# Generate cell range\n
+for base_category in selected_base_category_list:\n
+ if matrixbox==1:\n
+ # XXX matrixbox is right_display (not as listfield) \n
+ # => invert display and value in item\n
+ cell_range.append(map(lambda x: (x[1], x[0]),\n
+ context.getVariationCategoryItemList(\n
+ base_category_list=[base_category,],\n
+ display_base_category=display_base_category,\n
+ sort_id=\'id\')))\n
+ else:\n
+ cell_range.append(\n
+ context.getVariationCategoryList(\n
+ base_category_list=[base_category,],\n
+ sort_id=\'id\'))\n
\n
+# Remove empty range\n
+cell_range = [x for x in cell_range if x!=[]]\n
return cell_range\n
-</string> </value>
+
+
+]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
@@ -77,7 +91,7 @@ return cell_range\n
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>matrixbox=0, base_id=None</string> </value>
+ <value> <string>base_id=\'path\', matrixbox=0, display_base_category=1, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -97,25 +111,26 @@ return cell_range\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>2</int> </value>
+ <value> <int>3</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
- <string>matrixbox</string>
<string>base_id</string>
- <string>append</string>
- <string>$append0</string>
- <string>_getiter_</string>
+ <string>matrixbox</string>
+ <string>display_base_category</string>
+ <string>kw</string>
+ <string>cell_range</string>
<string>_getattr_</string>
<string>context</string>
+ <string>selected_base_category_list</string>
+ <string>_getiter_</string>
+ <string>base_category</string>
+ <string>map</string>
+ <string>append</string>
+ <string>$append0</string>
<string>x</string>
- <string>_getitem_</string>
- <string>line</string>
- <string>column</string>
- <string>tab</string>
- <string>cell_range</string>
</tuple>
</value>
</item>
@@ -128,8 +143,9 @@ return cell_range\n
<key> <string>func_defaults</string> </key>
<value>
<tuple>
+ <string>path</string>
<int>0</int>
- <none/>
+ <int>1</int>
</tuple>
</value>
</item>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view.xml
index f77d32c8a6..68b7e88e5c 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view.xml
@@ -95,8 +95,8 @@
<key> <string>right</string> </key>
<value>
<list>
- <string>my_size_list</string>
- <string>my_measure_list</string>
+ <string>my_variation_base_category_list</string>
+ <string>my_variation_category_list</string>
<string>my_comment</string>
<string>my_translated_validation_state_title</string>
</list>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/my_size_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/my_size_list.xml
deleted file mode 100644
index 696dbaa5e9..0000000000
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/my_size_list.xml
+++ /dev/null
@@ -1,301 +0,0 @@
-<?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>my_size_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>
- <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>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>6</int> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Size</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>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>here/getSizeList</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>here/portal_categories/size/getCategoryChildLogicalPathItemList</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/my_variation_base_category_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/my_variation_base_category_list.xml
new file mode 100644
index 0000000000..4bc0d4162f
--- /dev/null
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/my_variation_base_category_list.xml
@@ -0,0 +1,93 @@
+<?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/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_variation_base_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>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <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>tales</string> </key>
+ <value>
+ <dictionary>
+ <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>field_id</string> </key>
+ <value> <string>my_variation_base_category_list</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Resource_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/my_measure_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/my_variation_category_list.xml
similarity index 81%
rename from bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/my_measure_list.xml
rename to bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/my_variation_category_list.xml
index cfd4901bd2..a3b0283d5a 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/my_measure_list.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_view/my_variation_category_list.xml
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+ <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
<tuple/>
</tuple>
</pickle>
@@ -11,7 +11,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
- <value> <string>my_measure_list</string> </value>
+ <value> <string>my_variation_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -72,6 +72,14 @@
<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>
@@ -117,9 +125,7 @@
</item>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -131,7 +137,9 @@
</item>
<item>
<key> <string>enabled</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>external_validator</string> </key>
@@ -145,6 +153,14 @@
<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>
@@ -161,7 +177,9 @@
</item>
<item>
<key> <string>size</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -206,7 +224,7 @@
</item>
<item>
<key> <string>enabled</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
@@ -220,6 +238,14 @@
<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>hidden</string> </key>
<value> <int>0</int> </value>
@@ -236,11 +262,11 @@
</item>
<item>
<key> <string>size</string> </key>
- <value> <int>7</int> </value>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Measure</string> </value>
+ <value> <string>Variation Category</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
@@ -263,18 +289,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>here/getMeasureList</string> </value>
+ <value> <string>python: here.getVariationRangeCategoryItemList(omit_individual_variation=1)</string> </value>
</item>
</dictionary>
</pickle>
@@ -282,18 +305,31 @@
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <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, omit_individual_variation=1)</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>here/portal_categories/measure/getCategoryChildLogicalPathItemList</string> </value>
+ <value> <string>python: preferences.getPreference(\'preferred_textarea_height\', 5)</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure.xml
index a17f801c31..a096c67341 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure.xml
@@ -77,7 +77,10 @@
<item>
<key> <string>center</string> </key>
<value>
- <list/>
+ <list>
+ <string>my_title</string>
+ <string>my_quantity_unit_list</string>
+ </list>
</value>
</item>
<item>
@@ -85,16 +88,14 @@
<value>
<list>
<string>matrixbox_membership_criterion_category_list</string>
- <string>matrixbox_measure</string>
+ <string>matrixbox_quantity</string>
</list>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
- <list>
- <string>my_title</string>
- </list>
+ <list/>
</value>
</item>
<item>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/matrixbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/matrixbox.xml
index 85fc92dba3..7055ea4c8c 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/matrixbox.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/matrixbox.xml
@@ -192,6 +192,10 @@
<key> <string>cell_base_id</string> </key>
<value> <string>measure</string> </value>
</item>
+ <item>
+ <key> <string>cell_getter_method</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>cell_portal_type</string> </key>
<value> <string>Mapped Value</string> </value>
@@ -223,8 +227,8 @@
<value>
<list>
<tuple>
- <string>measure</string>
- <string>measure</string>
+ <string>quantity</string>
+ <string>quantity</string>
</tuple>
<tuple>
<string>membership_criterion_category_list</string>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/matrixbox_measure.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/matrixbox_measure.xml
deleted file mode 100644
index 8eb5fd809d..0000000000
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/matrixbox_measure.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="FloatField" module="Products.Formulator.StandardFields"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>id</string> </key>
- <value> <string>matrixbox_measure</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>not_float</string> </key>
- <value> <string>You did not enter a floating point number.</string> </value>
- </item>
- <item>
- <key> <string>required_not_found</string> </key>
- <value> <string>Input is required but no input given.</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>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</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>hidden</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>whitespace_preserve</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>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</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>hidden</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>whitespace_preserve</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> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <int>10</int> </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>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>matrixbox_measure</string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: cell.getProperty(\'measure\')</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/matrixbox_quantity.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/matrixbox_quantity.xml
new file mode 100644
index 0000000000..fc08b7b92f
--- /dev/null
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/matrixbox_quantity.xml
@@ -0,0 +1,121 @@
+<?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>default</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>matrixbox_quantity</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>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>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </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>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_quantity</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</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: cell is not None and cell.getQuantity() or \'\'</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/my_quantity_unit_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/my_quantity_unit_list.xml
new file mode 100644
index 0000000000..e2e249e077
--- /dev/null
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelCloth_viewMeasure/my_quantity_unit_list.xml
@@ -0,0 +1,87 @@
+<?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>id</string> </key>
+ <value> <string>my_quantity_unit_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>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <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>tales</string> </key>
+ <value>
+ <dictionary>
+ <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>field_id</string> </key>
+ <value> <string>my_quantity_unit_list</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Product_view</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_apparel_fabric_colour_variation_title.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_apparel_fabric_colour_variation_title.xml
index a18d5e320e..fdf4edac64 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_apparel_fabric_colour_variation_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_apparel_fabric_colour_variation_title.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.MultiRelationField</string>
- <string>MultiRelationStringField</string>
- </tuple>
- <none/>
+ <global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml
index 964456e69f..b57e1f668f 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
- </tuple>
- <none/>
+ <global name="StringField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/listbox.xml
index 716a7f017a..9c5a52e11a 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/listbox.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/listbox.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ListBox</string>
- <string>ListBox</string>
- </tuple>
- <none/>
+ <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_net_width.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_net_width.xml
index caaf471317..6b90e9925a 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_net_width.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_net_width.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>FloatField</string>
- </tuple>
- <none/>
+ <global name="FloatField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_quantity.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_quantity.xml
index d22c63e323..a0901f4c7b 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_quantity.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_quantity.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>FloatField</string>
- </tuple>
- <none/>
+ <global name="FloatField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_quantity_unit.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_quantity_unit.xml
index c81f8bd54a..cf4e849b33 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_quantity_unit.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_quantity_unit.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_resource_title.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_resource_title.xml
index 97137c1b0a..adac64c086 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_resource_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_resource_title.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.RelationField</string>
- <string>RelationStringField</string>
- </tuple>
- <none/>
+ <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_source_title.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_source_title.xml
index d1fa824774..19666ec72c 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_source_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_source_title.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.RelationField</string>
- <string>RelationStringField</string>
- </tuple>
- <none/>
+ <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_title.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_title.xml
index 26db111463..92af4868e0 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_title.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
- </tuple>
- <none/>
+ <global name="StringField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_variation_category_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_variation_category_list.xml
index c0a7168b6f..b79eb02655 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_variation_category_list.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_view/my_variation_category_list.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ParallelListField</string>
- <string>ParallelListField</string>
- </tuple>
- <none/>
+ <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_viewComposition.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_viewComposition.xml
index 7dd1b05f16..25f181fee1 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_viewComposition.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_viewComposition.xml
@@ -84,8 +84,8 @@
<key> <string>hidden</string> </key>
<value>
<list>
- <string>matrixbox_quantity</string>
<string>matrixbox_membership_criterion_category_list</string>
+ <string>matrixbox_quantity</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_viewComposition/matrixbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_viewComposition/matrixbox.xml
index d4ede02107..74db506215 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_viewComposition/matrixbox.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_viewComposition/matrixbox.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.MatrixBox</string>
- <string>MatrixBox</string>
- </tuple>
- <none/>
+ <global name="MatrixBox" module="Products.ERP5Form.MatrixBox"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -182,6 +179,10 @@
<key> <string>cell_base_id</string> </key>
<value> <string>composition</string> </value>
</item>
+ <item>
+ <key> <string>cell_getter_method</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>cell_portal_type</string> </key>
<value> <string>Mapped Value</string> </value>
@@ -257,16 +258,7 @@
<item>
<key> <string>lines</string> </key>
<value>
- <list>
- <tuple>
- <string>coton</string>
- <string>coton</string>
- </tuple>
- <tuple>
- <string>elastanne</string>
- <string>elastanne</string>
- </tuple>
- </list>
+ <list/>
</value>
</item>
<item>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_viewComposition/matrixbox_quantity.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_viewComposition/matrixbox_quantity.xml
index 59b36d6e54..c24eebf81f 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_viewComposition/matrixbox_quantity.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_viewComposition/matrixbox_quantity.xml
@@ -3,15 +3,21 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>IntegerField</string>
- </tuple>
- <none/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>default</string>
+ <string>input_style</string>
+ </list>
+ </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>matrixbox_quantity</string> </value>
@@ -19,7 +25,12 @@
<item>
<key> <string>message_values</string> </key>
<value>
- <dictionary/>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
@@ -27,63 +38,15 @@
<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>display_maxwidth</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>display_width</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>end</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>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>start</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -93,14 +56,6 @@
<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>
@@ -108,55 +63,15 @@
</value>
</item>
<item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_maxwidth</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>display_width</string> </key>
+ <key> <string>form_id</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>end</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>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>start</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -166,65 +81,25 @@
<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> <string></string> </value>
</item>
<item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <int>20</int> </value>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_quantity</string> </value>
</item>
<item>
- <key> <string>enabled</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>end</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>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>start</string> </key>
- <value> <string></string> </value>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
- <key> <string>title</string> </key>
- <value> <string>matrixbox_quantity</string> </value>
+ <key> <string>input_style</string> </key>
+ <value> <string>-12.3%</string> </value>
</item>
<item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
@@ -235,18 +110,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: cell.quantity</string> </value>
+ <value> <string>python: cell is not None and cell.getQuantity() or \'\'</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModelModule_viewApparelModelList/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModelModule_viewApparelModelList/listbox.xml
index 6d90d10527..408377a721 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModelModule_viewApparelModelList/listbox.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModelModule_viewApparelModelList/listbox.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ListBox</string>
- <string>ListBox</string>
- </tuple>
- <none/>
+ <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/apparel_model_state.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/apparel_model_state.xml
index 1a240b489f..29b9955c36 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/apparel_model_state.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/apparel_model_state.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
- </tuple>
- <none/>
+ <global name="StringField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_apparel_cloth_title_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_apparel_cloth_title_list.xml
index ec50c58584..7978bcf78c 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_apparel_cloth_title_list.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_apparel_cloth_title_list.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.MultiRelationField</string>
- <string>MultiRelationStringField</string>
- </tuple>
- <none/>
+ <global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_brand.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_brand.xml
index 57adcfdeff..5ced4d1b59 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_brand.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_brand.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_cleaning_code_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_cleaning_code_list.xml
index 363130e673..73a2b1b68f 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_cleaning_code_list.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_cleaning_code_list.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>MultiListField</string>
- </tuple>
- <none/>
+ <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_collection.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_collection.xml
index 8d125e5e59..e6c2c38bc5 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_collection.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_collection.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_comment.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_comment.xml
index dc157d8588..70ba5a8f55 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_comment.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_comment.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>TextAreaField</string>
- </tuple>
- <none/>
+ <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_description.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_description.xml
index ab689832af..0f47f022d0 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_description.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_description.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>TextAreaField</string>
- </tuple>
- <none/>
+ <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_destination_reference.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_destination_reference.xml
index efbea2f1f6..2b79a68265 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_destination_reference.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_destination_reference.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
- </tuple>
- <none/>
+ <global name="StringField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_ean13_code.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_ean13_code.xml
index 05febecfbc..fe9ed5b906 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_ean13_code.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_ean13_code.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
- </tuple>
- <none/>
+ <global name="StringField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_industrial_phase_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_industrial_phase_list.xml
index 3e90547d64..11d9ad1392 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_industrial_phase_list.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_industrial_phase_list.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>MultiListField</string>
- </tuple>
- <none/>
+ <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_origin.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_origin.xml
index 7effc8d560..521ae5368a 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_origin.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_origin.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_segment.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_segment.xml
index 7cb7ce5c18..de7f55a743 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_segment.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_segment.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_size_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_size_list.xml
index 2eed454015..510ebeea77 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_size_list.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_size_list.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>MultiListField</string>
- </tuple>
- <none/>
+ <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_tariff_nomenclature.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_tariff_nomenclature.xml
index 0c251be19b..fa0184982b 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_tariff_nomenclature.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_tariff_nomenclature.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_title.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_title.xml
index 8066dffd82..d19b7424a2 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_title.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
- </tuple>
- <none/>
+ <global name="StringField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_trade_description.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_trade_description.xml
index 189d382846..423139e480 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_trade_description.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_trade_description.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
- </tuple>
- <none/>
+ <global name="StringField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_transformation_state_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_transformation_state_list.xml
index 72ecd4adbb..fdee35d97a 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_transformation_state_list.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_transformation_state_list.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>MultiListField</string>
- </tuple>
- <none/>
+ <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_apparel/bt/revision b/bt5/erp5_apparel/bt/revision
index 7d37386284..abc4eff6ac 100644
--- a/bt5/erp5_apparel/bt/revision
+++ b/bt5/erp5_apparel/bt/revision
@@ -1 +1 @@
-45
\ No newline at end of file
+46
\ No newline at end of file
--
2.30.9