diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_aggregate_title_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_aggregate_title_list.xml index 21d8e7c9f2ad5731090896a12c7b2326cf429b2c..d9b2f31749d0f71b8c98cb1de36b51e51bde57f1 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_aggregate_title_list.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_aggregate_title_list.xml @@ -20,7 +20,9 @@ <value> <list> <string>title</string> + <string>base_category</string> <string>portal_type</string> + <string>catalog_index</string> <string>enabled</string> </list> </value> @@ -63,6 +65,14 @@ <key> <string>tales</string> </key> <value> <dictionary> + <item> + <key> <string>base_category</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>catalog_index</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>enabled</string> </key> <value> @@ -98,6 +108,14 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>base_category</string> </key> + <value> <string>aggregate</string> </value> + </item> + <item> + <key> <string>catalog_index</string> </key> + <value> <string>aggregate</string> </value> + </item> <item> <key> <string>enabled</string> </key> <value> <int>1</int> </value> @@ -146,7 +164,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: (here.getResource() and here.getResourceValue().getAggregatedPortalTypeList()) or here.getAggregate()</string> </value> + <value> <string>python: (here.getResource() and here.getResourceValue().getAggregatedPortalTypeList()) or (here.getAggregate()) or (here.getResource() is None and here.getPortalItemTypeList())</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index fd098d297eb9bbdfce1aa740556cbaa888bc90d5..5f5d9b11ac62bcf4b8955b4ab0ff1e2216ff4825 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -374 \ No newline at end of file +375 \ No newline at end of file