diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml index 41d0e78c5cf820e8e1a397badd9b7c19b4dec4f9..30b996e2bca8f898fede24ebc73697335c400623 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml @@ -291,9 +291,14 @@ if not simulation_mode:\n category.edit(**{\'expiration_date\':expiration_date})\n else:\n for category in category_to_delete_list:\n - category = context.portal_categories.resolveCategory(category)\n - if category is not None:\n - category.expire()\n + expiration_possible = context.getPortalObject().portal_workflow \\\n + .isTransitionPossible(category, \'expire\')\n + break\n + if expiration_possible:\n + for category in category_to_delete_list:\n + category = context.portal_categories.resolveCategory(category)\n + if category is not None:\n + category.expire()\n \n \n \n @@ -428,6 +433,7 @@ return context.REQUEST.RESPONSE.redirect(\n <string>category_to_delete_list</string> <string>base_category_id</string> <string>parent</string> + <string>expiration_possible</string> </tuple> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 0e8ebf59f2689cb1501556ab09d4aee23414f450..3559f242bc484e138a47eb958f1b33ee885e3d0c 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -1476 \ No newline at end of file +1477 \ No newline at end of file