From 338f7d8cd32d95cd322f79eb9f4cd7f98fb58b17 Mon Sep 17 00:00:00 2001 From: Fabien Morin <fabien@nexedi.com> Date: Tue, 3 Nov 2009 17:10:05 +0000 Subject: [PATCH] fix severals problems after thierry review git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30263 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../Apparel%20Component/view_measure.xml | 85 +++++++ ...ructions_view.xml => instruction_view.xml} | 6 +- .../Apparel%20Model/development.xml | 6 +- .../allowed_content_types.xml | 1 + .../portal_types/Apparel%20Component.xml | 7 +- .../portal_types/Apparel%20Fabric.xml | 2 +- .../listbox.xml | 2 +- .../listbox.xml | 28 +-- .../my_collection_list.xml | 65 +++-- .../erp5_apparel/ApparelComponent_view.xml | 3 +- .../ApparelComponent_view/listbox.xml | 28 ++- .../listbox_thumbnail.xml | 153 ++++++++++++ .../my_length_quantity.xml | 235 ------------------ .../my_quantity_unit_list.xml | 95 +++++++ .../ApparelComponent_view/my_resource.xml | 11 +- .../ApparelFabricColourVariation_view.xml | 8 +- .../my_collection_list.xml | 65 +++-- .../my_colour_list.xml | 62 ++--- .../my_file.xml | 2 +- .../listbox.xml | 46 ++-- .../erp5_apparel/ApparelFabric_initScript.xml | 125 ++++++++++ .../erp5_apparel/ApparelFabric_view.xml | 4 +- .../ApparelFabric_view/listbox.xml | 15 +- .../ApparelFabric_view/my_resource.xml | 11 +- bt5/erp5_apparel/bt/revision | 2 +- bt5/erp5_apparel/bt/template_action_path_list | 3 +- ...late_portal_type_allowed_content_type_list | 1 + 27 files changed, 634 insertions(+), 437 deletions(-) create mode 100644 bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/view_measure.xml rename bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/{instructions_view.xml => instruction_view.xml} (94%) create mode 100644 bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/listbox_thumbnail.xml delete mode 100644 bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_length_quantity.xml create mode 100644 bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_quantity_unit_list.xml create mode 100644 bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_initScript.xml diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/view_measure.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/view_measure.xml new file mode 100644 index 0000000000..21770ffd9f --- /dev/null +++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Component/view_measure.xml @@ -0,0 +1,85 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>action</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>action_type/object_view</string> + </tuple> + </value> + </item> + <item> + <key> <string>category</string> </key> + <value> <string>object_view</string> </value> + </item> + <item> + <key> <string>condition</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>icon</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>view_measure</string> </value> + </item> + <item> + <key> <string>permissions</string> </key> + <value> + <tuple> + <string>View</string> + </tuple> + </value> + </item> + <item> + <key> <string>priority</string> </key> + <value> <float>1.5</float> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Measure</string> </value> + </item> + <item> + <key> <string>visible</string> </key> + <value> <int>1</int> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <global name="Expression" module="Products.CMFCore.Expression"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>text</string> </key> + <value> <string>string:${object_url}/Resource_viewMeasure</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/instructions_view.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/instruction_view.xml similarity index 94% rename from bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/instructions_view.xml rename to bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/instruction_view.xml index 84d19b5d4d..e318a4f566 100644 --- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/instructions_view.xml +++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Fabric/instruction_view.xml @@ -33,7 +33,9 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> + <none/> + </value> </item> <item> <key> <string>icon</string> </key> @@ -41,7 +43,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>instructions_view</string> </value> + <value> <string>instruction_view</string> </value> </item> <item> <key> <string>permissions</string> </key> diff --git a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/development.xml b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/development.xml index 507dfbbe33..13514f6789 100644 --- a/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/development.xml +++ b/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/development.xml @@ -33,7 +33,9 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> + <none/> + </value> </item> <item> <key> <string>icon</string> </key> @@ -57,7 +59,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Industrial description</string> </value> + <value> <string>Industrial Description</string> </value> </item> <item> <key> <string>visible</string> </key> diff --git a/bt5/erp5_apparel/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_apparel/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 7e473c1121..7d71439980 100644 --- a/bt5/erp5_apparel/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_apparel/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -24,6 +24,7 @@ <portal_type id="Apparel Component"> <item>Apparel Component Variation</item> <item>Mapped Value</item> + <item>Measure</item> <item>Purchase Supply Line</item> <item>Sale Supply Line</item> <item>Supply Line</item> diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component.xml index 7d05916e17..5d50036670 100644 --- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component.xml +++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Component.xml @@ -48,7 +48,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string>A apparel component\n + <value> <string>A apparel component\r\n </string> </value> </item> <item> @@ -67,6 +67,7 @@ <key> <string>group_list</string> </key> <value> <tuple> + <string>product</string> <string>resource</string> </tuple> </value> @@ -81,7 +82,9 @@ </item> <item> <key> <string>permission</string> </key> - <value> <string></string> </value> + <value> + <none/> + </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric.xml index 4301755cd7..c535f0c0e5 100644 --- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric.xml +++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Fabric.xml @@ -78,7 +78,7 @@ </item> <item> <key> <string>init_script</string> </key> - <value> <string>Resource_init</string> </value> + <value> <string>ApparelFabric_initScript</string> </value> </item> <item> <key> <string>permission</string> </key> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/listbox.xml index c40f22720b..b6e5a7aca9 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/listbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/listbox.xml @@ -414,7 +414,7 @@ </tuple> <tuple> <string>colour</string> - <string>Colour referential</string> + <string>Colour Referential</string> </tuple> </list> </value> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponentModule_viewApparelComponentList/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponentModule_viewApparelComponentList/listbox.xml index 97ce940a44..4e0f15338e 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponentModule_viewApparelComponentList/listbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponentModule_viewApparelComponentList/listbox.xml @@ -209,9 +209,7 @@ </item> <item> <key> <string>domain_root_list</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <value> <string></string> </value> </item> <item> <key> <string>domain_tree</string> </key> @@ -500,7 +498,11 @@ <list> <tuple> <string>resource</string> - <string>Resource</string> + <string>Component Type</string> + </tuple> + <tuple> + <string>segment</string> + <string>Segment</string> </tuple> <tuple> <string>collection</string> @@ -564,7 +566,7 @@ <item> <key> <string>list_method</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -720,22 +722,6 @@ </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>here/Apparel_getDomainRootListFromModule</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <global name="Method" module="Products.Formulator.MethodField"/> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponentVariation_view/my_collection_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponentVariation_view/my_collection_list.xml index 13a407e884..1658ece24e 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponentVariation_view/my_collection_list.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponentVariation_view/my_collection_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> @@ -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> @@ -145,6 +151,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> @@ -152,7 +166,7 @@ <item> <key> <string>items</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -220,6 +234,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_hashCategoryList</string> </value> + </item> <item> <key> <string>hidden</string> </key> <value> <int>0</int> </value> @@ -236,7 +258,7 @@ </item> <item> <key> <string>size</string> </key> - <value> <int>5</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>title</string> </key> @@ -250,8 +272,7 @@ <key> <string>view_separator</string> </key> <value> <string encoding="cdata"><![CDATA[ -<br />\n - +<br /> ]]></string> </value> </item> @@ -264,37 +285,15 @@ <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/getCollectionList</string> </value> - </item> - </dictionary> - </pickle> - </record> - <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>here/portal_categories/collection/getCategoryChildLogicalPathItemList</string> </value> + <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'my_\', \'\', 1).replace(\'_list\', \'\')], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view.xml index 9f7e519703..b485fd8674 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view.xml @@ -86,12 +86,13 @@ <string>my_title</string> <string>my_resource</string> <string>my_trade_description</string> + <string>my_quantity_unit_list</string> <string>my_base_weight</string> <string>my_base_length</string> <string>my_base_width</string> <string>my_base_height</string> - <string>my_length_quantity</string> <string>composition_title</string> + <string>listbox_thumbnail</string> </list> </value> </item> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/listbox.xml index 2482f40eb2..449b775982 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/listbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/listbox.xml @@ -322,6 +322,10 @@ <string>description</string> <string>Description</string> </tuple> + <tuple> + <string>thumbnail</string> + <string>Thumbnail</string> + </tuple> </list> </value> </item> @@ -337,7 +341,7 @@ </item> <item> <key> <string>anchor</string> </key> - <value> <int>1</int> </value> + <value> <int>0</int> </value> </item> <item> <key> <string>columns</string> </key> @@ -355,6 +359,10 @@ <string>description</string> <string>Description</string> </tuple> + <tuple> + <string>thumbnail</string> + <string>Thumbnail</string> + </tuple> </list> </value> </item> @@ -393,7 +401,7 @@ </item> <item> <key> <string>domain_tree</string> </key> - <value> <int>1</int> </value> + <value> <int>0</int> </value> </item> <item> <key> <string>editable</string> </key> @@ -402,7 +410,12 @@ <item> <key> <string>editable_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>thumbnail</string> + <string>Thumbnail</string> + </tuple> + </list> </value> </item> <item> @@ -465,17 +478,12 @@ <item> <key> <string>report_root_list</string> </key> <value> - <list> - <tuple> - <string>collection</string> - <string>Collection</string> - </tuple> - </list> + <list/> </value> </item> <item> <key> <string>report_tree</string> </key> - <value> <int>1</int> </value> + <value> <int>0</int> </value> </item> <item> <key> <string>row_css_method</string> </key> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/listbox_thumbnail.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/listbox_thumbnail.xml new file mode 100644 index 0000000000..1dd17bf185 --- /dev/null +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/listbox_thumbnail.xml @@ -0,0 +1,153 @@ +<?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> + <string>enabled</string> + <string>image_display</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_thumbnail</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>enabled</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</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>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_thumbnail</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>File_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>image_display</string> </key> + <value> <string>micro</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>cell/absolute_url</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:cell.portal_type != \'File\'</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_length_quantity.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_length_quantity.xml deleted file mode 100644 index 30b9b6017c..0000000000 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_length_quantity.xml +++ /dev/null @@ -1,235 +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>my_length_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> - <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> <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>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>input_style</string> </key> - <value> <string>-1234.5</string> </value> - </item> - <item> - <key> <string>precision</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>Length Quantity</string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_quantity_unit_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_quantity_unit_list.xml new file mode 100644 index 0000000000..2f2e39d098 --- /dev/null +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_quantity_unit_list.xml @@ -0,0 +1,95 @@ +<?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_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>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>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>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>extra_context</string> </key> + <value> + <list/> + </value> + </item> + <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>Resource_viewFieldLibrary</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_resource.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_resource.xml index ee0cbd6509..7bd47f58a6 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_resource.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_resource.xml @@ -248,7 +248,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Resource</string> </value> + <value> <string>Component Type</string> </value> </item> <item> <key> <string>unicode</string> </key> @@ -267,18 +267,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/portal_categories/resource/getCategoryChildLogicalPathItemList</string> </value> + <value> <string>python: getattr(here.portal_categories.resource.components, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view.xml index 3ed7a7e813..faf45b3478 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view.xml @@ -76,8 +76,8 @@ <list> <string>my_title</string> <string>my_source_reference</string> - <string>my_colour_list</string> - <string>my_collection_list</string> + <string>Image_view</string> + <string>my_file</string> </list> </value> </item> @@ -85,8 +85,8 @@ <key> <string>right</string> </key> <value> <list> - <string>Image_view</string> - <string>my_file</string> + <string>my_collection_list</string> + <string>my_colour_list</string> </list> </value> </item> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view/my_collection_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view/my_collection_list.xml index 13a407e884..1658ece24e 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view/my_collection_list.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view/my_collection_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> @@ -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> @@ -145,6 +151,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> @@ -152,7 +166,7 @@ <item> <key> <string>items</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -220,6 +234,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_hashCategoryList</string> </value> + </item> <item> <key> <string>hidden</string> </key> <value> <int>0</int> </value> @@ -236,7 +258,7 @@ </item> <item> <key> <string>size</string> </key> - <value> <int>5</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>title</string> </key> @@ -250,8 +272,7 @@ <key> <string>view_separator</string> </key> <value> <string encoding="cdata"><![CDATA[ -<br />\n - +<br /> ]]></string> </value> </item> @@ -264,37 +285,15 @@ <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/getCollectionList</string> </value> - </item> - </dictionary> - </pickle> - </record> - <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>here/portal_categories/collection/getCategoryChildLogicalPathItemList</string> </value> + <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'my_\', \'\', 1).replace(\'_list\', \'\')], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view/my_colour_list.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view/my_colour_list.xml index 0610d0de0c..fc6dd5348b 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view/my_colour_list.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view/my_colour_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> @@ -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> @@ -145,6 +151,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> @@ -152,7 +166,7 @@ <item> <key> <string>items</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -220,6 +234,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_hashCategoryList</string> </value> + </item> <item> <key> <string>hidden</string> </key> <value> <int>0</int> </value> @@ -236,7 +258,7 @@ </item> <item> <key> <string>size</string> </key> - <value> <int>5</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>title</string> </key> @@ -263,37 +285,15 @@ <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/getColourList</string> </value> - </item> - </dictionary> - </pickle> - </record> - <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>here/portal_categories/colour/getCategoryChildLogicalPathItemList</string> </value> + <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'my_\', \'\', 1).replace(\'_list\', \'\')], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view/my_file.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view/my_file.xml index d46842a23b..4d6b2ea239 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view/my_file.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricColourVariation_view/my_file.xml @@ -184,7 +184,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Upload</string> </value> + <value> <string>Image</string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricModule_viewApparelFabricList/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricModule_viewApparelFabricList/listbox.xml index cefce09630..1513e29647 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricModule_viewApparelFabricList/listbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricModule_viewApparelFabricList/listbox.xml @@ -209,9 +209,7 @@ </item> <item> <key> <string>domain_root_list</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <value> <string></string> </value> </item> <item> <key> <string>domain_tree</string> </key> @@ -507,32 +505,36 @@ <value> <list> <tuple> - <string>apparel_fabric_category</string> - <string>Fabric category</string> + <string>resource</string> + <string>Fabric Type</string> </tuple> <tuple> <string>visual_pattern</string> <string>Motive</string> </tuple> + <tuple> + <string>quantity_unit</string> + <string>Quantity Unit</string> + </tuple> + <tuple> + <string>composition</string> + <string>Composition</string> + </tuple> <tuple> <string>collection</string> <string>Collection</string> </tuple> <tuple> <string>segment</string> - <string>Eip</string> + <string>Segment</string> </tuple> <tuple> - <string>composition</string> - <string>Composition</string> + <string>fabric_brand</string> + <string>Fabric Brand</string> </tuple> <tuple> <string>cleaning_code</string> - <string>Upkeep code</string> - </tuple> - <tuple> - <string>apparel_label</string> - <string>Label</string> + <string>Cleaning Code</string> </tuple> </list> </value> @@ -584,7 +586,7 @@ <item> <key> <string>list_method</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -756,22 +758,6 @@ </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>here/Apparel_getDomainRootListFromModule</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <global name="Method" module="Products.Formulator.MethodField"/> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_initScript.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_initScript.xml new file mode 100644 index 0000000000..5b2163dbc9 --- /dev/null +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_initScript.xml @@ -0,0 +1,125 @@ +<?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>context.setQuantityUnitList([\'length/1\', \'area/square_cm\'])\n +context.Resource_init()\n +</string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>*args, **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>args</string> + <string>kw</string> + <string>_getattr_</string> + <string>context</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>ApparelFabric_initScript</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view.xml index dff3536682..8dfac634be 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view.xml @@ -95,10 +95,10 @@ <string>my_title</string> <string>my_quality_reference</string> <string>my_drawing_reference</string> - <string>my_apparel_fabric_template_title</string> - <string>my_quantity_unit_list</string> <string>my_resource</string> <string>my_visual_pattern</string> + <string>my_quantity_unit_list</string> + <string>my_apparel_fabric_template_title</string> <string>my_trade_description</string> <string>my_colour_count</string> <string>my_raw_width</string> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/listbox.xml index 1a0493870a..a2880b5cd0 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/listbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/listbox.xml @@ -365,7 +365,7 @@ </item> <item> <key> <string>anchor</string> </key> - <value> <int>1</int> </value> + <value> <int>0</int> </value> </item> <item> <key> <string>columns</string> </key> @@ -415,21 +415,12 @@ <item> <key> <string>domain_root_list</string> </key> <value> - <list> - <tuple> - <string>collection</string> - <string>Collection</string> - </tuple> - <tuple> - <string>colour</string> - <string>Colour Referential</string> - </tuple> - </list> + <list/> </value> </item> <item> <key> <string>domain_tree</string> </key> - <value> <int>1</int> </value> + <value> <int>0</int> </value> </item> <item> <key> <string>editable</string> </key> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_resource.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_resource.xml index ee0cbd6509..33dc8a02c4 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_resource.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_resource.xml @@ -248,7 +248,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Resource</string> </value> + <value> <string>Fabric Type</string> </value> </item> <item> <key> <string>unicode</string> </key> @@ -267,18 +267,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/portal_categories/resource/getCategoryChildLogicalPathItemList</string> </value> + <value> <string>python: getattr(here.portal_categories.resource.fabric, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_apparel/bt/revision b/bt5/erp5_apparel/bt/revision index d800886d9c..a09fd8ad47 100644 --- a/bt5/erp5_apparel/bt/revision +++ b/bt5/erp5_apparel/bt/revision @@ -1 +1 @@ -123 \ No newline at end of file +124 \ No newline at end of file diff --git a/bt5/erp5_apparel/bt/template_action_path_list b/bt5/erp5_apparel/bt/template_action_path_list index ee4d106b02..bad8fb6a21 100644 --- a/bt5/erp5_apparel/bt/template_action_path_list +++ b/bt5/erp5_apparel/bt/template_action_path_list @@ -53,6 +53,7 @@ Apparel Component | purchase_price_view Apparel Component | sale_price_view Apparel Component | view Apparel Component | view_composition +Apparel Component | view_measure Apparel Consumption Module | csv_export Apparel Consumption Module | csv_import Apparel Consumption Module | list_ui @@ -80,7 +81,7 @@ Apparel Fabric Module | search Apparel Fabric Module | sort_on Apparel Fabric Module | view Apparel Fabric Module | workflow_report -Apparel Fabric | instructions_view +Apparel Fabric | instruction_view Apparel Fabric | purchase_price_view Apparel Fabric | sale_price_view Apparel Fabric | view diff --git a/bt5/erp5_apparel/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_apparel/bt/template_portal_type_allowed_content_type_list index 326032b947..858dd8d306 100644 --- a/bt5/erp5_apparel/bt/template_portal_type_allowed_content_type_list +++ b/bt5/erp5_apparel/bt/template_portal_type_allowed_content_type_list @@ -9,6 +9,7 @@ Apparel Colour Range | Apparel Colour Range Variation Apparel Component Module | Apparel Component Apparel Component | Apparel Component Variation Apparel Component | Mapped Value +Apparel Component | Measure Apparel Component | Purchase Supply Line Apparel Component | Sale Supply Line Apparel Component | Supply Line -- 2.30.9