diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view.xml index 5470f423433f3de72bc6ffbb8147070c3e712380..861d02a5367466bdcbaa1a7fe768c82e7322519d 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view.xml @@ -96,7 +96,7 @@ <list> <string>my_title</string> <string>my_resource_title</string> - <string>my_aggregate_title</string> + <string>my_aggregate_title_list</string> <string>my_variation_category_list</string> <string>my_amortisation_method</string> </list> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_aggregate_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_aggregate_title_list.xml similarity index 95% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_aggregate_title.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_aggregate_title_list.xml index c014673eaa19dfb8e5ad87fb22861aac305e2538..7577435395b2cfe77f7232d0e8607e09f47543f7 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_aggregate_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_view/my_aggregate_title_list.xml @@ -23,7 +23,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>my_aggregate_title</string> </value> + <value> <string>my_aggregate_title_list</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -86,7 +86,7 @@ </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_aggregate_title</string> </value> + <value> <string>my_aggregate_title_list</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewFieldLibrary.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewFieldLibrary.xml index 3da251c10756f850d1a92c692a4ab0b2721bdc89..fcedda19c4237f5409481aa06a730cd89350709b 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewFieldLibrary.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewFieldLibrary.xml @@ -98,6 +98,7 @@ <string>my_resource_title</string> <string>my_variation_category_list</string> <string>my_amortisation_method</string> + <string>my_aggregate_title_list</string> </list> </value> </item> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewFieldLibrary/my_aggregate_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewFieldLibrary/my_aggregate_title_list.xml similarity index 95% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewFieldLibrary/my_aggregate_title.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewFieldLibrary/my_aggregate_title_list.xml index 8f0cfa6b4e31c25d618d4d001151fea4d882bf93..5b6c366bcba89f6ec50ea960bd20d1e9882da256 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewFieldLibrary/my_aggregate_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewFieldLibrary/my_aggregate_title_list.xml @@ -17,7 +17,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>my_aggregate_title</string> </value> + <value> <string>my_aggregate_title_list</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -74,7 +74,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>my_aggregate_title</string> </value> + <value> <string>my_aggregate_title_list</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view.xml index ab3c39009215a6d5e8faa5176d077021968c960f..92d89f44afe5fef844cdc303ca3ff640abf2cbf0 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view.xml @@ -127,7 +127,7 @@ <string>my_reference</string> <string>my_int_index</string> <string>my_resource_title</string> - <string>my_aggregate_title</string> + <string>my_aggregate_title_list</string> <string>my_variation_category_list</string> <string>my_amortisation_method</string> <string>my_source_trade_title_list</string> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/my_aggregate_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/my_aggregate_title_list.xml similarity index 95% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/my_aggregate_title.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/my_aggregate_title_list.xml index bc0e8fe507c69b0040bdf3f9206e5a5d919b1bf8..4e04f4b1542d0988549c932f61d6781bd4105425 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/my_aggregate_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/my_aggregate_title_list.xml @@ -23,7 +23,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>my_aggregate_title</string> </value> + <value> <string>my_aggregate_title_list</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -86,7 +86,7 @@ </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_aggregate_title</string> </value> + <value> <string>my_aggregate_title_list</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary.xml index 3e8dd44b1b2a63e9ff9a16911aa1cce141a833f3..e9a22c28984d7cc20730d39c15befa3d34555734 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary.xml @@ -110,7 +110,7 @@ <string>my_int_index</string> <string>my_source_title</string> <string>my_order_sub_lines_listbox</string> - <string>my_aggregate_title</string> + <string>my_aggregate_title_list</string> </list> </value> </item> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_aggregate_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_aggregate_title_list.xml similarity index 81% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_aggregate_title.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_aggregate_title_list.xml index 6451e24e296819ba1a4460b75d471409797bf281..0c077472a6c5ab31b7aff6e991c40820ec16e0b6 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_aggregate_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_aggregate_title_list.xml @@ -21,14 +21,13 @@ <list> <string>title</string> <string>portal_type</string> - <string>items</string> <string>enabled</string> </list> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>my_aggregate_title</string> </value> + <value> <string>my_aggregate_title_list</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -78,16 +77,10 @@ <key> <string>form_id</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> - </item> <item> <key> <string>portal_type</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> <item> @@ -111,25 +104,19 @@ </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_relation_field</string> </value> + <value> <string>my_multi_relation_field</string> </value> </item> <item> <key> <string>form_id</string> </key> <value> <string>Base_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>portal_type</string> </key> <value> <list> <tuple> - <string>Resource</string> - <string>Resource</string> + <string>(tales)</string> + <string>(tales)</string> </tuple> </list> </value> @@ -140,7 +127,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Item</string> </value> + <value> <string>Items</string> </value> </item> </dictionary> </value> @@ -165,22 +152,6 @@ </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>REQUEST/relation_item_list</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="4" aka="AAAAAAAAAAQ="> <pickle> <tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view.xml index 40b7579f28b7e5a08919a43cbf54e521dc0aecd4..f6ef0e3e4901021c8e61c8acb55d19bb6843532b 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view.xml @@ -98,7 +98,7 @@ <string>my_reference</string> <string>my_int_index</string> <string>my_resource_title</string> - <string>my_aggregate_title</string> + <string>my_aggregate_title_list</string> <string>my_variation_category_list</string> <string>my_amortisation_method</string> </list> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_aggregate_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_aggregate_title_list.xml similarity index 95% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_aggregate_title.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_aggregate_title_list.xml index 23c9147a3a989c469ae1ff791eb1c04760b0d028..6f6dc5b0aa8317f0ec077f8924085e31433592ca 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_aggregate_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_aggregate_title_list.xml @@ -23,7 +23,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>my_aggregate_title</string> </value> + <value> <string>my_aggregate_title_list</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -86,7 +86,7 @@ </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_aggregate_title</string> </value> + <value> <string>my_aggregate_title_list</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_viewFieldLibrary.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_viewFieldLibrary.xml index 5076c55d54ade51be38a0c26d016c8f677ca6ec0..53736c63853fbb057f2f3c569c4cdb84ee23cdc0 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_viewFieldLibrary.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_viewFieldLibrary.xml @@ -108,7 +108,7 @@ <string>my_source_title</string> <string>my_start_date</string> <string>my_stop_date</string> - <string>my_aggregate_title</string> + <string>my_aggregate_title_list</string> </list> </value> </item> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_viewFieldLibrary/my_aggregate_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_viewFieldLibrary/my_aggregate_title_list.xml similarity index 95% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_viewFieldLibrary/my_aggregate_title.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_viewFieldLibrary/my_aggregate_title_list.xml index 8f0cfa6b4e31c25d618d4d001151fea4d882bf93..5b6c366bcba89f6ec50ea960bd20d1e9882da256 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_viewFieldLibrary/my_aggregate_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_viewFieldLibrary/my_aggregate_title_list.xml @@ -17,7 +17,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>my_aggregate_title</string> </value> + <value> <string>my_aggregate_title_list</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -74,7 +74,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>my_aggregate_title</string> </value> + <value> <string>my_aggregate_title_list</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index ac471d3ba0cca3f689cdf6462b3864fb73a52b60..2a9c18ad50e6731f71e354121996a406a20a90fe 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -355 \ No newline at end of file +357 \ No newline at end of file