Merge branch 'master' into 'master'

A bug fix of erp5_core/Folder_delete

See merge request !65
Conflicts:
	product/ERP5/tests/testERP5Core.py

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml

@@ -150,8 +150,7 @@ elif uids:\n
 else:\n
   message = Base_translateString("Please select one or more items first.")\n
 \n
-return REQUEST.RESPONSE.redirect("%s/%s?portal_status_message=%s"\n
-  % (context.absolute_url_path(), form_id, message))\n
+return context.Base_redirect(form_id, keep_items={"portal_status_message":message})\n
 
 
 ]]></string> </value>

product/ERP5/tests/testERP5Core.py

@@ -29,6 +29,7 @@
 
 import unittest
 import pprint
+import urllib
 
 from AccessControl.SecurityManagement import newSecurityManager
 from Testing import ZopeTestCase
@@ -506,7 +507,7 @@ class TestERP5Core(ERP5TypeTestCase, ZopeTestCase.Functional):
     self.assertEqual(0, person.getRelationCountForDeletion())
     def delete(assert_deleted, obj):
       redirect = self._Folder_delete(obj)
-      self.assertTrue(('Sorry, 1 item is in use.', 'Deleted.')[assert_deleted]
+      self.assertTrue((urllib.quote('Sorry, 1 item is in use.'), 'Deleted.')[assert_deleted]
                       in redirect, redirect)
       self.tic()
     delete(0, organisation)
@@ -535,7 +536,7 @@ class TestERP5Core(ERP5TypeTestCase, ZopeTestCase.Functional):
     document_1.manage_permission('View', [], acquire=0)
     document_1.manage_permission('Access contents information', [], acquire=0)
     redirect = self._Folder_delete(document_2)
-    self.assert_('Sorry, 1 item is in use.' in redirect, redirect)
+    self.assert_(urllib.quote('Sorry, 1 item is in use.') in redirect, redirect)
     self.assertEqual(module.objectCount(), 2)
 
   def test_getPropertyForUid(self):