From 82cb9f8ba9a9e45fc6ab033b43c211adbd9d3c41 Mon Sep 17 00:00:00 2001
From: emily-d <operaxxox@yahoo.ca>
Date: Wed, 23 Jan 2013 22:30:18 +0100
Subject: [PATCH 01/40] [-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301
 error (Too Many Redirects) on pages served by https.

See http://www.prestashop.com/forums/topic/217724-activer-le-ssl-url-simplifiee-mod-rewrite-ne-marche-pas-erreur-301-sur-les-pages-commandes for more info.
---
 classes/Tools.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/classes/Tools.php b/classes/Tools.php
index 8ec0b5ac0..b8c511c8a 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -267,6 +267,9 @@ class ToolsCore
 		// $_SERVER['SSL'] exists only in some specific configuration
 		if (isset($_SERVER['SSL']))
 			return ($_SERVER['SSL'] == 1 || strtolower($_SERVER['SSL']) == 'on');
+		// $_SERVER['REDIRECT_HTTPS'] exists only in some specific configuration (e.g. Gandi's simple hosting)
+		if (isset($_SERVER['REDIRECT_HTTPS']))
+			return ($_SERVER['REDIRECT_HTTPS'] == 1 || strtolower($_SERVER['REDIRECT_HTTPS']) == 'on');
 
 		return false;
 	}

From df1b8efbc29b8824b1c3a7694460e4ab9721d5ef Mon Sep 17 00:00:00 2001
From: PrestaEdit <j.danse@prestaedit.com>
Date: Thu, 18 Apr 2013 14:45:52 +0300
Subject: [PATCH 02/40] [-] MO: feeder / RSS Valid

---
 modules/feeder/rss.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/feeder/rss.php b/modules/feeder/rss.php
index fad90e212..00874b76f 100644
--- a/modules/feeder/rss.php
+++ b/modules/feeder/rss.php
@@ -34,6 +34,7 @@ $id_category = ((int)(Tools::getValue('id_category')) ? (int)(Tools::getValue('i
 $products = Product::getProducts((int)Context::getContext()->language->id, 0, ($number > 10 ? 10 : $number), $orderBy, $orderWay, $id_category, true);
 $currency = new Currency((int)Context::getContext()->currency->id);
 $affiliate = (Tools::getValue('ac') ? '?ac='.(int)(Tools::getValue('ac')) : '');
+$metas = Meta::getMetaByPage('index', (int)Context::getContext()->language->id);
 
 // Send feed
 header("Content-Type:text/xml; charset=utf-8");
@@ -42,8 +43,9 @@ echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
 <rss version="2.0">
 	<channel>
 		<title><![CDATA[<?php echo Configuration::get('PS_SHOP_NAME') ?>]]></title>
+		<description><![CDATA[<?php echo $metas['description'] ?>]]></description
 		<link><?php echo _PS_BASE_URL_.__PS_BASE_URI__; ?></link>
-		<mail><?php echo Configuration::get('PS_SHOP_EMAIL') ?></mail>
+		<webMaster><?php echo Configuration::get('PS_SHOP_EMAIL') ?></webMaster>
 		<generator>PrestaShop</generator>
 		<language><?php echo Context::getContext()->language->iso_code; ?></language>
 		<image>

From 757f740037d70724e3a4cd31ed1f91a71f3011a1 Mon Sep 17 00:00:00 2001
From: PrestaEdit <j.danse@prestaedit.com>
Date: Tue, 30 Apr 2013 20:40:03 +0200
Subject: [PATCH 03/40] // fix </description>

---
 modules/feeder/rss.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/feeder/rss.php b/modules/feeder/rss.php
index 00874b76f..caa32a3c8 100644
--- a/modules/feeder/rss.php
+++ b/modules/feeder/rss.php
@@ -43,7 +43,7 @@ echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
 <rss version="2.0">
 	<channel>
 		<title><![CDATA[<?php echo Configuration::get('PS_SHOP_NAME') ?>]]></title>
-		<description><![CDATA[<?php echo $metas['description'] ?>]]></description
+		<description><![CDATA[<?php echo $metas['description'] ?>]]></description>
 		<link><?php echo _PS_BASE_URL_.__PS_BASE_URI__; ?></link>
 		<webMaster><?php echo Configuration::get('PS_SHOP_EMAIL') ?></webMaster>
 		<generator>PrestaShop</generator>

From 4346d9e57c8f1fe7339e8bcd3cd2c7fc8ec61828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Gaulu=C3=A9?= <edouard@e-gaulue.com>
Date: Mon, 6 May 2013 00:32:16 +0200
Subject: [PATCH 04/40] [*] FO : AuthController can now have its own template

---
 controllers/front/AuthController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index f5b8563b4..8eec13284 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -139,6 +139,9 @@ class AuthControllerCore extends FrontController
 				'HOOK_CREATE_ACCOUNT_TOP' => Hook::exec('displayCustomerAccountFormTop')
 			));
 		
+		// Just set $this->template value here in case it's used by Ajax
+		$this->setTemplate(_PS_THEME_DIR_.'authentication.tpl');
+
 		if ($this->ajax)
 		{
 			// Call a hook to display more information on form
@@ -150,12 +153,11 @@ class AuthControllerCore extends FrontController
 			$return = array(
 				'hasError' => !empty($this->errors),
 				'errors' => $this->errors,
-				'page' => $this->context->smarty->fetch(_PS_THEME_DIR_.'authentication.tpl'),
+				'page' => $this->context->smarty->fetch($this->template),
 				'token' => Tools::getToken(false)
 			);
 			die(Tools::jsonEncode($return));
 		}
-		$this->setTemplate(_PS_THEME_DIR_.'authentication.tpl');
 	}
 
 	/**

From 448b8bad023ad9b8b5b15c44767d86d67e2105c4 Mon Sep 17 00:00:00 2001
From: AntonLejon <anton@antonpersson.se>
Date: Mon, 6 May 2013 12:14:11 +0300
Subject: [PATCH 05/40] [*] MO: blockcart animation optimization

The animated element would not be removed upon the animation being finished. This made the site slow and unresponsive if the animated image was heavy (eg. a transparent png) and added to cart many times without reloading the page. This addition makes the animation behave as expected also when performing it multiple times.
---
 modules/blockcart/ajax-cart.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js
index c42dc72cf..8641931c5 100644
--- a/modules/blockcart/ajax-cart.js
+++ b/modules/blockcart/ajax-cart.js
@@ -232,6 +232,7 @@ var ajaxCart = {
 					.animate({ 'width': $element.attr('width')*0.66, 'height': $element.attr('height')*0.66, 'opacity': 0.2, 'top': cartBlockOffset.top + 30, 'left': cartBlockOffset.left + 15 }, 1000)
 					.fadeOut(100, function() {
 						ajaxCart.updateCartInformation(jsonData, addedFromProductPage);
+						$(this).remove();
 					});
 				}
 				else

From 83a1ea548812abbc89d523e56aa56391a8e2f0ae Mon Sep 17 00:00:00 2001
From: AntonLejon <anton@antonpersson.se>
Date: Thu, 9 May 2013 00:53:06 +0300
Subject: [PATCH 06/40] [-] MO: blockcart ajax cart product insert missing html
 class

Added the same HTML class as the other product names have in the ajax cart. Perhaps it would be nice to add an added_from_ajax as well in case you would want to differ between the newly added items and previously added ones?
Another potential issue is on line 445 where there is no space after the insert. If Prestashop is set to minify the normal page, this is correct, otherwise there will be a space missing.
---
 modules/blockcart/ajax-cart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js
index c42dc72cf..073d95705 100644
--- a/modules/blockcart/ajax-cart.js
+++ b/modules/blockcart/ajax-cart.js
@@ -443,7 +443,7 @@ var ajaxCart = {
 					var content =  '<dt class="hidden" id="cart_block_product_' + domIdProduct + '">';
 					content += '<span class="quantity-formated"><span class="quantity">' + this.quantity + '</span>x</span>';
 					var name = (this.name.length > 12 ? this.name.substring(0, 10) + '...' : this.name);
-					content += '<a href="' + this.link + '" title="' + this.name + '">' + name + '</a>';
+					content += '<a href="' + this.link + '" title="' + this.name + '" class="cart_block_product_name">' + name + '</a>';
 					
 					if (parseFloat(this.price_float) > 0)
 						content += '<span class="remove_link"><a rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseUri + '?controller=cart&amp;delete=1&amp;id_product=' + productId + '&amp;token=' + static_token + (this.hasAttributes ? '&amp;ipa=' + parseInt(this.idCombination) : '') + '"> </a></span>';

From e14509170b85ac8a59f73b35d56aa71b502f7d24 Mon Sep 17 00:00:00 2001
From: PrestaEdit <j.danse@prestaedit.com>
Date: Sun, 12 May 2013 01:04:00 +0300
Subject: [PATCH 07/40] [-] BO: Ajax Confirmation / padding-left

---
 css/admin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/admin.css b/css/admin.css
index ec73d1414..f5201ec60 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -509,7 +509,7 @@ select optgroup option {
 	background: #DFF2BF url(../img/admin/icon-valid.png) no-repeat scroll 6px 6px;
 	border: 1px solid #4F8A10;
 	color:#4F8A10;
-	padding:20px;
+	padding:20px 40px;
 	position:fixed;
 	bottom:0;
 	width:100%;

From 2a606999fdd6fcd4f09c4c272ce81b942f558d4a Mon Sep 17 00:00:00 2001
From: vAugagneur <fistou@me.com>
Date: Tue, 21 May 2013 10:30:35 +0200
Subject: [PATCH 08/40] //small bug

---
 classes/Supplier.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Supplier.php b/classes/Supplier.php
index 3192fa28a..c878257f0 100644
--- a/classes/Supplier.php
+++ b/classes/Supplier.php
@@ -156,7 +156,7 @@ class SupplierCore extends ObjectModel
 		$rewrite_settings = (int)Configuration::get('PS_REWRITING_SETTINGS');
 		for ($i = 0; $i < $nb_suppliers; $i++)
 			if ($rewrite_settings)
-				$suppliers[$i]['link_rewrite'] = Tools::link_rewrite($suppliers[$i]['name'], false);
+				$suppliers[$i]['link_rewrite'] = Tools::link_rewrite($suppliers[$i]['name']);
 			else
 				$suppliers[$i]['link_rewrite'] = 0;
 		return $suppliers;

From b573b39acb3f50089e5e1d3893295c2052e158bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Tue, 21 May 2013 10:56:55 +0200
Subject: [PATCH 09/40] [*] FO: Don't make useless ajax requests to blockcart
 on the cart page

---
 controllers/front/CartController.php |  3 ++-
 install-dev/upgrade/sql/1.5.5.0.sql  |  4 +++-
 modules/blockcart/blockcart.php      | 11 +++++++++++
 themes/default/js/cart-summary.js    | 16 ++++++++++------
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php
index a29dcbf39..828238c7c 100644
--- a/controllers/front/CartController.php
+++ b/controllers/front/CartController.php
@@ -335,7 +335,8 @@ class CartControllerCore extends FrontController
 			if ($result['customizedDatas'])
 				Product::addCustomizationPrice($result['summary']['products'], $result['customizedDatas']);
 
-			die(Tools::jsonEncode($result));
+			Hook::exec('actionCartListOverride', array('summary' => $result, 'json' => &$json));
+			die(Tools::jsonEncode(array_merge($result, (array)Tools::jsonDecode($json, true))));
 		}
 		// @todo create a hook
 		elseif (file_exists(_PS_MODULE_DIR_.'/blockcart/blockcart-ajax.php'))
diff --git a/install-dev/upgrade/sql/1.5.5.0.sql b/install-dev/upgrade/sql/1.5.5.0.sql
index 5af9008e8..11dcb29b8 100644
--- a/install-dev/upgrade/sql/1.5.5.0.sql
+++ b/install-dev/upgrade/sql/1.5.5.0.sql
@@ -5,4 +5,6 @@ ALTER TABLE  `PREFIX_store` CHANGE  `latitude`  `latitude` DECIMAL( 13, 8 ) NULL
 INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES('PS_CUSTOMER_CREATION_EMAIL', 1, NOW(), NOW());
 
 ALTER TABLE `PREFIX_webservice_account` CHANGE `class_name` `class_name` VARCHAR(64) NOT NULL DEFAULT 'WebserviceRequest',
-CHANGE `module_name` `module_name` VARCHAR(64) NULL DEFAULT NULL;
\ No newline at end of file
+CHANGE `module_name` `module_name` VARCHAR(64) NULL DEFAULT NULL;
+
+/* PHP:add_module_to_hook(blockcart, actionCartListOverride); */;
\ No newline at end of file
diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php
index cabc8fba4..8d5f845c4 100644
--- a/modules/blockcart/blockcart.php
+++ b/modules/blockcart/blockcart.php
@@ -164,6 +164,7 @@ class BlockCart extends Module
 			parent::install() == false
 			|| $this->registerHook('top') == false
 			|| $this->registerHook('header') == false
