From aaefffd86dbc921975c04717cf32cb89d47d968c Mon Sep 17 00:00:00 2001 From: Fabien Morin <fabien@nexedi.com> Date: Thu, 8 Oct 2009 15:18:21 +0000 Subject: [PATCH] - Apparel Assortment now belong to product and resource group - improve many listboxes by adding columns, thumbnail, proxify - use quantity_unit_title instead of quantity_unit - use more generic tales expression git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29482 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_types/Apparel%20Assortment.xml | 76 +++ .../erp5_apparel/ApparelAssortment_view.xml | 9 + .../ApparelAssortment_view/listbox.xml | 77 ++- .../listbox_thumbnail.xml | 153 ++++++ .../listbox.xml | 486 +++--------------- .../listbox.xml | 46 +- .../listbox.xml | 8 +- .../ApparelFabricItem_view/listbox.xml | 95 +++- .../my_quantity_unit.xml | 9 +- .../ApparelFabric_view/listbox.xml | 26 +- .../my_description.xml | 4 +- .../ApparelModel_view/listbox.xml | 8 +- .../ApparelShape_view/listbox.xml | 16 +- .../erp5_apparel/ApparelSize_asCellRange.xml | 7 +- .../matrixbox.xml | 12 +- .../my_quantity_unit.xml | 9 +- bt5/erp5_apparel/bt/revision | 2 +- 17 files changed, 554 insertions(+), 489 deletions(-) create mode 100644 bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_view/listbox_thumbnail.xml diff --git a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment.xml b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment.xml index b25bc2f752..4d24321829 100644 --- a/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment.xml +++ b/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Assortment.xml @@ -21,12 +21,35 @@ <dictionary/> </value> </item> + <item> + <key> <string>_property_domain_dict</string> </key> + <value> + <dictionary> + <item> + <key> <string>short_title</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + </dictionary> + </value> + </item> <item> <key> <string>_roles</string> </key> <value> <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 +83,15 @@ <key> <string>filter_content_types</string> </key> <value> <int>1</int> </value> </item> + <item> + <key> <string>group_list</string> </key> + <value> + <tuple> + <string>product</string> + <string>resource</string> + </tuple> + </value> + </item> <item> <key> <string>hidden_content_type_list</string> </key> <value> @@ -74,6 +106,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> @@ -87,4 +123,44 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>domain_name</string> </key> + <value> <string>erp5_content</string> </value> + </item> + <item> + <key> <string>property_name</string> </key> + <value> <string>short_title</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>domain_name</string> </key> + <value> <string>erp5_content</string> </value> + </item> + <item> + <key> <string>property_name</string> </key> + <value> <string>title</string> </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_view.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_view.xml index 0cf2ceeb2b..a3f0c0eee3 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_view.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_view.xml @@ -56,6 +56,7 @@ <string>right</string> <string>center</string> <string>bottom</string> + <string>hidden</string> </list> </value> </item> @@ -79,6 +80,14 @@ </list> </value> </item> + <item> + <key> <string>hidden</string> </key> + <value> + <list> + <string>listbox_thumbnail</string> + </list> + </value> + </item> <item> <key> <string>left</string> </key> <value> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_view/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_view/listbox.xml index 7ed310cfaa..8dcb5383e2 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_view/listbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_view/listbox.xml @@ -312,16 +312,24 @@ <list> <tuple> <string>title</string> - <string>Colour Variation</string> + <string>Title</string> </tuple> <tuple> <string>description</string> <string>Description</string> </tuple> <tuple> - <string>getPrototype</string> + <string>destination_reference</string> + <string>Customer Colour</string> + </tuple> + <tuple> + <string>prototype</string> <string>Prototype</string> </tuple> + <tuple> + <string>thumbnail</string> + <string>Thumbnail</string> + </tuple> </list> </value> </item> @@ -345,16 +353,24 @@ <list> <tuple> <string>title</string> - <string>Colour Variation</string> + <string>Title</string> </tuple> <tuple> <string>description</string> <string>Description</string> </tuple> <tuple> - <string>getPrototype</string> + <string>destination_reference</string> + <string>Customer Colour</string> + </tuple> + <tuple> + <string>prototype</string> <string>Prototype</string> </tuple> + <tuple> + <string>thumbnail</string> + <string>Thumbnail</string> + </tuple> </list> </value> </item> @@ -397,7 +413,12 @@ <item> <key> <string>editable_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>thumbnail</string> + <string>Thumbnail</string> + </tuple> + </list> </value> </item> <item> @@ -478,7 +499,28 @@ <item> <key> <string>search_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>title</string> + <string>Title</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>destination_reference</string> + <string>Customer Colour</string> + </tuple> + <tuple> + <string>prototype</string> + <string>Prototype</string> + </tuple> + <tuple> + <string>thumbnail</string> + <string>Thumbnail</string> + </tuple> + </list> </value> </item> <item> @@ -498,7 +540,28 @@ <item> <key> <string>sort_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>title</string> + <string>Title</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>destination_reference</string> + <string>Customer Colour</string> + </tuple> + <tuple> + <string>prototype</string> + <string>Prototype</string> + </tuple> + <tuple> + <string>thumbnail</string> + <string>Thumbnail</string> + </tuple> + </list> </value> </item> <item> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_view/listbox_thumbnail.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_view/listbox_thumbnail.xml new file mode 100644 index 0000000000..1dd17bf185 --- /dev/null +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_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/ApparelAssortment_viewRelatedApparelTransformationList/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_viewRelatedApparelTransformationList/listbox.xml index 61f701c2a0..f2c8d99565 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_viewRelatedApparelTransformationList/listbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelAssortment_viewRelatedApparelTransformationList/listbox.xml @@ -3,12 +3,27 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <global name="ListBox" module="Products.ERP5Form.ListBox"/> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> <tuple/> </tuple> </pickle> <pickle> <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>count_method</string> + <string>list_action</string> + <string>list_method</string> + <string>portal_types</string> + <string>search</string> + <string>select</string> + <string>selection_name</string> + <string>title</string> + </list> + </value> + </item> <item> <key> <string>id</string> </key> <value> <string>listbox</string> </value> @@ -29,135 +44,15 @@ <value> <dictionary> <item> - <key> <string>all_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>all_editable_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>columns</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>default_params</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>domain_root_list</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>domain_tree</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable_columns</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>global_attributes</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>lines</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>list_action</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>list_method</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>meta_types</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>portal_types</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>report_root_list</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>report_tree</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>search</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>search_columns</string> </key> + <key> <string>field_id</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>select</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>selection_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>sort</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>sort_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>stat_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>stat_method</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> + <key> <string>form_id</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>url_columns</string> </key> + <key> <string>target</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -168,105 +63,35 @@ <value> <dictionary> <item> - <key> <string>all_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>all_editable_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>columns</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>default_params</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>domain_root_list</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>domain_tree</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable_columns</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>global_attributes</string> </key> + <key> <string>count_method</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>hidden</string> </key> + <key> <string>field_id</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>lines</string> </key> + <key> <string>form_id</string> </key> <value> <string></string> </value> </item> <item> <key> <string>list_action</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>list_method</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>meta_types</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>portal_types</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>report_root_list</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>report_tree</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>search</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>search_columns</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>select</string> </key> <value> <string></string> </value> @@ -276,29 +101,13 @@ <value> <string></string> </value> </item> <item> - <key> <string>sort</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>sort_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>stat_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>stat_method</string> </key> + <key> <string>target</string> </key> <value> <string></string> </value> </item> <item> <key> <string>title</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>url_columns</string> </key> - <value> <string></string> </value> - </item> </dictionary> </value> </item> @@ -306,257 +115,58 @@ <key> <string>values</string> </key> <value> <dictionary> - <item> - <key> <string>all_columns</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>Apparel Transformation</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - <tuple> - <string>translated_validation_state_title</string> - <string>State</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>all_editable_columns</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>anchor</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>columns</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>Apparel Transformation</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - <tuple> - <string>translated_validation_state_title</string> - <string>State</string> - </tuple> - </list> - </value> - </item> <item> <key> <string>count_method</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>default_params</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>domain_root_list</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>domain_tree</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>editable_columns</string> </key> - <value> - <list/> - </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>global_attributes</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>hide_rows_on_no_search_criterion</string> </key> - <value> <int>0</int> </value> + <key> <string>field_id</string> </key> + <value> <string>listbox</string> </value> </item> <item> - <key> <string>lines</string> </key> - <value> <int>30</int> </value> + <key> <string>form_id</string> </key> + <value> <string>TransformationModule_viewTransformationList</string> </value> </item> <item> <key> <string>list_action</string> </key> - <value> <string>list</string> </value> + <value> <string>ApparelAssortment_viewRelatedApparelTransformationList</string> </value> </item> <item> <key> <string>list_method</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>meta_types</string> </key> - <value> - <list/> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> - <item> - <key> <string>page_template</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>portal_types</string> </key> <value> <list> <tuple> - <string>Apparel Transformation</string> - <string>Apparel Transformation</string> + <string>Transformation</string> + <string>Transformation</string> </tuple> </list> </value> </item> - <item> - <key> <string>report_root_list</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>report_tree</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>row_css_method</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>search</string> </key> <value> <int>0</int> </value> </item> - <item> - <key> <string>search_columns</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>Apparel Transformation</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - <tuple> - <string>translated_validation_state_title</string> - <string>State</string> - </tuple> - </list> - </value> - </item> <item> <key> <string>select</string> </key> <value> <int>0</int> </value> </item> <item> <key> <string>selection_name</string> </key> - <value> <string>apparel_assortment_related_apparel_model_selection</string> </value> - </item> - <item> - <key> <string>sort</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>title</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>sort_columns</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>Apparel Transformation</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - <tuple> - <string>translated_validation_state_title</string> - <string>State</string> - </tuple> - </list> - </value> + <value> <string>apparel_assortment_related_transformation_selection</string> </value> </item> <item> - <key> <string>stat_columns</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>stat_method</string> </key> - <value> <string></string> </value> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> </item> <item> <key> <string>title</string> </key> - <value> <string>Related Apparel Transformations</string> </value> - </item> - <item> - <key> <string>untranslatable_columns</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>url_columns</string> </key> - <value> - <list/> - </value> + <value> <string>Related Transformations</string> </value> </item> </dictionary> </value> @@ -565,6 +175,26 @@ </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 encoding="cdata"><![CDATA[ + +string:Base_viewListMode?proxy_form_id=${form/getId}&proxy_field_id=${field/getId} + +]]></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/ApparelBathModule_viewApparelBathList/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBathModule_viewApparelBathList/listbox.xml index ea818994aa..15f856aca3 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBathModule_viewApparelBathList/listbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelBathModule_viewApparelBathList/listbox.xml @@ -322,10 +322,6 @@ <string>resource_title</string> <string>Resource</string> </tuple> - <tuple> - <string>variation_category_list</string> - <string>Variation</string> - </tuple> <tuple> <string>translated_validation_state_title</string> <string>State</string> @@ -363,10 +359,6 @@ <string>resource_title</string> <string>Resource</string> </tuple> - <tuple> - <string>variation_category_list</string> - <string>Variation</string> - </tuple> <tuple> <string>translated_validation_state_title</string> <string>State</string> @@ -494,7 +486,24 @@ <item> <key> <string>search_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>title</string> + <string>Title</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>resource_title</string> + <string>Resource</string> + </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>State</string> + </tuple> + </list> </value> </item> <item> @@ -519,7 +528,24 @@ <item> <key> <string>sort_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>title</string> + <string>Title</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>resource_title</string> + <string>Resource</string> + </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>State</string> + </tuple> + </list> </value> </item> <item> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItemModule_viewApparelFabricItemList/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItemModule_viewApparelFabricItemList/listbox.xml index 60cdfaadd2..06717acf97 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItemModule_viewApparelFabricItemList/listbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItemModule_viewApparelFabricItemList/listbox.xml @@ -331,7 +331,7 @@ <string>Quantity</string> </tuple> <tuple> - <string>quantity_unit</string> + <string>quantity_unit_title</string> <string>Quantity Unit</string> </tuple> <tuple> @@ -380,7 +380,7 @@ <string>Quantity</string> </tuple> <tuple> - <string>quantity_unit</string> + <string>quantity_unit_title</string> <string>Quantity Unit</string> </tuple> <tuple> @@ -528,7 +528,7 @@ <string>Quantity</string> </tuple> <tuple> - <string>quantity_unit</string> + <string>quantity_unit_title</string> <string>Quantity Unit</string> </tuple> <tuple> @@ -578,7 +578,7 @@ <string>Quantity</string> </tuple> <tuple> - <string>quantity_unit</string> + <string>quantity_unit_title</string> <string>Quantity Unit</string> </tuple> <tuple> 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 b72cfc6052..1e8789f963 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 @@ -309,7 +309,32 @@ <item> <key> <string>all_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>title</string> + <string>Title</string> + </tuple> + <tuple> + <string>resource_title</string> + <string>Resource</string> + </tuple> + <tuple> + <string>net_width</string> + <string>Net Width</string> + </tuple> + <tuple> + <string>source_title</string> + <string>Source</string> + </tuple> + <tuple> + <string>quantity</string> + <string>Quantity</string> + </tuple> + <tuple> + <string>quantity_unit_title</string> + <string>Quantity Unit</string> + </tuple> + </list> </value> </item> <item> @@ -338,20 +363,20 @@ <string>resource_title</string> <string>Resource</string> </tuple> - <tuple> - <string>variation_category_list</string> - <string>Variation</string> - </tuple> <tuple> <string>net_width</string> <string>Net Width</string> </tuple> + <tuple> + <string>source_title</string> + <string>Source</string> + </tuple> <tuple> <string>quantity</string> <string>Quantity</string> </tuple> <tuple> - <string>quantity_unit</string> + <string>quantity_unit_title</string> <string>Quantity Unit</string> </tuple> </list> @@ -477,7 +502,32 @@ <item> <key> <string>search_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>title</string> + <string>Title</string> + </tuple> + <tuple> + <string>resource_title</string> + <string>Resource</string> + </tuple> + <tuple> + <string>net_width</string> + <string>Net Width</string> + </tuple> + <tuple> + <string>source_title</string> + <string>Source</string> + </tuple> + <tuple> + <string>quantity</string> + <string>Quantity</string> + </tuple> + <tuple> + <string>quantity_unit_title</string> + <string>Quantity Unit</string> + </tuple> + </list> </value> </item> <item> @@ -493,8 +543,8 @@ <value> <list> <tuple> - <string>id</string> - <string>id</string> + <string>title</string> + <string>title</string> </tuple> </list> </value> @@ -502,7 +552,32 @@ <item> <key> <string>sort_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>title</string> + <string>Title</string> + </tuple> + <tuple> + <string>resource_title</string> + <string>Resource</string> + </tuple> + <tuple> + <string>net_width</string> + <string>Net Width</string> + </tuple> + <tuple> + <string>source_title</string> + <string>Source</string> + </tuple> + <tuple> + <string>quantity</string> + <string>Quantity</string> + </tuple> + <tuple> + <string>quantity_unit_title</string> + <string>Quantity Unit</string> + </tuple> + </list> </value> </item> <item> 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 cf4e849b33..e3c1919a19 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 @@ -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/quantity_unit/getFormItemList</string> </value> + <value> <string>python: here.portal_categories[field.getId().replace(\'my_\', \'\', 1).replace(\'_list\', \'\')].getCategoryChildCompactLogicalPathItemList(display_none_category=1,local_sort_id="compact_title",checked_permission=\'View\')</string> </value> </item> </dictionary> </pickle> 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 c10b45ae13..1a0493870a 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 @@ -179,10 +179,18 @@ <key> <string>alternate_name</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>anchor</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>columns</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>css_class</string> </key> <value> <string></string> </value> @@ -231,6 +239,10 @@ <key> <string>hidden</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>hide_rows_on_no_search_criterion</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>lines</string> </key> <value> <string></string> </value> @@ -247,6 +259,10 @@ <key> <string>meta_types</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>page_template</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>portal_types</string> </key> <value> <string></string> </value> @@ -259,6 +275,10 @@ <key> <string>report_tree</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>row_css_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>search</string> </key> <value> <string></string> </value> @@ -295,6 +315,10 @@ <key> <string>title</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>untranslatable_columns</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>url_columns</string> </key> <value> <string></string> </value> @@ -398,7 +422,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/ApparelModelMorphologyVariation_view/my_description.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModelMorphologyVariation_view/my_description.xml index 0f47f022d0..0764e7869f 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModelMorphologyVariation_view/my_description.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModelMorphologyVariation_view/my_description.xml @@ -236,7 +236,7 @@ </item> <item> <key> <string>height</string> </key> - <value> <int>3</int> </value> + <value> <int>5</int> </value> </item> <item> <key> <string>hidden</string> </key> @@ -272,7 +272,7 @@ </item> <item> <key> <string>width</string> </key> - <value> <int>40</int> </value> + <value> <int>80</int> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/listbox.xml index 097247f4ab..4d149e2b1e 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/listbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/listbox.xml @@ -319,7 +319,7 @@ <string>Description</string> </tuple> <tuple> - <string>getPrototype</string> + <string>prototype</string> <string>Prototype</string> </tuple> <tuple> @@ -360,9 +360,13 @@ <string>Description</string> </tuple> <tuple> - <string>getPrototype</string> + <string>prototype</string> <string>Prototype</string> </tuple> + <tuple> + <string>destination_reference</string> + <string>Customer Colour</string> + </tuple> <tuple> <string>thumbnail</string> <string>Thumbnail</string> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelShape_view/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelShape_view/listbox.xml index 960d72136e..6c922ceb20 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelShape_view/listbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelShape_view/listbox.xml @@ -319,8 +319,8 @@ <string>Description</string> </tuple> <tuple> - <string>measure_drawing</string> - <string>Measure Drawing</string> + <string>image</string> + <string>Technical Drawing Type</string> </tuple> <tuple> <string>thumbnail</string> @@ -356,8 +356,8 @@ <string>Description</string> </tuple> <tuple> - <string>measure_drawing</string> - <string>Measure Drawing</string> + <string>image</string> + <string>Technical Drawing Type</string> </tuple> <tuple> <string>thumbnail</string> @@ -506,8 +506,8 @@ <string>Description</string> </tuple> <tuple> - <string>measure_drawing</string> - <string>Measure Drawing</string> + <string>image</string> + <string>Technical Drawing Type</string> </tuple> <tuple> <string>thumbnail</string> @@ -548,8 +548,8 @@ <string>Description</string> </tuple> <tuple> - <string>measure_drawing</string> - <string>Measure Drawing</string> + <string>image</string> + <string>Technical Drawing Type</string> </tuple> <tuple> <string>thumbnail</string> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelSize_asCellRange.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelSize_asCellRange.xml index 6b7640b946..58e2b7239f 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelSize_asCellRange.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelSize_asCellRange.xml @@ -75,7 +75,7 @@ return cell_range\n </item> <item> <key> <string>_params</string> </key> - <value> <string>matrixbox=0, base_id=None</string> </value> + <value> <string>matrixbox=0, base_id=None, display_base_category=1, **kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -95,7 +95,7 @@ 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> @@ -103,6 +103,8 @@ return cell_range\n <tuple> <string>matrixbox</string> <string>base_id</string> + <string>display_base_category</string> + <string>kw</string> <string>append</string> <string>$append0</string> <string>_getiter_</string> @@ -128,6 +130,7 @@ return cell_range\n <tuple> <int>0</int> <none/> + <int>1</int> </tuple> </value> </item> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelSize_viewCustomerSize/matrixbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelSize_viewCustomerSize/matrixbox.xml index 4aa80224d3..23fc916d7c 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelSize_viewCustomerSize/matrixbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelSize_viewCustomerSize/matrixbox.xml @@ -192,6 +192,14 @@ <key> <string>cell_base_id</string> </key> <value> <string>size</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> + </item> <item> <key> <string>columns</string> </key> <value> @@ -224,8 +232,8 @@ <value> <list> <tuple> - <string>size</string> - <string>size</string> + <string>size_title</string> + <string>Size</string> </tuple> <tuple> <string>membership_criterion_category_list</string> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/archive/ApparelTransformationAssortedResource_viewQuantity/my_quantity_unit.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/archive/ApparelTransformationAssortedResource_viewQuantity/my_quantity_unit.xml index cf4e849b33..e3c1919a19 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/archive/ApparelTransformationAssortedResource_viewQuantity/my_quantity_unit.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/archive/ApparelTransformationAssortedResource_viewQuantity/my_quantity_unit.xml @@ -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/quantity_unit/getFormItemList</string> </value> + <value> <string>python: here.portal_categories[field.getId().replace(\'my_\', \'\', 1).replace(\'_list\', \'\')].getCategoryChildCompactLogicalPathItemList(display_none_category=1,local_sort_id="compact_title",checked_permission=\'View\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_apparel/bt/revision b/bt5/erp5_apparel/bt/revision index 90be1cdd8e..d7f3668a68 100644 --- a/bt5/erp5_apparel/bt/revision +++ b/bt5/erp5_apparel/bt/revision @@ -1 +1 @@ -95 \ No newline at end of file +98 \ No newline at end of file -- 2.30.9