diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_quantity_unit.xml index 3eff551f6f4226648df3aa9dac388505c852cf24..57349e4da387bceb0fafcb8bc9892d8a7d1ce705 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_quantity_unit.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_quantity_unit.xml @@ -124,7 +124,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: here.getResource() and here.getResourceValue().getQuantityUnitList() and [(\'\', \'\')] + [(x.getLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in here.getResourceValue().getQuantityUnitValueList()] or getattr(here.portal_categories[\'quantity_unit\'], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=0, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> + <value> <string>python: here.getResource() and here.getResourceValue().getQuantityUnitList() and [(\'\', \'\')] + [(x.getLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in here.getResourceValue().getQuantityUnitValueList()] or [(\'\', \'\')]</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/listbox_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/listbox_quantity_unit.xml index 18df531a28111d50eb7435144033438639c87bf2..d825409b1efba3f52c0efd9e91a19661c5ba0c54 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/listbox_quantity_unit.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_view/listbox_quantity_unit.xml @@ -121,7 +121,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: cell.getResource() and cell.getResourceValue().getQuantityUnitList() and [(\'\', \'\')] + [(x.getLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in cell.getResourceValue().getQuantityUnitValueList()] or getattr(here.portal_categories[\'quantity_unit\'], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=0, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> + <value> <string>python: (\'cell\' in CONTEXTS and cell.getResource()) and cell.getResourceValue().getQuantityUnitList() and [(\'\', \'\')] + [(x.getLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in cell.getResourceValue().getQuantityUnitValueList()] or [(\'\', \'\')]</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml index 2d31c1ae1642f1fde6d6fb59797a3bf201bf2031..756f6d5286c58b02e19018a20979ffe174ae9b93 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml @@ -151,7 +151,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: here.getResource() and here.getResourceValue().getQuantityUnitList() and [(\'\', \'\')] + [(x.getTranslatedLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in here.getResourceValue().getQuantityUnitValueList()] or getattr(here.portal_categories[\'quantity_unit\'], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=0, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> + <value> <string>python: here.getResource() and here.getResourceValue().getQuantityUnitList() and [(\'\', \'\')] + [(x.getLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in here.getResourceValue().getQuantityUnitValueList()] or [(\'\', \'\')]</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_quantity_unit.xml index d2ad9f8f0fd9322ceb8eae3654418705822f518f..32161c7005c8e49d7f2384827fdaec4e0227711c 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_quantity_unit.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_quantity_unit.xml @@ -56,6 +56,10 @@ <key> <string>tales</string> </key> <value> <dictionary> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string></string> </value> @@ -120,7 +124,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: (\'cell\' in CONTEXTS and cell.getResource()) and cell.getResourceValue().getQuantityUnitList() and [(\'\', \'\')] + [(x.getLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in cell.getResourceValue().getQuantityUnitValueList()] or getattr(here.portal_categories[\'quantity_unit\'], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=0, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> + <value> <string>python: (\'cell\' in CONTEXTS and cell.getResource()) and cell.getResourceValue().getQuantityUnitList() and [(\'\', \'\')] + [(x.getLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in cell.getResourceValue().getQuantityUnitValueList()] or [(\'\', \'\')]</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_quantity_unit.xml index d2ad9f8f0fd9322ceb8eae3654418705822f518f..32161c7005c8e49d7f2384827fdaec4e0227711c 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_quantity_unit.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_quantity_unit.xml @@ -56,6 +56,10 @@ <key> <string>tales</string> </key> <value> <dictionary> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string></string> </value> @@ -120,7 +124,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: (\'cell\' in CONTEXTS and cell.getResource()) and cell.getResourceValue().getQuantityUnitList() and [(\'\', \'\')] + [(x.getLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in cell.getResourceValue().getQuantityUnitValueList()] or getattr(here.portal_categories[\'quantity_unit\'], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=0, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> + <value> <string>python: (\'cell\' in CONTEXTS and cell.getResource()) and cell.getResourceValue().getQuantityUnitList() and [(\'\', \'\')] + [(x.getLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in cell.getResourceValue().getQuantityUnitValueList()] or [(\'\', \'\')]</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index c047c4aba9bb7da73243f84e689c9c15c3bd2c6e..82cf079698a0f9d9ba57d0fac0a29786fe194bc0 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -518 \ No newline at end of file +519 \ No newline at end of file