+			|| $this->registerHook('actionCartListOverride') == false
 			|| Configuration::updateValue('PS_BLOCK_CART_AJAX', 1) == false)
 			return false;
 		return true;
@@ -195,10 +196,20 @@ class BlockCart extends Module
 		return $res;
 	}
 
+	public function hookActionCartListOverride($params)
+	{
+		if (!Configuration::get('PS_BLOCK_CART_AJAX'))
+			return;
+
+		$this->assignContentVars(array('cookie' => $this->context->cookie, 'cart' => $this->context->cart));
+		$params['json'] = $this->display(__FILE__, 'blockcart-json.tpl');
+	}
+
 	public function hookHeader()
 	{
 		if (Configuration::get('PS_CATALOG_MODE'))
 			return;
+
 		$this->context->controller->addCSS(($this->_path).'blockcart.css', 'all');
 		if ((int)(Configuration::get('PS_BLOCK_CART_AJAX')))
 			$this->context->controller->addJS(($this->_path).'ajax-cart.js');
diff --git a/themes/default/js/cart-summary.js b/themes/default/js/cart-summary.js
index c1c0ac3c7..31c5c7df2 100644
--- a/themes/default/js/cart-summary.js
+++ b/themes/default/js/cart-summary.js
@@ -106,6 +106,8 @@ function changeAddressDelivery(obj)
 					if ($('#product_'+id_product+'_'+id_product_attribute+'_0_'+new_id_address_delivery).length)
 					{
 						updateCartSummary(jsonData.summary);
+						if (window.ajaxCart != undefined)
+							ajaxCart.updateCart(jsonData);
 						updateCustomizedDatas(jsonData.customizedDatas);
 						updateHookShoppingCart(jsonData.HOOK_SHOPPING_CART);
 						updateHookShoppingCartExtra(jsonData.HOOK_SHOPPING_CART_EXTRA);
@@ -119,9 +121,8 @@ function changeAddressDelivery(obj)
 						// @todo improve customization upgrading
 						$('.product_'+id_product+'_'+id_product_attribute+'_0_'+old_id_address_delivery).remove();
 					}
-					
 					if (window.ajaxCart != undefined)
-						ajaxCart.refresh();
+						ajaxCart.updateCart(jsonData);
 					updateAddressId(id_product, id_product_attribute, old_id_address_delivery, new_id_address_delivery);
 					cleanSelectAddressDelivery();
 				}
@@ -190,9 +191,8 @@ function changeAddressDelivery(obj)
 				cleanSelectAddressDelivery();
 				
 				updateCartSummary(jsonData.summary);
-				
 				if (window.ajaxCart !== undefined)
-					ajaxCart.refresh();
+					ajaxCart.updateCart(jsonData);
 			}
 		});
 	}
@@ -370,6 +370,8 @@ function deleteProductFromSummary(id)
 						});
 				}
 				updateCartSummary(jsonData.summary);
+				if (window.ajaxCart != undefined)
+					ajaxCart.updateCart(jsonData);
 				updateCustomizedDatas(jsonData.customizedDatas);
 				updateHookShoppingCart(jsonData.HOOK_SHOPPING_CART);
 				updateHookShoppingCartExtra(jsonData.HOOK_SHOPPING_CART_EXTRA);
@@ -461,6 +463,8 @@ function upQuantity(id, qty)
 				if (jsonData.refresh)
 					location.reload();
 				updateCartSummary(jsonData.summary);
+				if (window.ajaxCart != undefined)
+					ajaxCart.updateCart(jsonData);
 				if (customizationId !== 0)
 					updateCustomizedDatas(jsonData.customizedDatas);
 				updateHookShoppingCart(jsonData.HOOK_SHOPPING_CART);
@@ -544,6 +548,8 @@ function downQuantity(id, qty)
 					if (jsonData.refresh)
 						location.reload();
 					updateCartSummary(jsonData.summary);
+					if (window.ajaxCart !== undefined)
+						ajaxCart.updateCart(jsonData);
 					if (customizationId !== 0)					
 						updateCustomizedDatas(jsonData.customizedDatas);
 					updateHookShoppingCart(jsonData.HOOK_SHOPPING_CART);
@@ -754,8 +760,6 @@ function updateCartSummary(json)
 		$('#total_wrapping').html(formatCurrency(json.total_wrapping, currencyFormat, currencySign, currencyBlank));
 		$('#total_wrapping').parent().hide();
 	}
-	if (window.ajaxCart !== undefined)
-		ajaxCart.refresh();
 }
 
 function updateCustomizedDatas(json)

From 0ddc7e0e4bc51279cbed101b8dc1bac16d4d3395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Tue, 21 May 2013 11:06:23 +0200
Subject: [PATCH 10/40] // small fix

---
 modules/blockcart/blockcart.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php
index 8d5f845c4..0dfce8c19 100644
--- a/modules/blockcart/blockcart.php
+++ b/modules/blockcart/blockcart.php
@@ -43,7 +43,7 @@ class BlockCart extends Module
 		$this->description = $this->l('Adds a block containing the customer\'s shopping cart.');
 	}
 
