diff --git a/classes/Tools.php b/classes/Tools.php
index 206ebe201..79d4798a3 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -684,17 +684,20 @@ class ToolsCore
 			if ($files = scandir($dirname))
 			{
 				foreach ($files as $file)
-				if ($file != '.' && $file != '..' && $file != '.svn')
-				{
-					if (is_dir($dirname.$file))
-						Tools::deleteDirectory($dirname.$file, true);
-					elseif (file_exists($dirname.$file))
-						unlink($dirname.$file);
-				}
+    				if ($file != '.' && $file != '..' && $file != '.svn')
+    				{
+    					if (is_dir($dirname.$file))
+    						Tools::deleteDirectory($dirname.$file, true);
+    					elseif (file_exists($dirname.$file))
+    						unlink($dirname.$file);
+    				}
 				if ($delete_self)
-					rmdir($dirname);
+					if (!rmdir($dirname)
+                        return false;
+                return true;                    
 			}
-	}
+        return false;
+    }
 
 	/**
 	* Display an error according to an error code
diff --git a/install-dev/upgrade/php/add_order_reference_in_order_payment.php b/install-dev/upgrade/php/add_order_reference_in_order_payment.php
index 75b5d0782..266de44d4 100644
--- a/install-dev/upgrade/php/add_order_reference_in_order_payment.php
+++ b/install-dev/upgrade/php/add_order_reference_in_order_payment.php
@@ -34,7 +34,7 @@ function add_order_reference_in_order_payment()
 	ON o.id_order = op.id_order');
 	
 	if (!is_object($payments))
-		return false;
+		return true;
 	
 	$errors = array();
 	// Populate "order_reference"
@@ -62,7 +62,7 @@ function add_order_reference_in_order_payment()
 	HAVING COUNT(*) > 1');
 	
 	if (!is_object($duplicate_lines))
-		return false;
+		return true;
 
 	$order_payments_to_remove = array();
 	while ($order_payments = Db::getInstance()->nextRow($duplicate_lines))
diff --git a/install-dev/upgrade/sql/1.5.0.0.sql b/install-dev/upgrade/sql/1.5.0.0.sql
index e38efa8fc..94a1e36d6 100755
--- a/install-dev/upgrade/sql/1.5.0.0.sql
+++ b/install-dev/upgrade/sql/1.5.0.0.sql
@@ -312,9 +312,6 @@ PRIMARY KEY (`id_scene`, `id_shop`),
 ) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
 INSERT INTO `PREFIX_scene_shop` (id_shop, id_scene) (SELECT 1, id_scene FROM PREFIX_scene);
 
-ALTER TABLE `PREFIX_delivery` ADD `id_shop` INT UNSIGNED NULL DEFAULT NULL AFTER `id_delivery`;
-ALTER TABLE `PREFIX_delivery` ADD `id_group_shop` INT UNSIGNED NULL DEFAULT NULL AFTER `id_shop`;
-
 /* PHP:create_multistore(); */;
 
 UPDATE `PREFIX_customization` INNER JOIN `PREFIX_orders` USING(id_cart) SET in_cart = 1;
diff --git a/install-dev/upgrade/sql/1.5.0.1.sql b/install-dev/upgrade/sql/1.5.0.1.sql
index c3e62fe48..b5cada9a2 100644
--- a/install-dev/upgrade/sql/1.5.0.1.sql
+++ b/install-dev/upgrade/sql/1.5.0.1.sql
@@ -1,5 +1,8 @@
 SET NAMES 'utf8';
 
+ALTER TABLE `PREFIX_delivery` ADD `id_shop` INT UNSIGNED NULL DEFAULT NULL AFTER `id_delivery`;
+ALTER TABLE `PREFIX_delivery` ADD `id_group_shop` INT UNSIGNED NULL DEFAULT NULL AFTER `id_shop`;
+
 CREATE TABLE IF NOT EXISTS `PREFIX_module_access` (
   `id_profile` int(10) unsigned NOT NULL,
   `id_module` int(10) unsigned NOT NULL,