-	public function assignContentVars(&$params)
+	public function assignContentVars($params)
 	{
 		global $errors;
 

From 43a333ff03f582ee7563467315bac2b61e0f25bf Mon Sep 17 00:00:00 2001
From: vAugagneur <fistou@me.com>
Date: Tue, 21 May 2013 11:28:24 +0200
Subject: [PATCH 11/40] //remove useless comments

---
 classes/Tools.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Tools.php b/classes/Tools.php
index dffeb9528..f5ca5a939 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -267,7 +267,7 @@ class ToolsCore
 		// $_SERVER['SSL'] exists only in some specific configuration
 		if (isset($_SERVER['SSL']))
 			return ($_SERVER['SSL'] == 1 || strtolower($_SERVER['SSL']) == 'on');
-		// $_SERVER['REDIRECT_HTTPS'] exists only in some specific configuration (e.g. Gandi's simple hosting)
+		// $_SERVER['REDIRECT_HTTPS'] exists only in some specific configuration
 		if (isset($_SERVER['REDIRECT_HTTPS']))
 			return ($_SERVER['REDIRECT_HTTPS'] == 1 || strtolower($_SERVER['REDIRECT_HTTPS']) == 'on');
 

From 0abe3b31939039696bd0c056941db8f7fa89422d Mon Sep 17 00:00:00 2001
From: PrestaEdit <j.danse@prestaedit.com>
Date: Tue, 21 May 2013 13:03:41 +0300
Subject: [PATCH 12/40] [*] Class: Module / Use method instead of SQL query

---
 classes/module/Module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/module/Module.php b/classes/module/Module.php
index 2877c1bad..080ae4865 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -215,7 +215,7 @@ abstract class ModuleCore
 				}
 
 		// Check if module is installed
-		$result = Db::getInstance()->getRow('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($this->name).'\'');
+		$result = Module::isInstalled($this->name);
 		if ($result)
 		{
 			$this->_errors[] = $this->l('This module has already been installed.');

From 446abf7e3f7fc4bda5994b563100942d3a94cab6 Mon Sep 17 00:00:00 2001
From: PrestaEdit <j.danse@prestaedit.com>
Date: Tue, 21 May 2013 13:11:41 +0200
Subject: [PATCH 13/40] // use getModuleIdByName()

---
 classes/module/Module.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/module/Module.php b/classes/module/Module.php
index 080ae4865..fb70d9075 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -1543,7 +1543,7 @@ abstract class ModuleCore
 	{
 		if (!Cache::isStored('Module::isInstalled'.$module_name))
 		{
-			$id_module = Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($module_name).'\'');
+			$id_module = Module::getModuleIdByName($module_name);
 			Cache::store('Module::isInstalled'.$module_name, (bool)$id_module);
 		}
 		return Cache::retrieve('Module::isInstalled'.$module_name);
@@ -1554,7 +1554,7 @@ abstract class ModuleCore
 		if (!Cache::isStored('Module::isEnabled'.$module_name))
 		{
 			$active = false;
-			$id_module = Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($module_name).'\'');
+			$id_module = Module::getModuleIdByName($module_name);
 			if (Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module_shop` WHERE `id_module` = '.(int)$id_module.' AND `id_shop` = '.(int)Context::getContext()->shop->id))
 				$active = true;
 			Cache::store('Module::isEnabled'.$module_name, (bool)$active);

From 2542e9716409d5c9c29d8dc7599e8e10e6a615b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Tue, 21 May 2013 15:25:58 +0200
Subject: [PATCH 14/40] [-] BO: Fix PHP warning on orderslip generation without
 ecotax #PSCFV-8743

---
 classes/pdf/HTMLTemplateOrderSlip.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/classes/pdf/HTMLTemplateOrderSlip.php b/classes/pdf/HTMLTemplateOrderSlip.php
index 06b8b2e23..70f395b75 100644
--- a/classes/pdf/HTMLTemplateOrderSlip.php
+++ b/classes/pdf/HTMLTemplateOrderSlip.php
@@ -211,6 +211,8 @@ class HTMLTemplateOrderSlipCore extends HTMLTemplateInvoice
 		if ($ecotax)
 			foreach ($tmp_tax_infos as $rate => &$row)
 			{
+				if (!isset($ecotax[$rate]))
+					continue
 				$row['total_price_tax_excl'] -= $ecotax[$rate]['ecotax_tax_excl'];
 				$row['total_amount'] -= ($ecotax[$rate]['ecotax_tax_incl'] - $ecotax[$rate]['ecotax_tax_excl']);
 			}

From 22ba79eb106bf72b7b3d6633ecf32f750617fe65 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 21 May 2013 16:29:26 +0200
Subject: [PATCH 15/40] [-] INSTALLER : Fix bug #PSCFV-8605 loop on ressource
 wether than n array

---
 .../add_order_reference_in_order_payment.php  | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

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 1ce631c1f..75b5d0782 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
@@ -27,47 +27,49 @@
 function add_order_reference_in_order_payment()
 {
 	$res = true;
-	$payments = Db::getInstance()->executeS('
+	$payments = Db::getInstance()->query('
 	SELECT op.id_order_payment, o.reference
 	FROM `'._DB_PREFIX_.'order_payment` op
 	INNER JOIN `'._DB_PREFIX_.'orders` o
 	ON o.id_order = op.id_order');
 	
-	if (!is_array($payments))
+	if (!is_object($payments))
 		return false;
 	
 	$errors = array();
-	
-	
 	// Populate "order_reference"
-	foreach ($payments as $payment)
+	while ($payment = Db::getInstance()->nextRow($payments))
 	{
-		$res = Db::getInstance()->execute('
-		UPDATE `'._DB_PREFIX_.'order_payment`
-		SET order_reference = \''.$payment['reference'].'\'
-		WHERE id_order_payment = '.(int)$payment['id_order_payment']);
-		
-		if (!$res)
-			$errors[] = Db::getInstance()->getMsgError();
+		if(isset($payment['id_order_payment']))
+		{
+			$res = Db::getInstance()->execute('
+			UPDATE `'._DB_PREFIX_.'order_payment`
+			SET order_reference = \''.$payment['reference'].'\'
+			WHERE id_order_payment = '.(int)$payment['id_order_payment']);
+			if (!$res)
+				$errors[] = Db::getInstance()->getMsgError();
+		}
 	}
 	
 	if (count($errors))
 		return array('error' => true, 'msg' => implode('<br/>', $errors));
 
 	// Get lines to merge (with multishipping on, durring the payment one line was added by order, only one is necessary by cart)
-	$duplicate_lines = Db::getInstance()->executeS('
+	$duplicate_lines = Db::getInstance()->query('
 	SELECT GROUP_CONCAT(id_order_payment) as id_order_payments
 	FROM `'._DB_PREFIX_.'order_payment`
 	GROUP BY order_reference, date_add
 	HAVING COUNT(*) > 1');
 	
-	if (!is_array($duplicate_lines))
+	if (!is_object($duplicate_lines))
 		return false;
 
 	$order_payments_to_remove = array();
-	foreach ($duplicate_lines as $order_payments)
+	while ($order_payments = Db::getInstance()->nextRow($duplicate_lines))
 	{
-		$order_payments_array = explode(',', $order_payments['id_order_payments']);
+		$order_payments_array = array();
+		if(isset($order_payments['id_order_payments']))
+			$order_payments_array = explode(',', $order_payments['id_order_payments']);
 		// Remove the first item (we want to keep one line)
 		$id_order_payment_keep = array_shift($order_payments_array);
 		
@@ -84,6 +86,5 @@ function add_order_reference_in_order_payment()
 	
 	if (!$res)
 		return array('errors' => true, 'msg' =>  Db::getInstance()->getMsgError());
-	
 	return true;
 }

From 9b8bfe1bbca0c825b20e27d1dcc27a68d5642b09 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 21 May 2013 16:47:53 +0200
Subject: [PATCH 16/40] [-] INSTALLER : SQL error during upgrade from 1.5.0.9

---
 .../php/p15013_add_missing_columns.php        | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/install-dev/upgrade/php/p15013_add_missing_columns.php b/install-dev/upgrade/php/p15013_add_missing_columns.php
index 0dc851843..55322a56c 100644
--- a/install-dev/upgrade/php/p15013_add_missing_columns.php
+++ b/install-dev/upgrade/php/p15013_add_missing_columns.php
@@ -32,13 +32,19 @@ function p15013_add_missing_columns()
 
 	if ($id_module)
 	{
-		if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'statssearch`
-			ADD `id_group_shop` INT(10) NOT NULL default "1" AFTER id_statssearch,
-			ADD `id_shop` INT(10) NOT NULL default "1" AFTER id_statssearch'))
-		{
-			$errors[] = $db->getMsgError();
-		}
+		$list_fields = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'statssearch`');
+		foreach ($list_fields as $k => $field)
+			$list_fields[$k] = $field['Field'];
+
+		if (!in_array('id_group_shop', $list_fields))			
+			if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'statssearch`
+				ADD `id_group_shop` INT(10) NOT NULL default "1" AFTER id_statssearch'))
+				$errors[] = $db->getMsgError();
+		if (!in_array('id_shop', $list_fields))				
+			if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'statssearch`
+				ADD `id_shop` INT(10) NOT NULL default "1" AFTER id_statssearch'))
+				$errors[] = $db->getMsgError();		
 	}
 	if (count($errors))
 		return array('error' => 1, 'msg' => implode(',', $errors)) ;
-}
+}
\ No newline at end of file

From d6c1a2f038a38623a1f34fc0541f8ed2ab84865a Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 21 May 2013 17:05:12 +0200
Subject: [PATCH 17/40] [-] INSTALLER : SQL error during upgrade from 1.5.0.13

---
 install-dev/upgrade/php/p15016_add_missing_columns.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/install-dev/upgrade/php/p15016_add_missing_columns.php b/install-dev/upgrade/php/p15016_add_missing_columns.php
index e9d8288fb..b0783995b 100644
--- a/install-dev/upgrade/php/p15016_add_missing_columns.php
+++ b/install-dev/upgrade/php/p15016_add_missing_columns.php
@@ -34,7 +34,10 @@ function p15016_add_missing_columns()
 		$list_fields = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'reinsurance`');
 		foreach ($list_fields as $k => $field)
 			$list_fields[$k] = $field['Field'];
-
+			
+		if (in_array('id_contactinfos', $list_fields))
+			if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'reinsurance` CHANGE `id_contactinfos` `id_reinsurance` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT'))
+				$errors[] = Db::getInstance()->getMsgError();			
 		if (!in_array('id_shop', $list_fields))
 			if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'reinsurance` ADD `id_shop` INT(10) NOT NULL default "1" AFTER id_reinsurance'))
 				$errors[] = Db::getInstance()->getMsgError();

From a4c150d2fbe6a8c259ed79ba2ad6e6940c96a123 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 21 May 2013 17:20:13 +0200
Subject: [PATCH 18/40] [-] INSTALLER : Create reinsurance_lang when updating
 from below 1.5.0.13

---
 .../php/p15016_add_missing_columns.php        | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/install-dev/upgrade/php/p15016_add_missing_columns.php b/install-dev/upgrade/php/p15016_add_missing_columns.php
index b0783995b..4916c4f6c 100644
--- a/install-dev/upgrade/php/p15016_add_missing_columns.php
+++ b/install-dev/upgrade/php/p15016_add_missing_columns.php
@@ -37,13 +37,28 @@ function p15016_add_missing_columns()
 			
 		if (in_array('id_contactinfos', $list_fields))
 			if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'reinsurance` CHANGE `id_contactinfos` `id_reinsurance` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT'))
-				$errors[] = Db::getInstance()->getMsgError();			
+				$errors[] = Db::getInstance()->getMsgError();
 		if (!in_array('id_shop', $list_fields))
 			if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'reinsurance` ADD `id_shop` INT(10) NOT NULL default "1" AFTER id_reinsurance'))
 				$errors[] = Db::getInstance()->getMsgError();
 		if (in_array('filename', $list_fields))
 			if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'reinsurance` CHANGE `filename` `file_name` VARCHAR(100) NOT NULL'))
-				$errors[] = Db::getInstance()->getMsgError();				
+				$errors[] = Db::getInstance()->getMsgError();
+		
+		$list_fields = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'reinsurance_lang`');
+		
+		if (!is_array($list_fields) || $list_fields == false)
+		{
+			$return = Db::getInstance()->execute('
+				CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'reinsurance_lang` (
+					`id_reinsurance` INT UNSIGNED NOT NULL AUTO_INCREMENT,
+					`id_lang` int(10) unsigned NOT NULL ,
+					`text` VARCHAR(300) NOT NULL,
+					PRIMARY KEY (`id_reinsurance`, `id_lang`)
+				) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8 ;');
+			if (!$return)		
+				$errors[] = Db::getInstance()->getMsgError();
+		}
 	}
 	
 	$id_module = Db::getInstance()->getValue('SELECT id_module FROM `'._DB_PREFIX_.'module` WHERE name="blocktopmenu"');

From 3879897f384ce5d0261681f314f3d11d058b7ea9 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 21 May 2013 17:36:25 +0200
Subject: [PATCH 19/40] // reduondant call to p1540_add_missing_columns

---
 install-dev/upgrade/sql/1.5.4.0.sql | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/install-dev/upgrade/sql/1.5.4.0.sql b/install-dev/upgrade/sql/1.5.4.0.sql
index 4c291e693..75da0cf64 100644
--- a/install-dev/upgrade/sql/1.5.4.0.sql
+++ b/install-dev/upgrade/sql/1.5.4.0.sql
@@ -52,6 +52,4 @@ UPDATE `PREFIX_customer` SET `id_gender` = 1 WHERE `email` LIKE 'pub@prestashop.
 
 UPDATE `PREFIX_cart_rule_carrier` crc INNER JOIN `PREFIX_carrier` c ON crc.`id_carrier` = c.`id_carrier` SET crc.`id_carrier` = c.`id_reference`;
 
-UPDATE `PREFIX_order_payment` SET `order_reference` = LPAD(order_reference, 9 , '0');
-
-/* PHP:p1540_add_missing_columns(); */;
\ No newline at end of file
+UPDATE `PREFIX_order_payment` SET `order_reference` = LPAD(order_reference, 9 , '0');
\ No newline at end of file

From 9196ec042e4a7c81cfe5e37d431ac7d63f52f57e Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Wed, 22 May 2013 09:41:00 +0200
Subject: [PATCH 20/40] // 1.4.9.1 does not exists

---
 install-dev/upgrade/sql/1.4.9.1.sql | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 install-dev/upgrade/sql/1.4.9.1.sql

diff --git a/install-dev/upgrade/sql/1.4.9.1.sql b/install-dev/upgrade/sql/1.4.9.1.sql
deleted file mode 100644
index 22c382dd4..000000000
--- a/install-dev/upgrade/sql/1.4.9.1.sql
+++ /dev/null
@@ -1 +0,0 @@
-SET NAMES 'utf8';
\ No newline at end of file

From b65423f232bb0c7e0ea9ca5a835f962f13ebf3ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Wed, 22 May 2013 10:30:57 +0200
Subject: [PATCH 21/40] [-] Core: Fix StockManager::getProductRealQuantities()
 per warehouse with some orderstatuses #PSCFV-9219

---
 classes/stock/StockManager.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/stock/StockManager.php b/classes/stock/StockManager.php
index f1d956d1d..a313da21f 100644
--- a/classes/stock/StockManager.php
+++ b/classes/stock/StockManager.php
@@ -479,8 +479,8 @@ class StockManagerCore implements StockManagerInterface
 		$query->where('o.valid = 1 OR (os.id_order_state != '.(int)Configuration::get('PS_OS_ERROR').'
 					   AND os.id_order_state != '.(int)Configuration::get('PS_OS_CANCELED').')');
 		$query->groupBy('od.id_order_detail');
-		//if (count($ids_warehouse))
-			//$query->where('od.id_warehouse IN('.implode(', ', $ids_warehouse).')');
+		if (count($ids_warehouse))
+			$query->where('od.id_warehouse IN('.implode(', ', $ids_warehouse).')');
 		$res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
 		$client_orders_qty = 0;
 		if (count($res))
@@ -658,4 +658,4 @@ class StockManagerCore implements StockManagerInterface
 		return $stocks;
 	}
 
-}
+}
\ No newline at end of file

From c7a056f301405e9ac80474d307539e49903ddac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Wed, 22 May 2013 10:42:35 +0200
Subject: [PATCH 22/40] [-] FO: Tools::getMediaServer() should return
 Tools::getShopDomain() instead of Tools::getHttpHost() #PSCFV-9217

---
 classes/Tools.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Tools.php b/classes/Tools.php
index f5ca5a939..56e8645b5 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -1523,7 +1523,7 @@ class ToolsCore
 
 		if (self::$_cache_nb_media_servers && ($id_media_server = (abs(crc32($filename)) % self::$_cache_nb_media_servers + 1)))
 			return constant('_MEDIA_SERVER_'.$id_media_server.'_');
-		return Tools::getHttpHost();
+		return Tools::getShopDomain();
 	}
 
 	public static function generateHtaccess($path = null, $rewrite_settings = null, $cache_control = null, $specific = '', $disable_multiviews = null, $medias = false, $disable_modsec = null)

From 5b250dbe8d103029e5a9d8df650992f38edb93c2 Mon Sep 17 00:00:00 2001
From: djfm <fm.de.jouvencel@gmail.com>
Date: Wed, 22 May 2013 11:11:37 +0200
Subject: [PATCH 23/40] // parse error

---
 controllers/front/ContactController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php
index 82c2345a9..8098ad0ee 100644
--- a/controllers/front/ContactController.php
+++ b/controllers/front/ContactController.php
@@ -281,7 +281,7 @@ class ContactControllerCore extends FrontController
 				$tmp = $order->getProducts();
 				foreach ($tmp as $key => $val)
 					$products[$row['id_order']][$val['product_id']] = array('value' => $val['product_id'], 'label' => $val['product_name']);
-				$orders[] = array('value' => $order->id, 'label' => $order->getUniqReference().' - '.Tools::displayDate($date[0],null , 'selected' => (int)Tools::getValue('id_order') == $order->id);
+				$orders[] = array('value' => $order->id, 'label' => $order->getUniqReference().' - '.Tools::displayDate($date[0],null) , 'selected' => (int)Tools::getValue('id_order') == $order->id);
 			}
 
 			$this->context->smarty->assign('orderList', $orders);

From 7713e86efc6a694aeb99d7f46c27b58c633dc3bf Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Wed, 22 May 2013 12:16:27 +0200
Subject: [PATCH 24/40] [-] INSTALLER : Fix bug #PSCFV-8813 missing file
 PHP:setAllGroupsOnHomeCategory();

---
 ...AllGroupsOnHomeCategory.php => setallgroupsonhomecategory.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename install-dev/upgrade/php/{setAllGroupsOnHomeCategory.php => setallgroupsonhomecategory.php} (100%)
 mode change 100755 => 100644

diff --git a/install-dev/upgrade/php/setAllGroupsOnHomeCategory.php b/install-dev/upgrade/php/setallgroupsonhomecategory.php
old mode 100755
new mode 100644
similarity index 100%
rename from install-dev/upgrade/php/setAllGroupsOnHomeCategory.php
rename to install-dev/upgrade/php/setallgroupsonhomecategory.php

From f0abc2298cbe9f8d047f5836dae85066ae31b521 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Wed, 22 May 2013 12:29:20 +0200
Subject: [PATCH 25/40] [-] INSTALLER : Fix bug #PSCFV-8813 1.4.7.0.sql not
 uptodate

---
 install-dev/upgrade/sql/1.4.7.0.sql | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/install-dev/upgrade/sql/1.4.7.0.sql b/install-dev/upgrade/sql/1.4.7.0.sql
index f38a89385..3cef2a5c3 100644
--- a/install-dev/upgrade/sql/1.4.7.0.sql
+++ b/install-dev/upgrade/sql/1.4.7.0.sql
@@ -3,7 +3,7 @@ SET NAMES 'utf8';
 /* PHP:category_product_index_unique(); */;
 
 CREATE TABLE IF NOT EXISTS `PREFIX_order_tax` (
-  `id_order` int(11) NOT NULL,
+  `id_order` int(10) NOT NULL,
   `tax_name` varchar(40) NOT NULL,
   `tax_rate` decimal(6,3) NOT NULL,
   `amount` decimal(20,6) NOT NULL
@@ -12,10 +12,6 @@ CREATE TABLE IF NOT EXISTS `PREFIX_order_tax` (
 INSERT INTO `PREFIX_hook` (`name`, `title`, `description`, `position`, `live_edit`) VALUES
 ('frontCanonicalRedirect', 'Front Canonical Redirect', 'Check for 404 errors before canonical redirects', 0, 0);
 
-SET @id_hook = (SELECT `id_hook` FROM `PREFIX_hook` WHERE `name` = 'frontCanonicalRedirect');
-SET @position = (SELECT IFNULL(MAX(`position`),0)+1 FROM `PREFIX_hook_module` WHERE `id_hook` = @id_hook);
-SET @id_module = (SELECT `id_module` FROM `PREFIX_module` WHERE `name` = 'pagesnotfound');
+/* PHP:update_module_pagesnotfound(); */;
 
-INSERT INTO `PREFIX_hook_module` (`id_hook`, `id_module`, `position`) VALUES (@id_hook, @id_module, @position);
-
-ALTER TABLE `PREFIX_order_state` ADD COLUMN `deleted` tinyint(1) UNSIGNED NOT NULL default '0' AFTER `delivery`;
+ALTER TABLE `PREFIX_order_state` ADD COLUMN `deleted` tinyint(1) UNSIGNED NOT NULL default '0' AFTER `delivery`;
\ No newline at end of file

From 487c567224278fa1aab150eeb24aa4296ddf3a95 Mon Sep 17 00:00:00 2001
From: vAugagneur <fistou@me.com>
Date: Wed, 22 May 2013 14:38:39 +0200
Subject: [PATCH 26/40] //small fix

---
 controllers/admin/AdminCustomersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index 67295f8f2..621e9b765 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -669,7 +669,7 @@ class AdminCustomersControllerCore extends AdminController
 			'count_better_customers' => $count_better_customers,
 			'shop_is_feature_active' => Shop::isFeatureActive(),
 			'name_shop' => $shop->name,
-			'customer_birthday' => Tools::displayDate($customer->birthday, $this->default_form_language),
+			'customer_birthday' => Tools::displayDate($customer->birthday),
 			'last_update' => Tools::displayDate($customer->date_upd,null , true),
 			'customer_exists' => Customer::customerExists($customer->email),
 			'id_lang' => $customer->id_lang,

From de945adf79967d970a8abd717e299eb0efb62dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Wed, 22 May 2013 15:46:30 +0200
Subject: [PATCH 27/40] [*] MO: Add smarty cache on blocksupplier and
 blockmanufacturer

---
 install-dev/upgrade/sql/1.5.5.0.sql           |  8 ++-
 .../blockmanufacturer/blockmanufacturer.php   | 40 +++++++++++----
 modules/blocksupplier/blocksupplier.php       | 49 +++++++++++++------
 3 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/install-dev/upgrade/sql/1.5.5.0.sql b/install-dev/upgrade/sql/1.5.5.0.sql
index 11dcb29b8..e43bee7e7 100644
--- a/install-dev/upgrade/sql/1.5.5.0.sql
+++ b/install-dev/upgrade/sql/1.5.5.0.sql
@@ -7,4 +7,10 @@ INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VAL
 ALTER TABLE `PREFIX_webservice_account` CHANGE `class_name` `class_name` VARCHAR(64) NOT NULL DEFAULT 'WebserviceRequest',
 CHANGE `module_name` `module_name` VARCHAR(64) NULL DEFAULT NULL;
 
-/* PHP:add_module_to_hook(blockcart, actionCartListOverride); */;
\ No newline at end of file
+/* PHP:add_module_to_hook(blockcart, actionCartListOverride); */;
+/* PHP:add_module_to_hook(blockmanufacturer, actionObjectManufacturerDeleteAfter); */;
+/* PHP:add_module_to_hook(blockmanufacturer, actionObjectManufacturerAddAfter); */;
+/* PHP:add_module_to_hook(blockmanufacturer, actionObjectManufacturerUpdateAfter); */;
+/* PHP:add_module_to_hook(blocksupplier, actionObjectSupplierDeleteAfter); */;
+/* PHP:add_module_to_hook(blocksupplier, actionObjectSupplierAddAfter); */;
+/* PHP:add_module_to_hook(blocksupplier, actionObjectSupplierUpdateAfter); */;
diff --git a/modules/blockmanufacturer/blockmanufacturer.php b/modules/blockmanufacturer/blockmanufacturer.php
index 9f760c35a..2c07dc54e 100644
--- a/modules/blockmanufacturer/blockmanufacturer.php
+++ b/modules/blockmanufacturer/blockmanufacturer.php
@@ -48,19 +48,25 @@ class BlockManufacturer extends Module
 		Configuration::updateValue('MANUFACTURER_DISPLAY_TEXT', true);
 		Configuration::updateValue('MANUFACTURER_DISPLAY_TEXT_NB', 5);
 		Configuration::updateValue('MANUFACTURER_DISPLAY_FORM', true);
-        return parent::install() && $this->registerHook('leftColumn') && $this->registerHook('header');
+      return parent::install() &&
+			$this->registerHook('leftColumn') && 
+			$this->registerHook('header') &&
+			$this->registerHook('actionObjectManufacturerDeleteAfter') &&
+			$this->registerHook('actionObjectManufacturerAddAfter') &&
+			$this->registerHook('actionObjectManufacturerUpdateAfter');
     }
 
 	public function hookLeftColumn($params)
 	{
-		$this->smarty->assign(array(
-			'manufacturers' => Manufacturer::getManufacturers(),
-			'text_list' => Configuration::get('MANUFACTURER_DISPLAY_TEXT'),
-			'text_list_nb' => Configuration::get('MANUFACTURER_DISPLAY_TEXT_NB'),
-			'form_list' => Configuration::get('MANUFACTURER_DISPLAY_FORM'),
-			'display_link_manufacturer' => Configuration::get('PS_DISPLAY_SUPPLIERS'),
-		));
-		return $this->display(__FILE__, 'blockmanufacturer.tpl');
+		if (!$this->isCached('blockmanufacturer.tpl', $this->getCacheId()))
+			$this->smarty->assign(array(
+				'manufacturers' => Manufacturer::getManufacturers(),
+				'text_list' => Configuration::get('MANUFACTURER_DISPLAY_TEXT'),
+				'text_list_nb' => Configuration::get('MANUFACTURER_DISPLAY_TEXT_NB'),
+				'form_list' => Configuration::get('MANUFACTURER_DISPLAY_FORM'),
+				'display_link_manufacturer' => Configuration::get('PS_DISPLAY_SUPPLIERS'),
+			));
+		return $this->display(__FILE__, 'blockmanufacturer.tpl', $this->getCacheId());
 	}
 
 	public function hookRightColumn($params)
@@ -85,6 +91,7 @@ class BlockManufacturer extends Module
 				Configuration::updateValue('MANUFACTURER_DISPLAY_TEXT', $text_list);
 				Configuration::updateValue('MANUFACTURER_DISPLAY_TEXT_NB', $text_nb);
 				Configuration::updateValue('MANUFACTURER_DISPLAY_FORM', $form_list);
+				$this->_clearCache('blockmanufacturer.tpl');
 			}
 			if (isset($errors) && count($errors))
 				$output .= $this->displayError(implode('<br />', $errors));
@@ -126,4 +133,19 @@ class BlockManufacturer extends Module
 	{
 		$this->context->controller->addCSS(($this->_path).'blockmanufacturer.css', 'all');
 	}
+	
+	public function hookActionObjectManufacturerUpdateAfter($params)
+	{
+		$this->_clearCache('blockmanufacturer.tpl');
+	}
+
+	public function hookActionObjectManufacturerAddAfter($params)
+	{
+		$this->_clearCache('blockmanufacturer.tpl');
+	}
+
+	public function hookActionObjectManufacturerDeleteAfter($params)
+	{
+		$this->_clearCache('blockmanufacturer.tpl');
+	}
 }
diff --git a/modules/blocksupplier/blocksupplier.php b/modules/blocksupplier/blocksupplier.php
index e900db6f2..694ddd365 100644
--- a/modules/blocksupplier/blocksupplier.php
+++ b/modules/blocksupplier/blocksupplier.php
@@ -47,9 +47,12 @@ class BlockSupplier extends Module
 	{
 		if (!parent::install())
 			return false;
-		if (!$this->registerHook('displayLeftColumn'))
-			return false;
-		if (!$this->registerHook('displayHeader'))
+		if (!$this->registerHook('displayLeftColumn') ||
+				!$this->registerHook('displayHeader') ||
+				!$this->registerHook('actionObjectSupplierDeleteAfter') ||
+				!$this->registerHook('actionObjectSupplierAddAfter') ||
+				!$this->registerHook('actionObjectSupplierUpdateAfter')
+			)
 			return false;
 		Configuration::updateValue('SUPPLIER_DISPLAY_TEXT', true);
 		Configuration::updateValue('SUPPLIER_DISPLAY_TEXT_NB', 5);
@@ -73,16 +76,16 @@ class BlockSupplier extends Module
 	function hookDisplayLeftColumn($params)
 	{
 		$id_lang = (int)Context::getContext()->language->id;
-
-		$this->smarty->assign(array(
-			'suppliers' => Supplier::getSuppliers(false, $id_lang),
-			'link' => $this->context->link,
-			'text_list' => Configuration::get('SUPPLIER_DISPLAY_TEXT'),
-			'text_list_nb' => Configuration::get('SUPPLIER_DISPLAY_TEXT_NB'),
-			'form_list' => Configuration::get('SUPPLIER_DISPLAY_FORM'),
-			'display_link_supplier' => Configuration::get('PS_DISPLAY_SUPPLIERS')
-		));
-		return $this->display(__FILE__, 'blocksupplier.tpl');
+		if (!$this->isCached('blocksupplier.tpl', $this->getCacheId()))
+			$this->smarty->assign(array(
+				'suppliers' => Supplier::getSuppliers(false, $id_lang),
+				'link' => $this->context->link,
+				'text_list' => Configuration::get('SUPPLIER_DISPLAY_TEXT'),
+				'text_list_nb' => Configuration::get('SUPPLIER_DISPLAY_TEXT_NB'),
+				'form_list' => Configuration::get('SUPPLIER_DISPLAY_FORM'),
+				'display_link_supplier' => Configuration::get('PS_DISPLAY_SUPPLIERS')
+			));
+		return $this->display(__FILE__, 'blocksupplier.tpl', $this->getCacheId());
 	}
 
 	function getContent()
@@ -102,6 +105,7 @@ class BlockSupplier extends Module
 				Configuration::updateValue('SUPPLIER_DISPLAY_TEXT', $text_list);
 				Configuration::updateValue('SUPPLIER_DISPLAY_TEXT_NB', $text_nb);
 				Configuration::updateValue('SUPPLIER_DISPLAY_FORM', $form_list);
+				$this->_clearCache('blocksupplier.tpl');
 			}
 			if (isset($errors) AND sizeof($errors))
 				$output .= $this->displayError(implode('<br />', $errors));
@@ -139,14 +143,29 @@ class BlockSupplier extends Module
 		return $output;
 	}
 
-	function hookDisplayRightColumn($params)
+	public function hookDisplayRightColumn($params)
 	{
 		return $this->hookDisplayLeftColumn($params);
 	}
 
-	function hookDisplayHeader($params)
+	public function hookDisplayHeader($params)
 	{
 		$this->context->controller->addCSS(($this->_path).'blocksupplier.css', 'all');
 	}
+	
+	public function hookActionObjectSupplierUpdateAfter($params)
+	{
+		$this->_clearCache('blocksupplier.tpl');
+	}
+
+	public function hookActionObjectSupplierAddAfter($params)
+	{
+		$this->_clearCache('blocksupplier.tpl');
+	}
+
+	public function hookActionObjectSupplierDeleteAfter($params)
+	{
+		$this->_clearCache('blocksupplier.tpl');
+	}
 }
 

From 0b503a0c8b2181db9888d99dfea16c6aca2d9721 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Wed, 22 May 2013 16:54:34 +0200
Subject: [PATCH 28/40] // Inverted 2 steps in the installer

---
 install-dev/classes/controllerHttp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-dev/classes/controllerHttp.php b/install-dev/classes/controllerHttp.php
index 8063ab9af..33c6f9d97 100644
--- a/install-dev/classes/controllerHttp.php
+++ b/install-dev/classes/controllerHttp.php
@@ -29,7 +29,7 @@ abstract class InstallControllerHttp
 	/**
 	 * @var array List of installer steps
 	 */
-	protected static $steps = array('welcome', 'license', 'system', 'database', 'configure', 'process');
+	protected static $steps = array('welcome', 'license', 'system', 'configure', 'database', 'process');
 
 	protected static $instances = array();
 

From c6ab6005f5cd2117499db10e486f24917d7fffed Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Thu, 23 May 2013 10:50:22 +0200
Subject: [PATCH 29/40] // Added error reporting level in dev mode

---
 config/defines.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/defines.inc.php b/config/defines.inc.php
index 8ce70b580..ab72ff105 100755
--- a/config/defines.inc.php
+++ b/config/defines.inc.php
@@ -28,7 +28,8 @@
 define('_PS_MODE_DEV_', true);
 if (_PS_MODE_DEV_)
 {
-	@ini_set('display_errors', 'on');	
+	@ini_set('display_errors', 'on');
+	@error_reporting(E_ALL | E_STRICT);
 	define('_PS_DEBUG_SQL_', true);
 	/* Compatibility warning */
 	define('_PS_DISPLAY_COMPATIBILITY_WARNING_', true);

From 9e7d2ac9c7f92f58d71954150f1c9845fcb42c5a Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Thu, 23 May 2013 12:13:28 +0200
Subject: [PATCH 30/40] [-] Core : fixed URL regexp #PSCFV-8986

---
 classes/Validate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Validate.php b/classes/Validate.php
index 6af8d92c2..9d43e805f 100644
--- a/classes/Validate.php
+++ b/classes/Validate.php
@@ -724,7 +724,7 @@ class ValidateCore
 	 */
 	public static function isTrackingNumber($tracking_number)
 	{
-		return preg_match('/^[~:#,%&_=\(\)\.\? \+\-@\/a-zA-Z0-9]+$/', $tracking_number);
+		return preg_match('/^[~:#,%&_=\(\)\[\]\.\? \+\-@\/a-zA-Z0-9]+$/', $tracking_number);
 	}
 
 	/**
@@ -747,7 +747,7 @@ class ValidateCore
 	public static function isAbsoluteUrl($url)
 	{
 		if (!empty($url))
-			return preg_match('/^https?:\/\/[,:#%&_=\(\)\.\? \+\-@\/a-zA-Z0-9]+$/', $url);
+			return preg_match('/^https?:\/\/[~:#,%&_=\(\)\[\]\.\? \+\-@\/a-zA-Z0-9]+$/', $url);
 		return true;
 	}
 

From affca315589c60b0e8d2d007da3706da81f464ab Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Thu, 23 May 2013 14:11:13 +0200
Subject: [PATCH 31/40] [-] IN : updated support phone number and website in
 the installer

---
 install-dev/langs/br/install.php | 2 +-
 install-dev/langs/de/install.php | 1 +
 install-dev/langs/en/install.php | 2 +-
 install-dev/langs/es/install.php | 1 +
 install-dev/langs/it/install.php | 1 +
 install-dev/langs/pl/install.php | 4 ++++
 install-dev/langs/ru/install.php | 4 ++++
 7 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/install-dev/langs/br/install.php b/install-dev/langs/br/install.php
index 104f2a514..e379bec88 100644
--- a/install-dev/langs/br/install.php
+++ b/install-dev/langs/br/install.php
@@ -2,7 +2,7 @@
 return array(
 	'informations' => array(
 		'phone' => '+1 888.947.6543',
-		'support' => 'http://support.prestashop.com/en/',
+		'support' => 'https://www.prestashop.com/pt/support',
 	),
 	'translations' => array(
 		'menu_welcome' => 'Escolha seu idioma',
diff --git a/install-dev/langs/de/install.php b/install-dev/langs/de/install.php
index fedcb2247..b09b8ac8b 100644
--- a/install-dev/langs/de/install.php
+++ b/install-dev/langs/de/install.php
@@ -2,6 +2,7 @@
 return array(
 	'informations' => array(
 		'phone' => '+33 (0)1.40.18.30.04',
+		'support' => 'https://www.prestashop.com/de/support',
 	),
 	'translations' => array(
 		'menu_welcome' => 'Sprachauswahl',
diff --git a/install-dev/langs/en/install.php b/install-dev/langs/en/install.php
index ee296298a..cd29befe8 100644
--- a/install-dev/langs/en/install.php
+++ b/install-dev/langs/en/install.php
@@ -6,7 +6,7 @@ return array(
 		'documentation_upgrade' => 'http://docs.prestashop.com/display/PS15/Updating+PrestaShop',
 		'forum' => 'http://www.prestashop.com/forums/',
 		'blog' => 'http://www.prestashop.com/blog/',
-		'support' => 'http://support.prestashop.com/en/',
+		'support' => 'https://www.prestashop.com/en/support',
 	),
 	'translations' => array(
 		'menu_welcome' => 'Choose your language',
diff --git a/install-dev/langs/es/install.php b/install-dev/langs/es/install.php
index e9fb6d41c..78401e6cb 100644
--- a/install-dev/langs/es/install.php
+++ b/install-dev/langs/es/install.php
@@ -2,6 +2,7 @@
 return array(
 	'informations' => array(
 		'phone' => '+1 (888) 947-6543',
+		'support' => 'https://www.prestashop.com/es/support',
 	),
 	'translations' => array(
 		'menu_welcome' => 'Elegir el idioma',
diff --git a/install-dev/langs/it/install.php b/install-dev/langs/it/install.php
index 77e6eb468..47bccfb0e 100644
--- a/install-dev/langs/it/install.php
+++ b/install-dev/langs/it/install.php
@@ -2,6 +2,7 @@
 return array(
 	'informations' => array(
 		'phone' => '+33 (0)1.40.18.30.04',
+		'support' => 'https://www.prestashop.com/it/support',
 	),
 	'translations' => array(
 		'menu_welcome' => 'Scelta della lingua',
diff --git a/install-dev/langs/pl/install.php b/install-dev/langs/pl/install.php
index d32708c8d..3197cf69b 100644
--- a/install-dev/langs/pl/install.php
+++ b/install-dev/langs/pl/install.php
@@ -1,5 +1,9 @@
 <?php
 return array(
+	'informations' => array(
+		'phone' => '+33 (0)1.40.18.30.04',
+		'support' => 'https://www.prestashop.com/pl/wsparcie-techniczne',
+	),
 	'translations' => array(
 		'An SQL error occured for entity <i>%1$s</i>: <i>%2$s</i>' => 'Wystąpił błąd SQL w rekordzie <i>%1$s</i>: <i>%2$s</i>',
 		'Cannot create image "%1$s" for entity "%2$s"' => 'Nie można utworzyć obrazu "%1$s" dla rekordu "%2$s"',
diff --git a/install-dev/langs/ru/install.php b/install-dev/langs/ru/install.php
index eefaef775..46a46d561 100644
--- a/install-dev/langs/ru/install.php
+++ b/install-dev/langs/ru/install.php
@@ -1,5 +1,9 @@
 <?php
 return array(
+	'informations' => array(
+		'phone' => '+33 (0)1.40.18.30.04',
+		'support' => 'https://www.prestashop.com/en/support',
+	),
 	'translations' => array(
 		'An SQL error occured for entity <i>%1$s</i>: <i>%2$s</i>' => 'В SQL произошла ошибка для значения <i>%1$s</i>: <i>%2$s</i>',
 		'Cannot create image "%1$s" for entity "%2$s"' => 'Невозможно создать изображение  "%1$s" для значения "%2$s"',

From 36acfc1227ea5f27400f7859442f97fdb6711bfc Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Thu, 23 May 2013 14:29:40 +0200
Subject: [PATCH 32/40] // Updated russian translation of the installer

---
 install-dev/langs/ru/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-dev/langs/ru/install.php b/install-dev/langs/ru/install.php
index 46a46d561..1302da03d 100644
--- a/install-dev/langs/ru/install.php
+++ b/install-dev/langs/ru/install.php
@@ -187,7 +187,7 @@ return array(
 		'menu_license' => 'Лицензионное соглашение',
 		'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'Ядро PrestaShop разработано на  OSL 3.0, а модули и шаблоны PrestaShop разработаны на AFL 3.0.',
 		'I agree to the above terms and conditions.' => 'Я принимаю правила и условия.',
-		'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Внесите свой вклад в улучшение программного обеспечения, отравив анонимное сообщене о Вашей конфгурации.',
+		'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Внесите свой вклад в улучшение программного обеспечения, отправив анонимное сообщение о Вашей конфигурации.',
 		'PHP 5.1.2 or later is not enabled' => 'PHP 5.1.2 или более поздняя версия не активирована',
 		'Cannot upload files' => 'Невозможно загрузить файлы',
 		'Cannot create new files and folders' => 'Невозможно создать новые файлы и папки',

From 66fbbf4825e79c9db1053f4c69f2d48fe428776c Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Thu, 23 May 2013 14:49:07 +0200
Subject: [PATCH 33/40] [-] INSTALLER : Prevent crash when populating data,
 MACOSX OS creates hidden files

---
 install-dev/classes/xmlLoader.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/install-dev/classes/xmlLoader.php b/install-dev/classes/xmlLoader.php
index 2b6daad41..b2c86ddc3 100644
--- a/install-dev/classes/xmlLoader.php
+++ b/install-dev/classes/xmlLoader.php
@@ -224,10 +224,13 @@ class InstallXmlLoader
 			return;
 		}
 
+		if (substr($entity, 0, 1) == '.' || substr($entity, 0, 1) == '_')
+			return;		
+
 		$xml = $this->loadEntity($entity);
 
 		// Read list of fields
-		if (!$xml->fields)
+		if (!is_object($xml) || !$xml->fields)
 			throw new PrestashopInstallerException('List of fields not found for entity '.$entity);
 
 		if ($this->isMultilang($entity))

From 6d0c69a07fc85cfc7c565e470bd8dde2931266a2 Mon Sep 17 00:00:00 2001
From: vAugagneur <fistou@me.com>
Date: Thu, 23 May 2013 15:24:25 +0200
Subject: [PATCH 34/40] //Merged pull request 124 - thanks to @rynge

---
 modules/mailalerts/mailalerts.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/mailalerts/mailalerts.php b/modules/mailalerts/mailalerts.php
index 20add47cc..9baaa815c 100644
--- a/modules/mailalerts/mailalerts.php
+++ b/modules/mailalerts/mailalerts.php
@@ -353,7 +353,9 @@ class MailAlerts extends Module
 			'{delivery_postal_code}' => $delivery->postcode,
 			'{delivery_country}' => $delivery->country,
 			'{delivery_state}' => $delivery->id_state ? $delivery_state->name : '',
-			'{delivery_phone}' => $delivery->phone ? $delivery->phone : $delivery->phone_mobile,
+			'{delivery_phone}' => $delivery->phone,
+			'{delivery_phone_mobile}' => $delivery->phone_mobile,
+			'{delivery_vat_number}' => $delivery->vat_number,
 			'{delivery_other}' => $delivery->other,
 			'{invoice_company}' => $invoice->company,
 			'{invoice_firstname}' => $invoice->firstname,
@@ -364,7 +366,9 @@ class MailAlerts extends Module
 			'{invoice_postal_code}' => $invoice->postcode,
 			'{invoice_country}' => $invoice->country,
 			'{invoice_state}' => $invoice->id_state ? $invoice_state->name : '',
-			'{invoice_phone}' => $invoice->phone ? $invoice->phone : $invoice->phone_mobile,
+			'{invoice_phone}' => $invoice->phone,
+			'{invoice_phone_mobile}' => $invoice->phone_mobile,
+			'{invoice_vat_number}' => $invoice->vat_number,
 			'{invoice_other}' => $invoice->other,
 			'{order_name}' => sprintf('%06d', $order->id),
 			'{shop_name}' => Configuration::get('PS_SHOP_NAME'),

From 4b64afd4ee7711f02ae80c99f76174391367e84f Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Thu, 23 May 2013 16:14:31 +0200
Subject: [PATCH 35/40] [-] BO : Fix bug #PSCFI-6755 "+" in email

---
 js/sendMailTest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/sendMailTest.js b/js/sendMailTest.js
index ad2b16444..f46a6542d 100644
--- a/js/sendMailTest.js
+++ b/js/sendMailTest.js
@@ -24,7 +24,7 @@
 */
 
 //constant
-verifMailREGEX = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/;
+verifMailREGEX = /^([\w+-]+(?:\.[\w+-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/;
 
 function verifyMail(testMsg, testSubject)
 {

From cc79b6a675e4d4b978edc629f261c3951cbed0b5 Mon Sep 17 00:00:00 2001
From: vAugagneur <fistou@me.com>
Date: Fri, 24 May 2013 10:47:48 +0200
Subject: [PATCH 36/40] [-] BO : fixed bug #PSCFV-9178 - is_color_group is not
 inserted correctly

---
 classes/AttributeGroup.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/classes/AttributeGroup.php b/classes/AttributeGroup.php
index 8a8548379..665ec87f2 100644
--- a/classes/AttributeGroup.php
+++ b/classes/AttributeGroup.php
@@ -70,6 +70,11 @@ class AttributeGroupCore extends ObjectModel
 
 	public function add($autodate = true, $nullValues = false)
 	{
+		if ($this->group_type == 'color')
+			$this->is_color_group = 1;
+		else
+			$this->is_color_group = 0;
+		
 		if ($this->position <= 0)
 			$this->position = AttributeGroup::getHigherPosition() + 1;
 
@@ -80,11 +85,16 @@ class AttributeGroupCore extends ObjectModel
 
 	public function update($nullValues = false)
 	{
+		if ($this->group_type == 'color')
+			$this->is_color_group = 1;
+		else
+			$this->is_color_group = 0;
+		
 		$return = parent::update($nullValues);
 		Hook::exec('actionAttributeGroupSave', array('id_attribute_group' => $this->id));
 		return $return;
 	}
-
+	
 	public static function cleanDeadCombinations()
 	{
 		$attribute_combinations = Db::getInstance()->executeS('

From 3b5f18a96dfde6f54a551cc6b4073ce2023495f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Fri, 24 May 2013 11:28:07 +0200
Subject: [PATCH 37/40] [-] BO: Fix language deletion with multishop when shops
 still associate to the language #PSCFV-9244

---
 classes/Language.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/Language.php b/classes/Language.php
index 3ce4b1908..6f0469774 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -466,7 +466,7 @@ class LanguageCore extends ObjectModel
 
 	public function delete()
 	{
-		if (!$this->hasMultishopEntries())
+		if (!$this->hasMultishopEntries() || Shop::getContext() == Shop::CONTEXT_ALL)
 		{
 			if (empty($this->iso_code))
 				$this->iso_code = Language::getIsoById($this->id);
@@ -514,7 +514,7 @@ class LanguageCore extends ObjectModel
 		
 		if (!parent::delete())
 			return false;
-		if (!$this->hasMultishopEntries())
+		if (!$this->hasMultishopEntries() || Shop::getContext() == Shop::CONTEXT_ALL)
 		{
 			// delete images
 			$files_copy = array(
@@ -831,4 +831,4 @@ class LanguageCore extends ObjectModel
 	{
 		return (Language::countActiveLanguages() > 1);
 	}
-}
+}
\ No newline at end of file

From 3de79c701582d9f486533e21b030ec17d5f710fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Fri, 24 May 2013 11:33:58 +0200
Subject: [PATCH 38/40] // same for attributes and attributegroups

---
 classes/Attribute.php      | 4 ++--
 classes/AttributeGroup.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/Attribute.php b/classes/Attribute.php
index c27e409b3..93391bc6c 100644
--- a/classes/Attribute.php
+++ b/classes/Attribute.php
@@ -71,7 +71,7 @@ class AttributeCore extends ObjectModel
 
 	public function delete()
 	{
-		if (!$this->hasMultishopEntries())
+		if (!$this->hasMultishopEntries() || Shop::getContext() == Shop::CONTEXT_ALL)
 		{
 			$result = Db::getInstance()->executeS('SELECT id_product_attribute FROM '._DB_PREFIX_.'product_attribute_combination WHERE id_attribute = '.(int)$this->id);
 			foreach ($result as $row)
@@ -343,4 +343,4 @@ class AttributeCore extends ObjectModel
 
 		return (is_numeric($position)) ? $position : -1;
 	}
-}
+}
\ No newline at end of file
diff --git a/classes/AttributeGroup.php b/classes/AttributeGroup.php
index 665ec87f2..15f72122a 100644
--- a/classes/AttributeGroup.php
+++ b/classes/AttributeGroup.php
@@ -119,7 +119,7 @@ class AttributeGroupCore extends ObjectModel
 
 	public function delete()
 	{
-		if (!$this->hasMultishopEntries())
+		if (!$this->hasMultishopEntries() || Shop::getContext() == Shop::CONTEXT_ALL)
 		{
 			/* Select children in order to find linked combinations */
 			$attribute_ids = Db::getInstance()->executeS('

From 3b1a9f9f805e106a4dd8454b85ca071f58161bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=E7ois=20Gaillard?= <francois.gaillard@prestashop.com>
Date: Fri, 24 May 2013 11:39:20 +0200
Subject: [PATCH 39/40] [-] BO : Fixed unregistered version field for some
 modules

---
 classes/module/Module.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/classes/module/Module.php b/classes/module/Module.php
index fb70d9075..234897db7 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -311,6 +311,12 @@ abstract class ModuleCore
 	 */
 	public static function initUpgradeModule($module)
 	{
+		if (((int)$module->installed == 1) & (empty($module->database_version) === true))
+		{
+			Module::upgradeModuleVersion($module->name, $module->version);
+			$module->database_version = $module->version;
+		}
+		
 		// Init cache upgrade details
 		self::$modules_cache[$module->name]['upgrade'] = array(
 			'success' => false, // bool to know if upgrade succeed or not

From 95e46afc99657f4de6c5c941c378de57472fdc25 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Fri, 24 May 2013 17:21:56 +0200
Subject: [PATCH 40/40] [-] FO : Fix bug #PSCFV-9171, can not order with a
 unactivated country

---
 classes/Address.php                         | 5 +++++
 controllers/front/ParentOrderController.php | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/classes/Address.php b/classes/Address.php
index abf8ac2a3..01a227232 100644
--- a/classes/Address.php
+++ b/classes/Address.php
@@ -237,6 +237,8 @@ class AddressCore extends ObjectModel
 	 */
 	public static function getZoneById($id_address)
 	{
+		if(!isset($id_address) || empty($id_address))
+			return false;
 		if (isset(self::$_idZones[$id_address]))
 			return self::$_idZones[$id_address];
 
@@ -259,6 +261,9 @@ class AddressCore extends ObjectModel
 	 */
 	public static function isCountryActiveById($id_address)
 	{
+		if(!isset($id_address) || empty($id_address))
+			return false;
+
 		if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
 		SELECT c.`active`
 		FROM `'._DB_PREFIX_.'address` a
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index b5f5fdc1d..65e287e5d 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -399,10 +399,11 @@ class ParentOrderControllerCore extends FrontController
 
 			// Getting a list of formated address fields with associated values
 			$formatedAddressFieldsValuesList = array();
-			foreach ($customerAddresses as $address)
+			foreach ($customerAddresses as $i => $address)
 			{
+				if (!Address::isCountryActiveById((int)($address['id_address'])))
+					unset($customerAddresses[$i]);										
 				$tmpAddress = new Address($address['id_address']);
-
 				$formatedAddressFieldsValuesList[$address['id_address']]['ordered_fields'] = AddressFormat::getOrderedAddressFields($address['id_country']);
 				$formatedAddressFieldsValuesList[$address['id_address']]['formated_fields_values'] = AddressFormat::getFormattedAddressFieldsValues(
 					$tmpAddress,
@@ -459,6 +460,8 @@ class ParentOrderControllerCore extends FrontController
 	{	
 		$address = new Address($this->context->cart->id_address_delivery);
 		$id_zone = Address::getZoneById($address->id);
+		if (!Address::isCountryActiveById((int)($this->context->cart->id_address_delivery)) || !Address::isCountryActiveById((int)($this->context->cart->id_address_invoice)))
+			Tools::redirect('index.php?controller=order&step=1');					
 		$carriers = $this->context->cart->simulateCarriersOutput();
 		$checked = $this->context->cart->simulateCarrierSelectedOutput();
 		$delivery_option_list = $this->context->cart->getDeliveryOptionList();