From 13482914158857d5977f2a1b8d42f979e2689cd1 Mon Sep 17 00:00:00 2001
From: nturato <turato.nicola@gmail.com>
Date: Tue, 15 Jan 2013 10:17:02 +0100
Subject: [PATCH 01/67] [WS] images are only shown as jpg or gif

If you enable BO to also use the PNG file you can not use these images in WS because there are no controls on the image type
---
 .../WebserviceSpecificManagementImages.php       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/classes/webservice/WebserviceSpecificManagementImages.php b/classes/webservice/WebserviceSpecificManagementImages.php
index d2e20108f..c7e282bd7 100755
--- a/classes/webservice/WebserviceSpecificManagementImages.php
+++ b/classes/webservice/WebserviceSpecificManagementImages.php
@@ -33,7 +33,7 @@ class WebserviceSpecificManagementImagesCore implements WebserviceSpecificManage
 	/**
 	 * @var string The extension of the image to display
 	 */
-	protected $imgExtension = 'jpg';
+	protected $imgExtension;
 
 	/**
 	 * @var array The type of images (general, categories, manufacturers, suppliers, stores...)
@@ -119,10 +119,18 @@ class WebserviceSpecificManagementImagesCore implements WebserviceSpecificManage
 		// display image content if needed
 		else if ($this->imgToDisplay)
 		{
+			if(empty($this->imgExtension)){
+				$imginfo = getimagesize($this->imgToDisplay);
+				$this->imgExtension = image_type_to_extension($imginfo[2],false);
+			}
+
 			$imageResource = false;
-			$types = array('jpg' => array('function' => 'imagecreatefromjpeg', 'Content-Type' => 'image/jpeg'),
-							'gif' => array('function' => 'imagecreatefromgif', 'Content-Type' => 'image/gif')
-							);
+			$types = array(
+				'jpg' => array('function' => 'imagecreatefromjpeg', 'Content-Type' => 'image/jpeg'),
+				'jpeg' => array('function' => 'imagecreatefromjpeg', 'Content-Type' => 'image/jpeg'),
+				'png' => array('function' => 'imagecreatefrompng', 'Content-Type' => 'image/png'),
+				'gif' => array('function' => 'imagecreatefromgif', 'Content-Type' => 'image/gif')
+			);
 
 			if (array_key_exists($this->imgExtension, $types))
 				$imageResource = @$types[$this->imgExtension]['function']($this->imgToDisplay);

From a7cfe1c0143a9af384fef0688dd1fe885d91b66d Mon Sep 17 00:00:00 2001
From: pxls <alexis@pixeles.fr>
Date: Sat, 23 Mar 2013 11:43:15 +0100
Subject: [PATCH 02/67] [-] FO : bad variable used for free product text

Bad variable used for free product text (set in blcokcart.tpl).
---
 modules/blockcart/ajax-cart.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js
index 2eb44e093..445af7245 100644
--- a/modules/blockcart/ajax-cart.js
+++ b/modules/blockcart/ajax-cart.js
@@ -449,8 +449,8 @@ var ajaxCart = {
 						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>';
 					else
 						content += '<span class="remove_link"></span>';
-					if (typeof(freeShippingTranslation) != 'undefined')
-						content += '<span class="price">' + (parseFloat(this.price_float) > 0 ? this.priceByLine : freeShippingTranslation) + '</span>';
+					if (typeof(freeProductTranslation) != 'undefined')
+						content += '<span class="price">' + (parseFloat(this.price_float) > 0 ? this.priceByLine : freeProductTranslation) + '</span>';
 					content += '</dt>';
 					if (this.hasAttributes)
 						  content += '<dd id="cart_block_combination_of_' + domIdProduct + '" class="hidden"><a href="' + this.link + '" title="' + this.name + '">' + this.attributes + '</a>';

From e002124e57fcb842136a471990075bcee4cd8316 Mon Sep 17 00:00:00 2001
From: Andrew <Kluev.andrew@gmail.com>
Date: Tue, 2 Apr 2013 16:21:27 +0400
Subject: [PATCH 03/67] [FIX] Critical bug in Cotroller class

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

diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php
index 7e4ebf6ed..570a5a1e7 100644
--- a/classes/controller/Controller.php
+++ b/classes/controller/Controller.php
@@ -175,9 +175,9 @@ abstract class ControllerCore
 			// then using displayAjax[action]
 			if ($this->ajax)
 			{
-				$action = Tools::getValue('action');
-				if (!empty($action) && method_exists($this, 'displayAjax'.Tools::toCamelCase($action, true)))
-					$this->{'displayAjax'.$action}();
+				$action = 'displayAjax' . Tools::toCamelCase(Tools::getValue('action', true));
+				if (!empty($action) && method_exists($this, $action))
+					$this->{$action}();
 				elseif (method_exists($this, 'displayAjax'))
 					$this->displayAjax();
 			}

From da56996026f80f1d7859b1fda2abf41c476ac9bd Mon Sep 17 00:00:00 2001
From: Andrew <Kluev.andrew@gmail.com>
Date: Tue, 2 Apr 2013 16:26:41 +0400
Subject: [PATCH 04/67] And in profiler too

---
 tools/profiling/Controller.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/profiling/Controller.php b/tools/profiling/Controller.php
index 1b55dd0dd..41dc03ead 100644
--- a/tools/profiling/Controller.php
+++ b/tools/profiling/Controller.php
@@ -227,9 +227,9 @@ abstract class Controller extends ControllerCore
 			// then using displayAjax[action]
 			if ($this->ajax)
 			{
-				$action = Tools::getValue('action');
-				if (!empty($action) && method_exists($this, 'displayAjax'.Tools::toCamelCase($action)))
-					$this->{'displayAjax'.$action}();
+				$action = 'displayAjax' . Tools::toCamelCase(Tools::getValue('action', true));
+				if (!empty($action) && method_exists($this, $action))
+					$this->{$action}();
 				elseif (method_exists($this, 'displayAjax'))
 					$this->displayAjax();
 			}

From 1aab35ea2902c29fe453adfbfedfeca0412f7314 Mon Sep 17 00:00:00 2001
From: PrestaEdit <j.danse@prestaedit.com>
Date: Fri, 5 Apr 2013 02:43:11 +0300
Subject: [PATCH 05/67] [-] Config: juste more beautifull :)

---
 config/defines_uri.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/defines_uri.inc.php b/config/defines_uri.inc.php
index 4f1892fb9..fa72550ad 100644
--- a/config/defines_uri.inc.php
+++ b/config/defines_uri.inc.php
@@ -71,11 +71,11 @@ define('_THEME_LANG_DIR_',			_PS_IMG_.'l/');
 define('_THEME_COL_DIR_', 			_PS_IMG_.'co/');
 define('_THEME_GENDERS_DIR_',		_PS_IMG_.'genders/');
 define('_SUPP_DIR_',      			_PS_IMG_.'su/');
-define('_PS_PROD_IMG_', 			'img/p/');
+define('_PS_PROD_IMG_', 			_PS_IMG_.'/p/');
 
 /* Other URLs */
 define('_PS_JS_DIR_',               __PS_BASE_URI__.'js/');
 define('_PS_CSS_DIR_',              __PS_BASE_URI__.'css/');
 define('_THEME_PROD_PIC_DIR_', 	__PS_BASE_URI__.'upload/');
 define('_MAIL_DIR_',        	__PS_BASE_URI__.'mails/');
-define('_MODULE_DIR_',        	__PS_BASE_URI__.'modules/');
\ No newline at end of file
+define('_MODULE_DIR_',        	__PS_BASE_URI__.'modules/');

From 0d20860e5be38bb8b3111aa52bf646a2e91bdf9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mouleyre?= <mouleyrecedric@gmail.com>
Date: Mon, 8 Apr 2013 11:53:37 +0300
Subject: [PATCH 06/67] Update blocknewsletter.php

No cache on the newsletter tpl, else the message is never displayed
---
 modules/blocknewsletter/blocknewsletter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/blocknewsletter/blocknewsletter.php b/modules/blocknewsletter/blocknewsletter.php
index 304bfb963..6b2dc1bd5 100644
--- a/modules/blocknewsletter/blocknewsletter.php
+++ b/modules/blocknewsletter/blocknewsletter.php
@@ -509,7 +509,7 @@ class Blocknewsletter extends Module
 	public function hookDisplayLeftColumn($params)
 	{
 		$this->_prepareHook($params);
-		return $this->display(__FILE__, 'blocknewsletter.tpl', $this->getCacheId());
+		return $this->display(__FILE__, 'blocknewsletter.tpl');
 	}
 	
 	public function hookFooter($params)

From 40ad032dd45be2ee6869c0db8f44829eae1d49cf Mon Sep 17 00:00:00 2001
From: PrestaEdit <j.danse@prestaedit.com>
Date: Tue, 9 Apr 2013 00:33:49 +0300
Subject: [PATCH 07/67] [+] BO: show all languages in setting of employee

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

diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php
index b0222401a..ebdef6a4a 100644
--- a/controllers/admin/AdminEmployeesController.php
+++ b/controllers/admin/AdminEmployeesController.php
@@ -227,7 +227,7 @@ class AdminEmployeesControllerCore extends AdminController
 					'name' => 'id_lang',
 					'required' => true,
 					'options' => array(
-						'query' => Language::getLanguages(),
+						'query' => Language::getLanguages(false),
 						'id' => 'id_lang',
 						'name' => 'name'
 					)

From f15722858e99753c48c505153ed5318c24f0da6b Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Thu, 11 Apr 2013 10:30:22 +0200
Subject: [PATCH 08/67] [-] FO :  standardize behavior of selected country in
 the list when create a new address

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

diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 727945eb2..7c7d6b5ef 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -104,12 +104,21 @@ class AuthControllerCore extends FrontController
 				$countries = Carrier::getDeliveredCountries($this->context->language->id, true, true);
 			else
 				$countries = Country::getCountries($this->context->language->id, true);
-
+			
+			if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+			{
+				$array = preg_split('/,|-/', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+				if (!Validate::isLanguageIsoCode($array[0]) || !($sl_country = Country::getByIso($array[0])))
+					$sl_country = (int)Configuration::get('PS_COUNTRY_DEFAULT');
+			}
+			else
+				$sl_country = (int)Tools::getValue('id_country', Configuration::get('PS_COUNTRY_DEFAULT'));
+			
 			$this->context->smarty->assign(array(
 					'inOrderProcess' => true,
 					'PS_GUEST_CHECKOUT_ENABLED' => Configuration::get('PS_GUEST_CHECKOUT_ENABLED'),
 					'PS_REGISTRATION_PROCESS_TYPE' => Configuration::get('PS_REGISTRATION_PROCESS_TYPE'),
-					'sl_country' => (int)Tools::getValue('id_country', Configuration::get('PS_COUNTRY_DEFAULT')),
+					'sl_country' => (int)$sl_country,
 					'countries' => $countries
 				));
 		}

From 59570a58ac3d9e6460626d65654fcdda89d2cc06 Mon Sep 17 00:00:00 2001
From: PrestaEdit <j.danse@prestaedit.com>
Date: Thu, 11 Apr 2013 12:40:26 +0300
Subject: [PATCH 09/67] [-] MO: homefeatured - numbers are now the same

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

diff --git a/modules/homefeatured/homefeatured.php b/modules/homefeatured/homefeatured.php
index bd68293cb..4567adfa1 100644
--- a/modules/homefeatured/homefeatured.php
+++ b/modules/homefeatured/homefeatured.php
@@ -80,7 +80,7 @@ class HomeFeatured extends Module
 				<label>'.$this->l('Define the number of products to be displayed.').'</label>
 				<div class="margin-form">
 					<input type="text" size="5" name="nbr" value="'.Tools::safeOutput(Tools::getValue('nbr', (int)(Configuration::get('HOME_FEATURED_NBR')))).'" />
-					<p class="clear">'.$this->l('Define the number of products that you would like to display on homepage (default: 10).').'</p>
+					<p class="clear">'.$this->l('Define the number of products that you would like to display on homepage (default: 8).').'</p>
 
 				</div>
 				<center><input type="submit" name="submitHomeFeatured" value="'.$this->l('Save').'" class="button" /></center>

From 4937f111d1cdc34d54dbec5ad99ccd675dee8e7b Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Thu, 11 Apr 2013 11:49:29 +0200
Subject: [PATCH 10/67] [-] Installer : Fix bug #PSCFV-8606 bad performance
 when updating messages

---
 .../upgrade/php/update_order_messages.php     | 56 +++++++------------
 1 file changed, 19 insertions(+), 37 deletions(-)

diff --git a/install-dev/upgrade/php/update_order_messages.php b/install-dev/upgrade/php/update_order_messages.php
index 357f2449f..cca1b1b7a 100644
--- a/install-dev/upgrade/php/update_order_messages.php
+++ b/install-dev/upgrade/php/update_order_messages.php
@@ -26,49 +26,31 @@
 
 function update_order_messages()
 {
-	$step = 3000;
-	$count_messages = Db::getInstance()->getValue('SELECT count(id_message) FROM '._DB_PREFIX_.'message');
-	$nb_loop = $start = 0;
-	if($count_messages > 0)
-		$nb_loop = ceil($count_messages / $step);
-	for($i = 0; $i < $nb_loop; $i++)
-	{
-		$sql = 'SELECT id_message, message FROM '._DB_PREFIX_.'message LIMIT '.(int)$start.', '.(int)$step;
-		if ($messages = Db::getInstance()->executeS($sql))
+	$sql = 'SELECT id_message, message FROM `'._DB_PREFIX_.'message` WHERE message REGEXP \'<br|&[^;]{1,8}\'';
+	if ($messages = Db::getInstance()->query($sql))
+		while ($message = Db::getInstance()->nextRow($messages))
 		{
-			if(is_array($messages))
-				foreach($messages as $message)
-				{
-					$sql = 'UPDATE '._DB_PREFIX_.'message SET message = \''.pSQL(Tools::htmlentitiesDecodeUTF8(br2nl($message['message']))).'\' 
-							WHERE id_message = '.(int)$message['id_message'];
-					$result = Db::getInstance()->execute($sql);
-				}
-			$start += ($step + 1);
+			if(is_array($message))
+			{
+				$sql = 'UPDATE `'._DB_PREFIX_.'message` SET message = \''.pSQL(Tools::htmlentitiesDecodeUTF8(br2nl($message['message']))).'\' 
+						WHERE id_message = '.(int)$message['id_message'];
+				$result = Db::getInstance()->execute($sql);
+			}
 		}
-	}
-
-	$count_messages = Db::getInstance()->getValue('SELECT count(id_customer_message) FROM '._DB_PREFIX_.'customer_message');
-	$nb_loop = $start = 0;
-	if($count_messages > 0)
-		$nb_loop = ceil($count_messages / $step);
-	for($i = 0; $i < $nb_loop; $i++)
-	{
-		$sql = 'SELECT id_customer_message, message FROM '._DB_PREFIX_.'customer_message LIMIT '.(int)$start.', '.(int)$step;
-		if ($messages = Db::getInstance()->executeS($sql))
+	$sql = 'SELECT id_customer_message, message FROM `'._DB_PREFIX_.'customer_message` WHERE message REGEXP \'<br|&[^;]{1,8}\'';
+	if ($messages = Db::getInstance()->query($sql))
+		while ($message = Db::getInstance()->nextRow($messages))
 		{
-			if(is_array($messages))
-				foreach($messages as $message)
-				{
-					$sql = 'UPDATE '._DB_PREFIX_.'customer_message SET message = \''.pSQL(Tools::htmlentitiesDecodeUTF8(str_replace('&amp;', '&', $message['message']))).'\' 
-							WHERE id_customer_message = '.(int)$message['id_customer_message'];
-					Db::getInstance()->execute($sql);
-				}
-			$start += ($step + 1);
+			if(is_array($message))
+			{				
+				$sql = 'UPDATE `'._DB_PREFIX_.'customer_message` SET message = \''.pSQL(Tools::htmlentitiesDecodeUTF8(str_replace('&amp;', '&', $message['message']))).'\' 
+						WHERE id_customer_message = '.(int)$message['id_customer_message'];
+				Db::getInstance()->execute($sql);
+			}
 		}
-	}
 }
 
 function br2nl($str)
 {
-	return preg_replace("/<br( \/)?>/i", "\n", $str);
+	return str_replace(array('<br>', '<br />', '<br/>'), "\n", $str);
 }
\ No newline at end of file

From 723a77e565231955afb88d7ced68d2b3e13bf8a9 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Thu, 11 Apr 2013 11:59:32 +0200
Subject: [PATCH 11/67] [-] BO : Deactivate backwardcompatibility module

---
 install-dev/upgrade/sql/1.5.4.1.sql | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/install-dev/upgrade/sql/1.5.4.1.sql b/install-dev/upgrade/sql/1.5.4.1.sql
index ea631f817..bafe06191 100644
--- a/install-dev/upgrade/sql/1.5.4.1.sql
+++ b/install-dev/upgrade/sql/1.5.4.1.sql
@@ -1,3 +1,7 @@
 SET NAMES 'utf8';
 
-ALTER TABLE  `PREFIX_carrier` CHANGE  `max_weight`  `max_weight` DECIMAL( 20, 6 ) NULL DEFAULT  '0';
\ No newline at end of file
+ALTER TABLE  `PREFIX_carrier` CHANGE  `max_weight`  `max_weight` DECIMAL( 20, 6 ) NULL DEFAULT  '0';
+
+DELETE ms.*, hm.* FROM `PREFIX_module_shop` ms INNER JOIN `PREFIX_hook_module` hm USING (`id_module`) INNER JOIN `PREFIX_module` m USING (`id_module`) WHERE m.`name` LIKE 'backwardcompatibility';
+
+UPDATE `PREFIX_module` SET `active` = 0 WHERE `name` LIKE 'backwardcompatibility';
\ No newline at end of file

From 63bcd22bc6095b6cc01412eb91f25ff40ad01a21 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Thu, 11 Apr 2013 12:00:31 +0200
Subject: [PATCH 12/67] [-] CORE : fixed bug #PSCFV-8475 - Email templates with
 {shop_url} append url with index.php

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

diff --git a/classes/Mail.php b/classes/Mail.php
index 2e4014abb..bc09523d1 100644
--- a/classes/Mail.php
+++ b/classes/Mail.php
@@ -251,7 +251,7 @@ class MailCore
 				$template_vars['{shop_logo}'] = $message->attach(new Swift_Message_EmbeddedFile(new Swift_File($logo), null, ImageManager::getMimeTypeByExtension($logo)));
 
 			$template_vars['{shop_name}'] = Tools::safeOutput(Configuration::get('PS_SHOP_NAME', null, null, $id_shop));
-			$template_vars['{shop_url}'] = Tools::getShopDomain(true, true).__PS_BASE_URI__.'index.php';
+			$template_vars['{shop_url}'] = Context::getContext()->link->getPageLink('index', true, Context::getContext()->language->id);
 			$template_vars['{my_account_url}'] = Context::getContext()->link->getPageLink('my-account', true, Context::getContext()->language->id);
 			$template_vars['{guest_tracking_url}'] = Context::getContext()->link->getPageLink('guest-tracking', true, Context::getContext()->language->id);
 			$template_vars['{history_url}'] = Context::getContext()->link->getPageLink('history', true, Context::getContext()->language->id);

From f4a5305678c85ce15fd478cd27e63d7514ccfb6c Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Thu, 11 Apr 2013 14:18:28 +0200
Subject: [PATCH 13/67] [-] INSTALLER : add counter loop in
 update_order_messages

---
 .../upgrade/php/update_order_messages.php     | 52 ++++++++++++-------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/install-dev/upgrade/php/update_order_messages.php b/install-dev/upgrade/php/update_order_messages.php
index cca1b1b7a..369b753d5 100644
--- a/install-dev/upgrade/php/update_order_messages.php
+++ b/install-dev/upgrade/php/update_order_messages.php
@@ -26,28 +26,42 @@
 
 function update_order_messages()
 {
-	$sql = 'SELECT id_message, message FROM `'._DB_PREFIX_.'message` WHERE message REGEXP \'<br|&[^;]{1,8}\'';
-	if ($messages = Db::getInstance()->query($sql))
-		while ($message = Db::getInstance()->nextRow($messages))
-		{
-			if(is_array($message))
+	$step = 3000;
+	$count_messages = Db::getInstance()->getValue('SELECT count(id_message) FROM '._DB_PREFIX_.'message');
+	$nb_loop = $start = 0;
+	if($count_messages > 0)
+		$nb_loop = ceil($count_messages / $step);
+	for($i = 0; $i < $nb_loop; $i++)
+	{
+		$sql = 'SELECT id_message, message FROM `'._DB_PREFIX_.'message` WHERE message REGEXP \'<br|&[^;]{1,8}\' LIMIT '.(int)$start.', '.(int)$step;
+		if ($messages = Db::getInstance()->query($sql))
+			while ($message = Db::getInstance()->nextRow($messages))
 			{
-				$sql = 'UPDATE `'._DB_PREFIX_.'message` SET message = \''.pSQL(Tools::htmlentitiesDecodeUTF8(br2nl($message['message']))).'\' 
-						WHERE id_message = '.(int)$message['id_message'];
-				$result = Db::getInstance()->execute($sql);
+				if(is_array($message))
+				{
+					$sql = 'UPDATE `'._DB_PREFIX_.'message` SET message = \''.pSQL(Tools::htmlentitiesDecodeUTF8(br2nl($message['message']))).'\' 
+							WHERE id_message = '.(int)$message['id_message'];
+					$result = Db::getInstance()->execute($sql);
+				}
 			}
-		}
-	$sql = 'SELECT id_customer_message, message FROM `'._DB_PREFIX_.'customer_message` WHERE message REGEXP \'<br|&[^;]{1,8}\'';
-	if ($messages = Db::getInstance()->query($sql))
-		while ($message = Db::getInstance()->nextRow($messages))
-		{
-			if(is_array($message))
-			{				
-				$sql = 'UPDATE `'._DB_PREFIX_.'customer_message` SET message = \''.pSQL(Tools::htmlentitiesDecodeUTF8(str_replace('&amp;', '&', $message['message']))).'\' 
-						WHERE id_customer_message = '.(int)$message['id_customer_message'];
-				Db::getInstance()->execute($sql);
+	}
+	$nb_loop = $start = 0;
+	if($count_messages > 0)
+		$nb_loop = ceil($count_messages / $step);
+	for($i = 0; $i < $nb_loop; $i++)
+	{
+		$sql = 'SELECT id_customer_message, message FROM `'._DB_PREFIX_.'customer_message` WHERE message REGEXP \'<br|&[^;]{1,8}\' LIMIT '.(int)$start.', '.(int)$step;
+		if ($messages = Db::getInstance()->query($sql))
+			while ($message = Db::getInstance()->nextRow($messages))
+			{
+				if(is_array($message))
+				{				
+					$sql = 'UPDATE `'._DB_PREFIX_.'customer_message` SET message = \''.pSQL(Tools::htmlentitiesDecodeUTF8(str_replace('&amp;', '&', $message['message']))).'\' 
+							WHERE id_customer_message = '.(int)$message['id_customer_message'];
+					Db::getInstance()->execute($sql);
+				}
 			}
-		}
+	}
 }
 
 function br2nl($str)

From 3ffb2c8c568fb0e3c5c8b60bdfb5cb104a538f57 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Thu, 11 Apr 2013 15:05:03 +0200
Subject: [PATCH 14/67] //small chnage in table creation of linkstopmenu

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

diff --git a/modules/blocktopmenu/blocktopmenu.php b/modules/blocktopmenu/blocktopmenu.php
index 25f34e570..d0214ad26 100644
--- a/modules/blocktopmenu/blocktopmenu.php
+++ b/modules/blocktopmenu/blocktopmenu.php
@@ -89,15 +89,15 @@ class Blocktopmenu extends Module
 		return (Db::getInstance()->execute('
 		CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'linksmenutop` (
 			`id_linksmenutop` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			`id_shop` INT UNSIGNED NOT NULL,
+			`id_shop` INT(11) UNSIGNED NOT NULL,
 			`new_window` TINYINT( 1 ) NOT NULL,
 			INDEX (`id_shop`)
 		) ENGINE = '._MYSQL_ENGINE_.' CHARACTER SET utf8 COLLATE utf8_general_ci;') &&
 			Db::getInstance()->execute('
 			 CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'linksmenutop_lang` (
 			`id_linksmenutop` INT NOT NULL,
-			`id_lang` INT NOT NULL,
-			`id_shop` INT NOT NULL,
+			`id_lang` INT(11) NOT NULL,
+			`id_shop` INT(11) NOT NULL,
 			`label` VARCHAR( 128 ) NOT NULL ,
 			`link` VARCHAR( 128 ) NOT NULL ,
 			INDEX ( `id_linksmenutop` , `id_lang`, `id_shop`)

From 8bdcaa2c2d42a8f15c9604d9759faac9e1e619d5 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Thu, 11 Apr 2013 15:52:07 +0200
Subject: [PATCH 15/67] Merge pull request #65 from Ha99y:mobile-them-HR-fix2

---
 themes/default/mobile/authentication-choice.tpl |  2 +-
 themes/default/mobile/best-sales.tpl            |  2 +-
 themes/default/mobile/category.tpl              |  4 ++--
 themes/default/mobile/contact-form.tpl          | 17 ++++++++++++++---
 themes/default/mobile/header.tpl                |  2 +-
 themes/default/mobile/manufacturer.tpl          |  2 +-
 themes/default/mobile/new-products.tpl          |  2 +-
 themes/default/mobile/order-detail.tpl          |  6 +++---
 themes/default/mobile/pages-list.tpl            |  2 +-
 themes/default/mobile/prices-drop.tpl           |  2 +-
 themes/default/mobile/product-attributes.tpl    |  2 +-
 themes/default/mobile/product-desc-features.tpl |  2 +-
 themes/default/mobile/product.tpl               |  8 ++++----
 themes/default/mobile/search.tpl                |  2 +-
 themes/default/mobile/sitemap.tpl               |  4 ++--
 themes/default/mobile/supplier.tpl              |  2 +-
 16 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/themes/default/mobile/authentication-choice.tpl b/themes/default/mobile/authentication-choice.tpl
index 4bbfb00bc..7d8346a4d 100644
--- a/themes/default/mobile/authentication-choice.tpl
+++ b/themes/default/mobile/authentication-choice.tpl
@@ -13,7 +13,7 @@
 		</div>
 	</form>
 
-	<hr width="99%" align="center" size="2" class=""/>
+	<hr/>
 
 	<form action="{$link->getPageLink('authentication', true)}" method="post" class="login_form">
 		<h2>{l s='Already registered?'}</h2>
diff --git a/themes/default/mobile/best-sales.tpl b/themes/default/mobile/best-sales.tpl
index d8dba671c..438676a91 100644
--- a/themes/default/mobile/best-sales.tpl
+++ b/themes/default/mobile/best-sales.tpl
@@ -46,7 +46,7 @@
 			<div class="clearfix">
 				{include file="./category-product-sort.tpl" container_class="container-sort"}
 			</div>
-			<hr width="99%" align="center" size="2"/>
+			<hr/>
 			{include file="./pagination.tpl"}
 			{include file="./category-product-list.tpl" products=$products}
 			{include file="./pagination.tpl"}
diff --git a/themes/default/mobile/category.tpl b/themes/default/mobile/category.tpl
index 2b86926c4..90dc09310 100644
--- a/themes/default/mobile/category.tpl
+++ b/themes/default/mobile/category.tpl
@@ -45,13 +45,13 @@
 					<p>{$category->description}</p>
 				{/if}
 			</div>
-			<hr width="99%" align="center" size="2" class="margin_less"/>
+			<hr class="margin_less"/>
 		{/if}
 		<div class="clearfix">
 			{include file="./category-product-sort.tpl" container_class="container-sort"}
 			<p class="nbr_result">{include file="$tpl_dir./category-count.tpl"}</p>
 		</div>
-		<hr width="99%" align="center" size="2" class="margin_less"/>
+		<hr class="margin_less"/>
 		
 		{include file="./pagination.tpl"}
 		{include file="./category-product-list.tpl" products=$products}
diff --git a/themes/default/mobile/contact-form.tpl b/themes/default/mobile/contact-form.tpl
index 14b6cc043..6c435356a 100644
--- a/themes/default/mobile/contact-form.tpl
+++ b/themes/default/mobile/contact-form.tpl
@@ -44,7 +44,7 @@
 					<option value="{$contact.id_contact|intval}" {if isset($smarty.post.id_contact) && $smarty.post.id_contact == $contact.id_contact}selected="selected"{/if}>{$contact.name|escape:'htmlall':'UTF-8'}</option>
 				{/foreach}
 				</select>
-			</p>
+
 			<p id="desc_contact0" class="desc_contact">&nbsp;</p>
 				{foreach from=$contacts item=contact}
 					<p id="desc_contact{$contact.id_contact|intval}" class="desc_contact" style="display:none;">
@@ -65,7 +65,11 @@
 				{if (!isset($customerThread.id_order) || $customerThread.id_order > 0)}
 				<fieldset>
 					{if !isset($customerThread.id_order) && isset($isLogged) && $isLogged == 1}
-						<select name="id_order" ><option value="0">-- {l s='Order ID'} --</option>{$orderList}</select>
+						<select name="id_order" ><option value="0">-- {l s='Order ID'} --</option>
+						{foreach from=$orderList item=order}
+							<option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'htmlall':'UTF-8'}</option>
+						{/foreach}
+						</select>
 					{elseif !isset($customerThread.id_order) && !isset($isLogged)}
 						<input type="text" placeholder="{l s='Order ID'}" name="id_order" id="id_order" value="{if isset($customerThread.id_order) && $customerThread.id_order > 0}{$customerThread.id_order|intval}{else}{if isset($smarty.post.id_order)}{$smarty.post.id_order|intval}{/if}{/if}" />
 					{elseif $customerThread.id_order > 0}
@@ -75,8 +79,15 @@
 				{/if}
 				{if isset($isLogged) && $isLogged}
 				<fieldset>
+
 					{if !isset($customerThread.id_product)}
-						<select name="id_product" style="width:300px;"><option value="0">-- {l s='Product'} --</option>{$orderedProductList}</select>
+						{foreach from=$orderedProductList key=id_order item=products name=products}
+							<select name="id_product"><option value="0">-- {l s='Product'} --</option>
+								{foreach from=$products item=product}
+									<option value="{$product.value|intval}">{$product.label|escape:'htmlall':'UTF-8'}</option>
+								{/foreach}
+							</select>
+						{/foreach}
 					{elseif $customerThread.id_product > 0}
 						<input type="text" name="id_product" id="id_product" value="{$customerThread.id_product|intval}" readonly="readonly" />
 					{/if}
diff --git a/themes/default/mobile/header.tpl b/themes/default/mobile/header.tpl
index 973b3582c..34752abba 100644
--- a/themes/default/mobile/header.tpl
+++ b/themes/default/mobile/header.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 <!DOCTYPE html>
-<html>
+<html lang="{$lang_iso}">
 	<head>
 		<title>{$meta_title|escape:'htmlall':'UTF-8'}</title>
 		{*<meta name="viewport" content="width=device-width, initial-scale=1">*}
diff --git a/themes/default/mobile/manufacturer.tpl b/themes/default/mobile/manufacturer.tpl
index 3143b61a5..5233a48ed 100644
--- a/themes/default/mobile/manufacturer.tpl
+++ b/themes/default/mobile/manufacturer.tpl
@@ -48,7 +48,7 @@
 			<div class="clearfix">
 				{include file="./category-product-sort.tpl" container_class="container-sort"}
 			</div>
-			<hr width="99%" align="center" size="2"/>
+			<hr/>
 			{include file="./pagination.tpl"}
 			{include file="./category-product-list.tpl" products=$products}
 			{include file="./pagination.tpl"}
diff --git a/themes/default/mobile/new-products.tpl b/themes/default/mobile/new-products.tpl
index 81b9aaa9c..4d5950126 100644
--- a/themes/default/mobile/new-products.tpl
+++ b/themes/default/mobile/new-products.tpl
@@ -31,7 +31,7 @@
 		<div class="clearfix">
 			{include file="./category-product-sort.tpl" container_class="container-sort"}
 		</div>
-		<hr width="99%" align="center" size="2"/>
+		<hr/>
 		{include file="./pagination.tpl"}
 		{include file="./category-product-list.tpl" products=$products}
 		{include file="./pagination.tpl"}
diff --git a/themes/default/mobile/order-detail.tpl b/themes/default/mobile/order-detail.tpl
index c341b7461..558854be4 100644
--- a/themes/default/mobile/order-detail.tpl
+++ b/themes/default/mobile/order-detail.tpl
@@ -117,7 +117,7 @@
 		{elseif $field_item eq "phone_mobile" && $address_invoice->phone_mobile}<p class="address_phone_mobile">{$address_invoice->phone_mobile|escape:'htmlall':'UTF-8'}</p>
 		{else}
 				{assign var=address_words value=" "|explode:$field_item}
-				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item}">{$invoiceAddressFormatedValues[$word_item]|escape:'htmlall':'UTF-8'}</span>{/foreach}</p>
+				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$invoiceAddressFormatedValues[$word_item|replace:',':'']|escape:'htmlall':'UTF-8'}</span>{/foreach}</p>
 		{/if}
 	{/foreach}
 	</li>
@@ -130,7 +130,7 @@
 		{elseif $field_item eq "phone_mobile" && $address_delivery->phone_mobile}<p class="address_phone_mobile">{$address_delivery->phone_mobile|escape:'htmlall':'UTF-8'}</p>
 		{else}
 				{assign var=address_words value=" "|explode:$field_item} 
-				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item}">{$deliveryAddressFormatedValues[$word_item]|escape:'htmlall':'UTF-8'}</span>{/foreach}</p>
+				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$deliveryAddressFormatedValues[$word_item|replace:',':'']|escape:'htmlall':'UTF-8'}</span>{/foreach}</p>
 		{/if}
 	{/foreach}
 	</li>
@@ -174,7 +174,7 @@
 	{if $priceDisplay && $use_tax}
 		<li data-theme="b" class="item">
 			{l s='Total products (tax excl.)'} <span class="price">{displayWtPriceWithCurrency price=$order->getTotalProductsWithoutTaxes() currency=$currency}</span>
-		</tr>
+		</li>
 	{/if}
 	<li data-theme="b" class="item">
 		{l s='Total products'} {if $use_tax}{l s='(tax incl.)'}{/if}: <span class="price">{displayWtPriceWithCurrency price=$order->getTotalProductsWithTaxes() currency=$currency}</span>
diff --git a/themes/default/mobile/pages-list.tpl b/themes/default/mobile/pages-list.tpl
index 3f6148c5a..8513b4714 100644
--- a/themes/default/mobile/pages-list.tpl
+++ b/themes/default/mobile/pages-list.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-		<hr width="99%" align="center" size="2" class=""/>
+		<hr/>
 		<h2 class="site_map">{l s='Sitemap'}</h2>
 		<ul data-role="listview" data-inset="true" id="category">
 			{if $controller_name != 'index'}<li><a href="{$link->getPageLink('index', true)}" data-ajax="false">Accueil</a></li>{/if}
diff --git a/themes/default/mobile/prices-drop.tpl b/themes/default/mobile/prices-drop.tpl
index 0404bea93..e331a6054 100644
--- a/themes/default/mobile/prices-drop.tpl
+++ b/themes/default/mobile/prices-drop.tpl
@@ -31,7 +31,7 @@
 		<div class="clearfix">
 			{include file="./category-product-sort.tpl" container_class="container-sort"}
 		</div>
-		<hr width="99%" align="center" size="2"/>
+		<hr/>
 		{include file="./pagination.tpl"}
 		{include file="./category-product-list.tpl" products=$products}
 		{include file="./pagination.tpl"}
diff --git a/themes/default/mobile/product-attributes.tpl b/themes/default/mobile/product-attributes.tpl
index 1f45f4929..ec6672b0c 100644
--- a/themes/default/mobile/product-attributes.tpl
+++ b/themes/default/mobile/product-attributes.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 {if isset($groups)}
-<hr width="99%" align="center" size="2" class="margin_less"/>
+<hr class="margin_less"/>
 
 <div id="attributes">
 {foreach from=$groups key=id_attribute_group item=group}
diff --git a/themes/default/mobile/product-desc-features.tpl b/themes/default/mobile/product-desc-features.tpl
index f81f3fd88..8692a9a3d 100644
--- a/themes/default/mobile/product-desc-features.tpl
+++ b/themes/default/mobile/product-desc-features.tpl
@@ -5,7 +5,7 @@
 		{if isset($product) && $product->description}
 		<div data-role="collapsible" data-theme="a" data-content-theme="a">
 			<h3>{l s='More info'}</h3>
-			<p>{$product->description}</p>
+			<div>{$product->description}</div>
 		</div>
 		{/if}
 		
diff --git a/themes/default/mobile/product.tpl b/themes/default/mobile/product.tpl
index 1e22cd482..e9b88fd95 100644
--- a/themes/default/mobile/product.tpl
+++ b/themes/default/mobile/product.tpl
@@ -119,10 +119,10 @@
 		</div><!-- .clearfix -->
 		
 		{if $product->show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
-			<hr width="99%" align="center" size="2" class="margin_less"/>
+			<hr class="margin_less"/>
 			{include file="./product-prices.tpl"}
 		{else}
-			<hr width="99%" align="center" size="2" class="margin_bottom"/>
+			<hr class="margin_bottom"/>
 		{/if}
 		<div id="displayMobileAddToCartTop">
 			{hook h="displayMobileAddToCartTop"}
@@ -147,13 +147,13 @@
 	{include file="./product-quantity-discount.tpl"}
 	{* ================================== *}
 	
-	<hr width="99%" align="center" size="2" class=""/>
+	<hr/>
 	<!-- description and features -->
 	{include file="./product-desc-features.tpl"}
 	
 	{if isset($packItems) && $packItems|@count > 0}
 	<!-- pack list -->
-	<hr width="99%" align="center" size="2" class="margin_less"/>
+	<hr class="margin_less"/>
 	<div id="blockpack">
 		<h2>{l s='Pack content'}</h2>
 		{include file="./category-product-list.tpl" products=$packItems}
diff --git a/themes/default/mobile/search.tpl b/themes/default/mobile/search.tpl
index 61ba394e0..f46bffa03 100644
--- a/themes/default/mobile/search.tpl
+++ b/themes/default/mobile/search.tpl
@@ -42,7 +42,7 @@
 		</div>
 		{/if}
 		
-		<hr width="99%" align="center" size="2"/>
+		<hr/>
 		{if !isset($instantSearch) || (isset($instantSearch) && !$instantSearch)}
 			{include file="./pagination.tpl"}
 		{/if}
diff --git a/themes/default/mobile/sitemap.tpl b/themes/default/mobile/sitemap.tpl
index 1b816ab10..7b0f17401 100644
--- a/themes/default/mobile/sitemap.tpl
+++ b/themes/default/mobile/sitemap.tpl
@@ -25,7 +25,7 @@
 <div id="hook_mobile_top_site_map">
 {hook h="displayMobileTopSiteMap"}
 </div>
-<hr width="99%" align="center" size="2" class=""/>
+<hr/>
 {if isset($categoriesTree.children)}
 	<h2>{l s='Our offers'}</h2>
 
@@ -54,7 +54,7 @@
 	</ul>
 {/if}
 
-<hr width="99%" align="center" size="2" class=""/>
+<hr/>
 <h2>{l s='Sitemap'}</h2>
 <ul data-role="listview" data-inset="true" id="category">
 	{if $controller_name != 'index'}<li><a href="{$link->getPageLink('index', true)}">{l s='Home'}</a></li>{/if}
diff --git a/themes/default/mobile/supplier.tpl b/themes/default/mobile/supplier.tpl
index 60a22525c..1526f58c0 100644
--- a/themes/default/mobile/supplier.tpl
+++ b/themes/default/mobile/supplier.tpl
@@ -47,7 +47,7 @@
 		<div class="clearfix">
 			{include file="./category-product-sort.tpl" container_class="container-sort"}
 		</div>
-		<hr width="99%" align="center" size="2"/>
+		<hr/>
 		{include file="./pagination.tpl"}
 		{include file="./category-product-list.tpl" products=$products}
 		{include file="./pagination.tpl"}

From 467a6f45fded1f58a6a07d346875fd09575eae3d Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Thu, 11 Apr 2013 15:59:23 +0200
Subject: [PATCH 16/67] //small change in table creation of linkstopmenu again

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

diff --git a/modules/blocktopmenu/blocktopmenu.php b/modules/blocktopmenu/blocktopmenu.php
index d0214ad26..8ead2c49c 100644
--- a/modules/blocktopmenu/blocktopmenu.php
+++ b/modules/blocktopmenu/blocktopmenu.php
@@ -95,9 +95,9 @@ class Blocktopmenu extends Module
 		) ENGINE = '._MYSQL_ENGINE_.' CHARACTER SET utf8 COLLATE utf8_general_ci;') &&
 			Db::getInstance()->execute('
 			 CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'linksmenutop_lang` (
-			`id_linksmenutop` INT NOT NULL,
-			`id_lang` INT(11) NOT NULL,
-			`id_shop` INT(11) NOT NULL,
+			`id_linksmenutop` INT(11) UNSIGNED NOT NULL,
+			`id_lang` INT(11) UNSIGNED NOT NULL,
+			`id_shop` INT(11) UNSIGNED NOT NULL,
 			`label` VARCHAR( 128 ) NOT NULL ,
 			`link` VARCHAR( 128 ) NOT NULL ,
 			INDEX ( `id_linksmenutop` , `id_lang`, `id_shop`)

From 2b575e0c9625cec69ba771c260b1a5d92df8aa11 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Thu, 11 Apr 2013 16:31:43 +0200
Subject: [PATCH 17/67] //removed commented code

---
 themes/default/modules/blocknewsletter/blocknewsletter.tpl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/themes/default/modules/blocknewsletter/blocknewsletter.tpl b/themes/default/modules/blocknewsletter/blocknewsletter.tpl
index 1a353a62e..b1fc6ca97 100644
--- a/themes/default/modules/blocknewsletter/blocknewsletter.tpl
+++ b/themes/default/modules/blocknewsletter/blocknewsletter.tpl
@@ -38,10 +38,6 @@
 					onfocus="javascript:if(this.value=='{l s='your e-mail' mod='blocknewsletter' js=1}')this.value='';" 
 					onblur="javascript:if(this.value=='')this.value='{l s='your e-mail' mod='blocknewsletter' js=1}';" 
 					class="inputNew" />
-				<!--<select name="action">
-					<option value="0"{if isset($action) && $action == 0} selected="selected"{/if}>{l s='Subscribe' mod='blocknewsletter'}</option>
-					<option value="1"{if isset($action) && $action == 1} selected="selected"{/if}>{l s='Unsubscribe' mod='blocknewsletter'}</option>
-				</select>-->
 					<input type="submit" value="ok" class="button_mini" name="submitNewsletter" />
 				<input type="hidden" name="action" value="0" />
 			</p>

From 80707393478f403a18cd0d9126a8bff188174b7a Mon Sep 17 00:00:00 2001
From: PrestaEdit <j.danse@prestaedit.com>
Date: Thu, 11 Apr 2013 18:18:15 +0300
Subject: [PATCH 18/67] [-] Remove /

---
 config/defines_uri.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/defines_uri.inc.php b/config/defines_uri.inc.php
index fa72550ad..34cbae33b 100644
--- a/config/defines_uri.inc.php
+++ b/config/defines_uri.inc.php
@@ -71,7 +71,7 @@ define('_THEME_LANG_DIR_',			_PS_IMG_.'l/');
 define('_THEME_COL_DIR_', 			_PS_IMG_.'co/');
 define('_THEME_GENDERS_DIR_',		_PS_IMG_.'genders/');
 define('_SUPP_DIR_',      			_PS_IMG_.'su/');
-define('_PS_PROD_IMG_', 			_PS_IMG_.'/p/');
+define('_PS_PROD_IMG_', 			_PS_IMG_.'p/');
 
 /* Other URLs */
 define('_PS_JS_DIR_',               __PS_BASE_URI__.'js/');

From 6d869cc804e03d5e9079921cd77a20fd7837f899 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Thu, 11 Apr 2013 17:34:15 +0200
Subject: [PATCH 19/67] [-] FO : Fix bug #PSCFV-8589 do not loose max level
 depth when upgrading

---
 install-dev/upgrade/php/block_category_1521.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install-dev/upgrade/php/block_category_1521.php b/install-dev/upgrade/php/block_category_1521.php
index fe7c6825b..c6b1846f7 100644
--- a/install-dev/upgrade/php/block_category_1521.php
+++ b/install-dev/upgrade/php/block_category_1521.php
@@ -26,11 +26,11 @@
 
 function block_category_1521()
 {
-	if (!Db::getInstance()->ExecuteS('SELECT `'._DB_PREFIX_.'configuration` WHERE `name`=\'BLOCK_CATEG_MAX_DEPTH\' '))
+	if (!Db::getInstance()->getValue('SELECT FROM `'._DB_PREFIX_.'configuration` WHERE `name` LIKE \'BLOCK_CATEG_MAX_DEPTH\' '))
 		Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'configuration` 
 			(`id_configuration` ,`id_shop_group` ,`id_shop` ,`name` ,`value` ,`date_add` ,`date_upd`)
-			VALUES (NULL, NULL, NULL, \'BLOCK_CATEG_MAX_DEPTH\', 2, NOW(), NOW())');
-	else if (Db::getInstance()->ExecuteS('SELECT `'._DB_PREFIX_.'configuration` WHERE and `value` IS NOT NULL AND `value` <> 0'))
-		Db::getInstance()->Execute('UPDATE  `'._DB_PREFIX_.'configuration` SET `value` = 2 WHERE `name`=\'BLOCK_CATEG_MAX_DEPTH\' ');
+			VALUES (NULL, NULL, NULL, \'BLOCK_CATEG_MAX_DEPTH\', 4, NOW(), NOW())');
+	else if ($maxdepth = (int)Db::getInstance()->getValue('SELECT FROM `'._DB_PREFIX_.'configuration` WHERE `value` IS NOT NULL AND `value` <> 0'))
+		Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'configuration` SET `value` = '.($maxdepth + 1).' WHERE `name` LIKE\'BLOCK_CATEG_MAX_DEPTH\'');
 
 }
\ No newline at end of file

From 0786cf617f2e0604bc0ed9e91ab70cf206462133 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Thu, 11 Apr 2013 17:51:28 +0200
Subject: [PATCH 20/67] //change the default color (#db3484)

---
 modules/blocknewsletter/mails/en/newsletter_voucher.html  | 4 ++--
 modules/blockwishlist/mails/en/wishlink.html              | 4 ++--
 modules/blockwishlist/mails/en/wishlist.html              | 4 ++--
 modules/followup/mails/en/followup_1.html                 | 6 +++---
 modules/followup/mails/en/followup_2.html                 | 6 +++---
 modules/followup/mails/en/followup_3.html                 | 6 +++---
 modules/followup/mails/en/followup_4.html                 | 6 +++---
 modules/mailalerts/mailalerts.php                         | 8 ++++----
 modules/mailalerts/mails/en/customer_qty.html             | 4 ++--
 modules/mailalerts/mails/en/productcoverage.html          | 6 +++---
 modules/mailalerts/mails/en/productoutofstock.html        | 6 +++---
 .../mails/en/referralprogram-congratulations.html         | 4 ++--
 .../mails/en/referralprogram-invitation.html              | 6 +++---
 .../referralprogram/mails/en/referralprogram-voucher.html | 6 +++---
 modules/sendtoafriend/mails/en/send_to_a_friend.html      | 6 +++---
 15 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/modules/blocknewsletter/mails/en/newsletter_voucher.html b/modules/blocknewsletter/mails/en/newsletter_voucher.html
index 1dc23f065..12b2b6513 100644
--- a/modules/blocknewsletter/mails/en/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/en/newsletter_voucher.html
@@ -20,7 +20,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Newsletter subscription</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Newsletter subscription</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -32,7 +32,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/modules/blockwishlist/mails/en/wishlink.html b/modules/blockwishlist/mails/en/wishlink.html
index 6089277f2..d82bfb660 100644
--- a/modules/blockwishlist/mails/en/wishlink.html
+++ b/modules/blockwishlist/mails/en/wishlink.html
@@ -20,7 +20,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Message from {shop_name}</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Message from {shop_name}</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -32,7 +32,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> realised with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> realised with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/modules/blockwishlist/mails/en/wishlist.html b/modules/blockwishlist/mails/en/wishlist.html
index 1deb338c9..6678d8224 100644
--- a/modules/blockwishlist/mails/en/wishlist.html
+++ b/modules/blockwishlist/mails/en/wishlist.html
@@ -20,7 +20,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Message from {shop_name}</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Message from {shop_name}</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -32,7 +32,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> Powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> Powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/modules/followup/mails/en/followup_1.html b/modules/followup/mails/en/followup_1.html
index b49fce7bf..d6518515b 100644
--- a/modules/followup/mails/en/followup_1.html
+++ b/modules/followup/mails/en/followup_1.html
@@ -14,13 +14,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi <strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
+<td align="left">Hi <strong style="color: {color};">{firstname} {lastname}</strong>,</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your cart at {shop_name}</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your cart at {shop_name}</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -38,7 +38,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/modules/followup/mails/en/followup_2.html b/modules/followup/mails/en/followup_2.html
index 8047b701b..963414077 100644
--- a/modules/followup/mails/en/followup_2.html
+++ b/modules/followup/mails/en/followup_2.html
@@ -14,13 +14,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi <strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
+<td align="left">Hi <strong style="color: {color};">{firstname} {lastname}</strong>,</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Thank you for your order at {shop_name}</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Thank you for your order at {shop_name}</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -38,7 +38,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/modules/followup/mails/en/followup_3.html b/modules/followup/mails/en/followup_3.html
index 7b0a818cc..f6d033240 100644
--- a/modules/followup/mails/en/followup_3.html
+++ b/modules/followup/mails/en/followup_3.html
@@ -14,13 +14,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi <strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
+<td align="left">Hi <strong style="color: {color};">{firstname} {lastname}</strong>,</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Thanks for your trust</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Thanks for your trust</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -38,7 +38,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/modules/followup/mails/en/followup_4.html b/modules/followup/mails/en/followup_4.html
index ac793ea83..ff59cd920 100644
--- a/modules/followup/mails/en/followup_4.html
+++ b/modules/followup/mails/en/followup_4.html
@@ -14,13 +14,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi <strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
+<td align="left">Hi <strong style="color: {color};">{firstname} {lastname}</strong>,</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your cart at {shop_name}</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your cart at {shop_name}</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -38,7 +38,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/modules/mailalerts/mailalerts.php b/modules/mailalerts/mailalerts.php
index 4d8e0c105..20add47cc 100644
--- a/modules/mailalerts/mailalerts.php
+++ b/modules/mailalerts/mailalerts.php
@@ -339,11 +339,11 @@ class MailAlerts extends Module
 			'{delivery_block_txt}' => MailAlert::getFormatedAddress($delivery, "\n"),
 			'{invoice_block_txt}' => MailAlert::getFormatedAddress($invoice, "\n"),
 			'{delivery_block_html}' => MailAlert::getFormatedAddress($delivery, '<br />', array(
-			'firstname' => '<span style="color:#DB3484; font-weight:bold;">%s</span>',
-			'lastname' => '<span style="color:#DB3484; font-weight:bold;">%s</span>')),
+			'firstname' => '<span style="color:'.Configuration::get('PS_MAIL_COLOR').'; font-weight:bold;">%s</span>',
+			'lastname' => '<span style="color:'.Configuration::get('PS_MAIL_COLOR').'; font-weight:bold;">%s</span>')),
 			'{invoice_block_html}' => MailAlert::getFormatedAddress($invoice, '<br />', array(
-			'firstname' => '<span style="color:#DB3484; font-weight:bold;">%s</span>',
-			'lastname' => '<span style="color:#DB3484; font-weight:bold;">%s</span>')),
+			'firstname' => '<span style="color:'.Configuration::get('PS_MAIL_COLOR').' font-weight:bold;">%s</span>',
+			'lastname' => '<span style="color:'.Configuration::get('PS_MAIL_COLOR').'; font-weight:bold;">%s</span>')),
 			'{delivery_company}' => $delivery->company,
 			'{delivery_firstname}' => $delivery->firstname,
 			'{delivery_lastname}' => $delivery->lastname,
diff --git a/modules/mailalerts/mails/en/customer_qty.html b/modules/mailalerts/mails/en/customer_qty.html
index e73641fcc..d2f03253b 100644
--- a/modules/mailalerts/mails/en/customer_qty.html
+++ b/modules/mailalerts/mails/en/customer_qty.html
@@ -14,7 +14,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">{product} is now available.</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">{product} is now available.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -26,7 +26,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/modules/mailalerts/mails/en/productcoverage.html b/modules/mailalerts/mails/en/productcoverage.html
index 328d9077e..1d709047c 100644
--- a/modules/mailalerts/mails/en/productcoverage.html
+++ b/modules/mailalerts/mails/en/productcoverage.html
@@ -14,19 +14,19 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">{product} is almost out of stock.</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">{product} is almost out of stock.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">The stock cover is now less than the specified minimum of <strong>{warning_coverage}</strong>.<br /><br /> <strong>Current stock cover: <span style="color: #db3484;">{current_coverage}</span></strong><br /><br /></td>
+<td align="left">The stock cover is now less than the specified minimum of <strong>{warning_coverage}</strong>.<br /><br /> <strong>Current stock cover: <span style="color: {color};">{current_coverage}</span></strong><br /><br /></td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/modules/mailalerts/mails/en/productoutofstock.html b/modules/mailalerts/mails/en/productoutofstock.html
index 10858effd..73d26bee3 100644
--- a/modules/mailalerts/mails/en/productoutofstock.html
+++ b/modules/mailalerts/mails/en/productoutofstock.html
@@ -14,19 +14,19 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">{product} is nearly out of stock.</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">{product} is nearly out of stock.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">The remaining stock is now less than the specified minimum of <strong>{last_qty}</strong>.<br /><br /> <strong>Remaining stock: <span style="color: #db3484;">{qty}</span></strong><br /><br /> You are advised to open the product&#039;s admin Product Page in order to replenish your inventory.</td>
+<td align="left">The remaining stock is now less than the specified minimum of <strong>{last_qty}</strong>.<br /><br /> <strong>Remaining stock: <span style="color: {color};">{qty}</span></strong><br /><br /> You are advised to open the product&#039;s admin Product Page in order to replenish your inventory.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/modules/referralprogram/mails/en/referralprogram-congratulations.html b/modules/referralprogram/mails/en/referralprogram-congratulations.html
index 89f865423..70c65c205 100644
--- a/modules/referralprogram/mails/en/referralprogram-congratulations.html
+++ b/modules/referralprogram/mails/en/referralprogram-congratulations.html
@@ -20,7 +20,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your referred friend, <strong>{sponsored_firstname} {sponsored_lastname}</strong> has placed his or her first order on <a style="color: #fff; font-size: 12px; font-weight: bold;" href="{shop_url}">{shop_name}</a>!</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your referred friend, <strong>{sponsored_firstname} {sponsored_lastname}</strong> has placed his or her first order on <a style="color: #fff; font-size: 12px; font-weight: bold;" href="{shop_url}">{shop_name}</a>!</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -38,7 +38,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/modules/referralprogram/mails/en/referralprogram-invitation.html b/modules/referralprogram/mails/en/referralprogram-invitation.html
index 7d413cef7..667344a64 100644
--- a/modules/referralprogram/mails/en/referralprogram-invitation.html
+++ b/modules/referralprogram/mails/en/referralprogram-invitation.html
@@ -14,13 +14,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left"><strong style="color: #db3484;">{firstname_friend} {lastname_friend}, join us!</strong></td>
+<td align="left"><strong style="color: {color};">{firstname_friend} {lastname_friend}, join us!</strong></td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your friend <strong>{firstname} {lastname}</strong> wants to refer you on <a style="color: #fff; font-size: 12px; font-weight: bold;" href="{shop_url}">{shop_name}</a>!</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your friend <strong>{firstname} {lastname}</strong> wants to refer you on <a style="color: #fff; font-size: 12px; font-weight: bold;" href="{shop_url}">{shop_name}</a>!</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -50,7 +50,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/modules/referralprogram/mails/en/referralprogram-voucher.html b/modules/referralprogram/mails/en/referralprogram-voucher.html
index 35022e89f..499e189f7 100644
--- a/modules/referralprogram/mails/en/referralprogram-voucher.html
+++ b/modules/referralprogram/mails/en/referralprogram-voucher.html
@@ -14,13 +14,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi <strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
+<td align="left">Hi <strong style="color: {color};">{firstname} {lastname}</strong>,</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Referral Program</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Referral Program</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -38,7 +38,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/modules/sendtoafriend/mails/en/send_to_a_friend.html b/modules/sendtoafriend/mails/en/send_to_a_friend.html
index c30593d5e..c14aa128e 100644
--- a/modules/sendtoafriend/mails/en/send_to_a_friend.html
+++ b/modules/sendtoafriend/mails/en/send_to_a_friend.html
@@ -14,13 +14,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi <strong style="color: #db3484;">{name}</strong>,</td>
+<td align="left">Hi <strong style="color: {color};">{name}</strong>,</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">{customer} has sent you a link to a product that (s)he thinks may interest you.</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">{customer} has sent you a link to a product that (s)he thinks may interest you.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
@@ -32,7 +32,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
 </table>

From 8d06ff3044a1a075264f6aa2478bd88e935b1e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Thu, 11 Apr 2013 18:09:35 +0200
Subject: [PATCH 21/67] [-] FO: Fix #PSCFV-8722 displayed specific prices on
 product page was sometimes wrong

---
 classes/Product.php          |  4 +++
 themes/default/js/product.js | 64 +++++++++++++++++++-----------------
 themes/default/product.tpl   |  7 ++--
 3 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/classes/Product.php b/classes/Product.php
index bbe6fd920..379adb6dd 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -458,6 +458,10 @@ class ProductCore extends ObjectModel
 			$this->tax_rate = $this->getTaxesRate(new Address($address));
 
 			$this->new = $this->isNew();
+
+			// keep base price
+			$this->base_price = $this->price;
+
 			$this->price = Product::getPriceStatic((int)$this->id, false, null, 6, null, false, true, 1, false, null, null, null, $this->specificPrice);
 			$this->unit_price = ($this->unit_price_ratio != 0  ? $this->price / $this->unit_price_ratio : 0);
 			if ($this->id)
diff --git a/themes/default/js/product.js b/themes/default/js/product.js
index e97e7446c..92b68d8c8 100644
--- a/themes/default/js/product.js
+++ b/themes/default/js/product.js
@@ -295,17 +295,27 @@ function updateDisplay()
 		var priceTaxExclWithoutGroupReduction = '';
 
 		// retrieve price without group_reduction in order to compute the group reduction after
-		// the specific price discount (done in the JS in order to keep backward compatibility)
-		if (!displayPrice && !noTaxForThisProduct)
-		{
-			priceTaxExclWithoutGroupReduction = ps_round(productPriceTaxExcluded, 6) * (1 / group_reduction);
-		} else {
-			priceTaxExclWithoutGroupReduction = ps_round(productPriceTaxExcluded, 6) * (1 / group_reduction);
-		}
-		var combination_add_price = selectedCombination['price'] * group_reduction;
+		// the specific price discount (done in the JS in order to keep backward compatibility)		priceTaxExclWithoutGroupReduction = ps_round(productPriceTaxExcluded, 6) * (1 / group_reduction);
 
 		var tax = (taxRate / 100) + 1;
+		var taxExclPrice = priceTaxExclWithoutGroupReduction + (selectedCombination['price'] * currencyRate);
+		
+		if (selectedCombination.specific_price && selectedCombination.specific_price['id_product_attribute'])
+		{
+			if (selectedCombination.specific_price['price'] && selectedCombination.specific_price['price'] >=0)
+				var taxExclPrice = (specific_currency ? selectedCombination.specific_price['price'] : selectedCombination.specific_price['price'] * currencyRate);
+			else
+				var taxExclPrice = productBasePriceTaxExcluded * currencyRate + (selectedCombination['price'] * currencyRate);
+		}
+		else if (product_specific_price.price && product_specific_price.price >= 0)
+			var taxExclPrice = (specific_currency ? product_specific_price.price : product_specific_price.price * currencyRate) + (selectedCombination['price'] * currencyRate);
 
+		if (!displayPrice && !noTaxForThisProduct)
+			productPriceDisplay = taxExclPrice * tax; // Need to be global => no var
+		else
+			productPriceDisplay = ps_round(taxExclPrice, 2); // Need to be global => no var
+
+		productPriceWithoutReductionDisplay = productPriceDisplay * group_reduction;
 		var reduction = 0;
 		if (selectedCombination['specific_price'].reduction_price || selectedCombination['specific_price'].reduction_percent)
 		{
@@ -313,18 +323,26 @@ function updateDisplay()
 			reduction = productPriceDisplay * (parseFloat(selectedCombination['specific_price'].reduction_percent) / 100) + reduction_price;
 			if (reduction_price && (displayPrice || noTaxForThisProduct))
 				reduction = ps_round(reduction / tax, 6);
+
 		}
-		else if (product_specific_price.reduction_price || product_specific_price.reduction_percent)
+		else if (product_specific_price && product_specific_price.reduction)
 		{
-			reduction_price = (specific_currency ? product_specific_price.reduction_price : product_specific_price.reduction_price * currencyRate);
-			reduction = productPriceDisplay * (parseFloat(product_specific_price.reduction_percent) / 100) + reduction_price;
+			if (product_specific_price.reduction_type == 'amount')
+				reduction_price = (specific_currency ? product_specific_price.reduction : product_specific_price.reduction * currencyRate);
+			else
+				reduction_price = 0;
+
+			if (product_specific_price.reduction_type == 'percentage')
+				reduction_percent = productPriceDisplay * parseFloat(product_specific_price.reduction);
+
+			reduction = reduction_price + reduction_percent;
 			if (reduction_price && (displayPrice || noTaxForThisProduct))
 				reduction = ps_round(reduction / tax, 6);
 		}
 
 		if (selectedCombination.specific_price)
 		{
-			if (selectedCombination['specific_price'].reduction_type == 'percentage')
+			if (selectedCombination['specific_price'] && selectedCombination['specific_price'].reduction_type == 'percentage')
 			{
 				$('#reduction_amount').hide();
 				$('#reduction_percent_display').html('-' + parseFloat(selectedCombination['specific_price'].reduction_percent) + '%');
@@ -338,36 +356,20 @@ function updateDisplay()
 				$('#reduction_amount').hide();
 			}
 		}
-		else
-			if (product_specific_price['reduction_type'] == 'percentage')
-				$('#reduction_percent_display').html(product_specific_price['specific_price'].reduction_percent);
 
 		if (product_specific_price['reduction_type'] != '' || selectedCombination['specific_price'].reduction_type != '')
 			$('#discount_reduced_price,#old_price').show();
 		else
 			$('#discount_reduced_price,#old_price').hide();
-		
-		if (product_specific_price['reduction_type'] == 'percentage' || selectedCombination['specific_price'].reduction_type == 'percentage')
+		if ((product_specific_price['reduction_type'] == 'percentage' && selectedCombination['specific_price'].reduction_type == 'percentage') || selectedCombination['specific_price'].reduction_type == 'percentage')
 			$('#reduction_percent').show();
 		else
 			$('#reduction_percent').hide();
-		if (product_specific_price['price'] || selectedCombination.specific_price['price'])
+		if (product_specific_price['price'] || (selectedCombination.specific_price && selectedCombination.specific_price['price']))
 			$('#not_impacted_by_discount').show();
 		else
 			$('#not_impacted_by_discount').hide();
 
-		if (selectedCombination.specific_price['price'] && selectedCombination.specific_price['price'] >=0)
-			var taxExclPrice = (specific_currency ? selectedCombination.specific_price['price'] : selectedCombination.specific_price['price'] * currencyRate);
-		else
-			var taxExclPrice = priceTaxExclWithoutGroupReduction + (selectedCombination['price'] * currencyRate);
-
-		if (!displayPrice && !noTaxForThisProduct)
-			productPriceDisplay = taxExclPrice * tax; // Need to be global => no var
-		else
-			productPriceDisplay = ps_round(taxExclPrice, 2); // Need to be global => no var
-
-		productPriceWithoutReductionDisplay = productPriceDisplay * group_reduction;
-
 		productPriceDisplay -= reduction;
 		var tmp = productPriceDisplay * group_reduction;
 		productPriceDisplay = ps_round(productPriceDisplay * group_reduction, 2);
@@ -719,4 +721,4 @@ function checkUrl()
 				window.location = url.substring(0, url.indexOf('#'));
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/themes/default/product.tpl b/themes/default/product.tpl
index b7695b1e7..388f57834 100644
--- a/themes/default/product.tpl
+++ b/themes/default/product.tpl
@@ -48,6 +48,8 @@ var allowBuyWhenOutOfStock = {if $allow_oosp == 1}true{else}false{/if};
 var availableNowValue = '{$product->available_now|escape:'quotes':'UTF-8'}';
 var availableLaterValue = '{$product->available_later|escape:'quotes':'UTF-8'}';
 var productPriceTaxExcluded = {$product->getPriceWithoutReduct(true)|default:'null'} - {$product->ecotax};
+var productBasePriceTaxExcluded = {$product->base_price} - {$product->ecotax};
+
 var reduction_percent = {if $product->specificPrice AND $product->specificPrice.reduction AND $product->specificPrice.reduction_type == 'percentage'}{$product->specificPrice.reduction*100}{else}0{/if};
 var reduction_price = {if $product->specificPrice AND $product->specificPrice.reduction AND $product->specificPrice.reduction_type == 'amount'}{$product->specificPrice.reduction|floatval}{else}0{/if};
 var specific_price = {if $product->specificPrice AND $product->specificPrice.price}{$product->specificPrice.price}{else}0{/if};
@@ -132,6 +134,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 		specific_price_combination['reduction_price'] = {if $combination.specific_price AND $combination.specific_price.reduction AND $combination.specific_price.reduction_type == 'amount'}{$combination.specific_price.reduction}{else}0{/if};
 		specific_price_combination['price'] = {if $combination.specific_price AND $combination.specific_price.price}{$combination.specific_price.price}{else}0{/if};
 		specific_price_combination['reduction_type'] = '{if $combination.specific_price}{$combination.specific_price.reduction_type}{/if}';
+		specific_price_combination['id_product_attribute'] = {if $combination.specific_price}{$combination.specific_price.id_product_attribute|intval}{else}0{/if};
 		available_date['date'] = '{$combination.available_date}';
 		available_date['date_formatted'] = '{dateFormat date=$combination.available_date full=false}';
 		addCombination({$idCombination|intval}, new Array({$combination.list}), {$combination.quantity}, {$combination.price}, {$combination.ecotax}, {$combination.id_image}, '{$combination.reference|addslashes}', {$combination.unit_impact}, {$combination.minimal_quantity}, available_date, specific_price_combination);
@@ -400,14 +403,14 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 				{/if}
 			</div>
 			<p id="reduction_percent" {if !$product->specificPrice OR $product->specificPrice.reduction_type != 'percentage'} style="display:none;"{/if}><span id="reduction_percent_display">{if $product->specificPrice AND $product->specificPrice.reduction_type == 'percentage'}-{$product->specificPrice.reduction*100}%{/if}</span></p>
-			<p id="reduction_amount" {if !$product->specificPrice OR $product->specificPrice.reduction_type != 'amount' && $product->specificPrice.reduction|intval ==0} style="display:none"{/if}>
+			<p id="reduction_amount" {if !$product->specificPrice OR $product->specificPrice.reduction_type != 'amount' || $product->specificPrice.reduction|intval ==0} style="display:none"{/if}>
 				<span id="reduction_amount_display">
 				{if $product->specificPrice AND $product->specificPrice.reduction_type == 'amount' AND $product->specificPrice.reduction|intval !=0}
 					-{convertPrice price=$productPriceWithoutReduction-$productPrice|floatval}
 				{/if}
 				</span>
 			</p>
-			{if $product->specificPrice AND $product->specificPrice.reduction}
+			{if $product->specificPrice AND $product->specificPrice.reduction && $product->specificPrice.reduction > 0}
 				<p id="old_price"><span class="bold">
 				{if $priceDisplay >= 0 && $priceDisplay <= 2}
 					{if $productPriceWithoutReduction > $productPrice}

From 30fd9ac6e0ff0dae8507d2e6b8c465ac3d464f31 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Thu, 11 Apr 2013 18:53:10 +0200
Subject: [PATCH 22/67] [-] CORE : Fix bug #PSCFV-5624 set order reference to
 CHAR(10)

---
 .../php/add_column_orders_reference_if_not_exists.php       | 2 +-
 install-dev/upgrade/sql/1.5.0.13.sql                        | 2 +-
 install-dev/upgrade/sql/1.5.4.1.sql                         | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/install-dev/upgrade/php/add_column_orders_reference_if_not_exists.php b/install-dev/upgrade/php/add_column_orders_reference_if_not_exists.php
index 5088f1ca7..3a5676e63 100644
--- a/install-dev/upgrade/php/add_column_orders_reference_if_not_exists.php
+++ b/install-dev/upgrade/php/add_column_orders_reference_if_not_exists.php
@@ -28,5 +28,5 @@ function add_column_orders_reference_if_not_exists()
 {
 	$column = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'orders` LIKE "reference"');
 	if (empty($column))
-		return Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'orders` ADD COLUMN `reference` varchar(9) AFTER `id_order`');
+		return Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'orders` ADD COLUMN `reference` varchar(10) AFTER `id_order`');
 }
diff --git a/install-dev/upgrade/sql/1.5.0.13.sql b/install-dev/upgrade/sql/1.5.0.13.sql
index 65121283c..c89ae965e 100644
--- a/install-dev/upgrade/sql/1.5.0.13.sql
+++ b/install-dev/upgrade/sql/1.5.0.13.sql
@@ -23,7 +23,7 @@ INSERT INTO `PREFIX_order_invoice_payment`
 
 -- Step 2: Add the collumn id_order_reference
 ALTER TABLE `PREFIX_order_payment`
-	ADD COLUMN `order_reference` VARCHAR(9)  AFTER `id_order`,
+	ADD COLUMN `order_reference` VARCHAR(10)  AFTER `id_order`,
 	ADD INDEX `order_reference`(`order_reference`);
 
 
diff --git a/install-dev/upgrade/sql/1.5.4.1.sql b/install-dev/upgrade/sql/1.5.4.1.sql
index bafe06191..4d6f37c0e 100644
--- a/install-dev/upgrade/sql/1.5.4.1.sql
+++ b/install-dev/upgrade/sql/1.5.4.1.sql
@@ -4,4 +4,8 @@ ALTER TABLE  `PREFIX_carrier` CHANGE  `max_weight`  `max_weight` DECIMAL( 20, 6
 
 DELETE ms.*, hm.* FROM `PREFIX_module_shop` ms INNER JOIN `PREFIX_hook_module` hm USING (`id_module`) INNER JOIN `PREFIX_module` m USING (`id_module`) WHERE m.`name` LIKE 'backwardcompatibility';
 
-UPDATE `PREFIX_module` SET `active` = 0 WHERE `name` LIKE 'backwardcompatibility';
\ No newline at end of file
+UPDATE `PREFIX_module` SET `active` = 0 WHERE `name` LIKE 'backwardcompatibility';
+
+ALTER TABLE `PREFIX_orders` CHANGE `reference` `reference` VARCHAR( 10 ) NULL DEFAULT NULL;
+
+ALTER TABLE `PREFIX_order_payment` CHANGE `order_reference` `order_reference` VARCHAR( 10 ) NULL DEFAULT NULL;
\ No newline at end of file

From f30749449f7e52a8b739a056b53639a6be480f5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Fri, 12 Apr 2013 10:49:30 +0200
Subject: [PATCH 23/67] // fix for commit
 3cbd8444d69eff328b378b858855de149ea4a2bd

---
 themes/default/js/product.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/themes/default/js/product.js b/themes/default/js/product.js
index 92b68d8c8..4c71eaef4 100644
--- a/themes/default/js/product.js
+++ b/themes/default/js/product.js
@@ -295,11 +295,12 @@ function updateDisplay()
 		var priceTaxExclWithoutGroupReduction = '';
 
 		// retrieve price without group_reduction in order to compute the group reduction after
-		// the specific price discount (done in the JS in order to keep backward compatibility)		priceTaxExclWithoutGroupReduction = ps_round(productPriceTaxExcluded, 6) * (1 / group_reduction);
+		// the specific price discount (done in the JS in order to keep backward compatibility)		
+		priceTaxExclWithoutGroupReduction = ps_round(productPriceTaxExcluded, 6) * (1 / group_reduction);
 
 		var tax = (taxRate / 100) + 1;
 		var taxExclPrice = priceTaxExclWithoutGroupReduction + (selectedCombination['price'] * currencyRate);
-		
+
 		if (selectedCombination.specific_price && selectedCombination.specific_price['id_product_attribute'])
 		{
 			if (selectedCombination.specific_price['price'] && selectedCombination.specific_price['price'] >=0)

From 4a1892843a1255246a628582c0c5c988dd9f86b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Fri, 12 Apr 2013 11:39:56 +0200
Subject: [PATCH 24/67] [-] BO: Fix #PSCFV-8730 display of selected dates on
 the backoffice listings header - thank to pitt phunsanit for the patch

---
 .../themes/default/template/helpers/list/list_header.tpl      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index 31df8a497..1a821e4f6 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -189,8 +189,8 @@
 												<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
 											</select>
 										{elseif $params.type == 'date' || $params.type == 'datetime'}
-											{l s='From'} <input type="text" class="filter datepicker" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($value.0)}$value.0{/if}"{if isset($params.width)} style="width:70px"{/if}/><br />
-											{l s='To'} <input type="text" class="filter datepicker" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($value.1)}$value.1{/if}"{if isset($params.width)} style="width:70px"{/if}/>
+											{l s='From'} <input type="text" class="filter datepicker" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($params.value.0)}{$params.value.0}{/if}"{if isset($params.width)} style="width:70px"{/if}/><br />
+											{l s='To'} <input type="text" class="filter datepicker" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($params.value.1)}{$params.value.1}{/if}"{if isset($params.width)} style="width:70px"{/if}/>
 										{elseif $params.type == 'select'}
 											{if isset($params.filter_key)}
 												<select onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}Filter_{$params.filter_key}" {if isset($params.width)} style="width:{$params.width}px"{/if}>

From a7d61c551ea83a020e8c857cafa87aa37b80eb9f Mon Sep 17 00:00:00 2001
From: sLorenzini <sarah.lorenzini@prestashop.com>
Date: Fri, 12 Apr 2013 11:45:23 +0200
Subject: [PATCH 25/67] [-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php
 ~~ remove inline css forcing a border to #large_scene_image

---
 admin-dev/themes/default/css/admin.css      | 6 +++++-
 controllers/admin/AdminScenesController.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css
index 5ff97f4e0..ea86b6c6b 100644
--- a/admin-dev/themes/default/css/admin.css
+++ b/admin-dev/themes/default/css/admin.css
@@ -664,4 +664,8 @@ ul.listForm li {padding-bottom:3px;}
 /******** CREATE AN ORDER **************/
 
 #carrier_form label{padding-top:0}
-#carrier_form input{margin-top:3px}
\ No newline at end of file
+#carrier_form input{margin-top:3px}
+
+/************** SCENE *****************/
+
+#large_scene_image{clear:both;border:1px solid transparent;}
\ No newline at end of file
diff --git a/controllers/admin/AdminScenesController.php b/controllers/admin/AdminScenesController.php
index 38d31e3e9..7f9ef8b91 100644
--- a/controllers/admin/AdminScenesController.php
+++ b/controllers/admin/AdminScenesController.php
@@ -206,7 +206,7 @@ class AdminScenesControllerCore extends AdminController
 			$this->addJqueryPlugin('autocomplete');
 			$this->addJqueryPlugin('imgareaselect');
 			$this->addJs(_PS_JS_DIR_.'admin-scene-cropping.js' );
-			$image_to_map_desc .= '<br /><img id="large_scene_image" style="clear:both;border:1px solid black;" alt="" src="'.
+			$image_to_map_desc .= '<br /><img id="large_scene_image" alt="" src="'.
 				_THEME_SCENE_DIR_.$obj->id.'-scene_default.jpg" /><br />';
 
 			$image_to_map_desc .= '

From 846d6c489df44afcdda2aec4d057a4ae3c1fa93d Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Fri, 12 Apr 2013 11:46:38 +0200
Subject: [PATCH 26/67] //small spellchecking

---
 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 a0d67a78b..6958ed9df 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -60,7 +60,7 @@ abstract class ModuleCore
 	/** @var int need_instance */
 	public $need_instance = 1;
 
-	/** @var string Admin tab correponding to the module */
+	/** @var string Admin tab corresponding to the module */
 	public $tab = null;
 
 	/** @var boolean Status */

From 7e3640e3b738c9494b1b48d3c670e641ddd3c6df Mon Sep 17 00:00:00 2001
From: sLorenzini <sarah.lorenzini@prestashop.com>
Date: Fri, 12 Apr 2013 11:50:52 +0200
Subject: [PATCH 27/67] [-] FO: fixed bug #PSCFV-3238 - compareController typo

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

diff --git a/controllers/front/CompareController.php b/controllers/front/CompareController.php
index 5317d6d75..410946a84 100644
--- a/controllers/front/CompareController.php
+++ b/controllers/front/CompareController.php
@@ -31,7 +31,7 @@ class CompareControllerCore extends FrontController
 	public function setMedia()
 	{
 		parent::setMedia();
-		$this->addCSS(_THEME_CSS_DIR_.'/comparator.css');
+		$this->addCSS(_THEME_CSS_DIR_.'comparator.css');
 
 		if (Configuration::get('PS_COMPARATOR_MAX_ITEM') > 0)
 			$this->addJS(_THEME_JS_DIR_.'products-comparison.js');

From 03262debd4d982be9f3464997585b3658046e699 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Fri, 12 Apr 2013 11:55:57 +0200
Subject: [PATCH 28/67] //Merge Pull request #319

---
 themes/default/header.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/default/header.tpl b/themes/default/header.tpl
index eb374968c..6dbd39d3e 100644
--- a/themes/default/header.tpl
+++ b/themes/default/header.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7 lt-ie6 " lang="{$lang_iso}"> <![endif]-->
+<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7 " lang="{$lang_iso}"> <![endif]-->
 <!--[if IE 7]><html class="no-js lt-ie9 lt-ie8 ie7" lang="{$lang_iso}"> <![endif]-->
 <!--[if IE 8]><html class="no-js lt-ie9 ie8" lang="{$lang_iso}"> <![endif]-->
 <!--[if gt IE 8]> <html class="no-js ie9" lang="{$lang_iso}"> <![endif]-->

From 5b48649242a113bbb395dd30fb18da2d5c2a3bcb Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Fri, 12 Apr 2013 12:03:16 +0200
Subject: [PATCH 29/67] [-] FO : Fix login cookie issues

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

diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 7c7d6b5ef..f5b8563b4 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -316,7 +316,7 @@ class AuthControllerCore extends FrontController
 				$this->context->cart->secure_key = $customer->secure_key;
 				$this->context->cart->save();
 				$this->context->cookie->id_cart = (int)$this->context->cart->id;
-				$this->context->cookie->update();
+				$this->context->cookie->write();
 				$this->context->cart->autosetProductAddress();
 
 				Hook::exec('actionAuthentication');

From b9ca25d3e652f6cfce7277dfe8f8bbb102372f7b Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Fri, 12 Apr 2013 12:34:37 +0200
Subject: [PATCH 30/67] [-] Fo : Fix undefined var in cart-summary when
 updating id_address_delivery

---
 themes/default/js/cart-summary.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/themes/default/js/cart-summary.js b/themes/default/js/cart-summary.js
index d8f941195..f4477fec2 100644
--- a/themes/default/js/cart-summary.js
+++ b/themes/default/js/cart-summary.js
@@ -201,8 +201,9 @@ function changeAddressDelivery(obj)
 
 function updateAddressId(id_product, id_product_attribute, old_id_address_delivery, id_address_delivery, line)
 {
+
 	if (typeof(line) == 'undefined' || line.length == 0)
-		line = $('#product_' + id_product + '_' + id_product_attribute + '_0_' + old_id_address_delivery + ', #product_' + id_product + '_' + id_product_attribute + '_nocustom_' + old_id_address_delivery);
+		line = $('#cart_summary tr[id^=product_' + id_product + '_' + id_product_attribute + '_0_], #cart_summary tr[id^=product_' + id_product + '_' + id_product_attribute + '_nocustom_]');
 
 	$('.product_customization_for_' + id_product + '_' + id_product_attribute + '_' + old_id_address_delivery).each(function(){
 		$(this).attr('id', $(this).attr('id').replace(/_\d+$/, '_' + id_address_delivery)).removeClass('product_customization_for_' + id_product + '_' + id_product_attribute + '_' + old_id_address_delivery + ' address_' + old_id_address_delivery).addClass('product_customization_for_' + id_product + '_' + id_product_attribute + '_' + id_address_delivery + ' address_' + id_address_delivery);

From 29a919c24fa554cd853ed0ed6121e7307e27f420 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Fri, 12 Apr 2013 16:45:54 +0200
Subject: [PATCH 31/67] [-] FO: Fix bug too much call of updateCartSummary when
 OPC and cart rule

---
 themes/default/js/order-opc.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/themes/default/js/order-opc.js b/themes/default/js/order-opc.js
index 53d1e8f46..c053b38c2 100644
--- a/themes/default/js/order-opc.js
+++ b/themes/default/js/order-opc.js
@@ -401,7 +401,6 @@ function updateNewAccountToAddressBlock()
 					$.each(json.summary.products, function() {
 						updateAddressId(this.id_product, this.id_product_attribute, '0', this.id_address_delivery);
 					});
-					updateCartSummary(json.summary);
 					updateAddressesDisplay(true);
 					updateCarrierList(json.carrier_data);
 					updateCarrierSelectionAndGift();

From 60a787e4cbf6bfffaa840a2f04980b36fbd6197e Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Fri, 12 Apr 2013 16:51:05 +0200
Subject: [PATCH 32/67] // small css fix

---
 themes/default/css/order-opc.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/themes/default/css/order-opc.css b/themes/default/css/order-opc.css
index 5209953f2..568ded610 100644
--- a/themes/default/css/order-opc.css
+++ b/themes/default/css/order-opc.css
@@ -87,4 +87,7 @@
 	float: right;
 	margin-right: 20px;
 	padding: 0;
+}
+#address_invoice_form {
+	padding: 0px;
 }
\ No newline at end of file

From d907e52a92e533522031d7cda4cd01fa21656e63 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Fri, 12 Apr 2013 17:17:23 +0200
Subject: [PATCH 33/67] // small css fix

---
 themes/default/css/global.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/themes/default/css/global.css b/themes/default/css/global.css
index 7a5115d58..804b0d47a 100644
--- a/themes/default/css/global.css
+++ b/themes/default/css/global.css
@@ -612,7 +612,6 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
 .idTabs {
 	list-style-type: none;
 	margin-top: 20px;
-	padding:0 5px;
 	border-bottom: 8px solid #f7b900
 }
 ul.idTabs li {

From 5d3f48354be67c6d5f62f78331e87f8ff03a22ce Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Fri, 12 Apr 2013 18:03:38 +0200
Subject: [PATCH 34/67] [-] FO : add cart rul when cart rul has several groups

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

diff --git a/classes/CartRule.php b/classes/CartRule.php
index cf0d55990..8faef8314 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -1110,7 +1110,7 @@ class CartRuleCore extends ObjectModel
 				FROM '._DB_PREFIX_.'customer_group cg
 				LEFT JOIN '._DB_PREFIX_.'cart_rule_group crg ON cg.id_group = crg.id_group
 				WHERE cr.id_cart_rule = crg.id_cart_rule
-				AND cg.id_customer = '.(int)$context->customer->id.'
+				AND cg.id_customer = '.(int)$context->customer->id.' LIMIT 1
 			)' : '').'
 		)
 		AND (

From 7fddcd3f389ffe6b3a1eabc0d65045330fe41afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Mon, 15 Apr 2013 11:17:17 +0200
Subject: [PATCH 35/67] [-] BO: Don't delete the directory of modules before
 upgrade them

---
 controllers/admin/AdminModulesController.php | 32 +++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index 091a51b8b..5ce5d6a59 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -600,25 +600,14 @@ class AdminModulesControllerCore extends AdminController
 				foreach ($modules as $name)
 				{
 					$full_report = null;
-					if ($key == 'update')
-					{
-						if (ConfigurationTest::test_dir('modules/'.$name, true, $full_report))
-							Tools::deleteDirectory('../modules/'.$name.'/');
-						else
-						{
-							$module = Module::getInstanceByName(urldecode($name));
-							$this->errors[] = $this->l(sprintf("Module %s can't be upgraded : ", $module->displayName)).$full_report;
-							continue;
-						}					
-					}
-
 					// If Addons module, download and unzip it before installing it
-					if (!file_exists('../modules/'.$name.'/'.$name.'.php'))
+					if (!file_exists('../modules/'.$name.'/'.$name.'.php') || $key == 'update')
 					{
 						$filesList = array(
 							array('type' => 'addonsNative', 'file' => Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST, 'loggedOnAddons' => 0),
 							array('type' => 'addonsBought', 'file' => Module::CACHE_FILE_CUSTOMER_MODULES_LIST, 'loggedOnAddons' => 1),
 						);
+
 						foreach ($filesList as $f)
 							if (file_exists(_PS_ROOT_DIR_.$f['file']))
 							{
@@ -628,12 +617,19 @@ class AdminModulesControllerCore extends AdminController
 								foreach ($xml->module as $modaddons)
 									if ($name == $modaddons->name && isset($modaddons->id) && ($this->logged_on_addons || $f['loggedOnAddons'] == 0))
 									{
+										$download_ok = false;
 										if ($f['loggedOnAddons'] == 0)
-											if (file_put_contents('../modules/'.$modaddons->name.'.zip', Tools::addonsRequest('module', array('id_module' => pSQL($modaddons->id)))))
-												$this->extractArchive('../modules/'.$modaddons->name.'.zip', false);
-										if ($f['loggedOnAddons'] == 1 && $this->logged_on_addons)
-											if (file_put_contents('../modules/'.$modaddons->name.'.zip', Tools::addonsRequest('module', array('id_module' => pSQL($modaddons->id), 'username_addons' => pSQL(trim($this->context->cookie->username_addons)), 'password_addons' => pSQL(trim($this->context->cookie->password_addons))))))
-												$this->extractArchive('../modules/'.$modaddons->name.'.zip', false);
+											if (file_put_contents(_PS_MODULE_DIR_.$modaddons->name.'.zip', Tools::addonsRequest('module', array('id_module' => pSQL($modaddons->id)))))
+												$download_ok = true;
+										elseif ($f['loggedOnAddons'] == 1 && $this->logged_on_addons)
+											if (file_put_contents(_PS_MODULE_DIR_.$modaddons->name.'.zip', Tools::addonsRequest('module', array('id_module' => pSQL($modaddons->id), 'username_addons' => pSQL(trim($this->context->cookie->username_addons)), 'password_addons' => pSQL(trim($this->context->cookie->password_addons))))))
+												$download_ok = true;
+
+										if (!$download_ok)
+											$this->errors[] = $this->l('Error on downloading the lastest version');
+										else
+											if(!$this->extractArchive(_PS_MODULE_DIR_.$modaddons->name.'.zip', false))
+												$this->errors[] = $this->l(sprintf("Module %s can't be upgraded: ", $module->displayName));
 									}
 							}
 					}

From 22b506dd418fc66adb780affa39e41774ac25b10 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Mon, 15 Apr 2013 11:48:27 +0200
Subject: [PATCH 36/67] [-] FO : Fix bug #PSCFV-8623 : Cart rule without code
 is applied automatically

---
 classes/CartRule.php                          | 12 +++----
 modules/blockcart/blockcart.tpl               |  7 ++--
 .../default/modules/blockcart/blockcart.tpl   | 33 +++++++++----------
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/classes/CartRule.php b/classes/CartRule.php
index 8faef8314..a583962f0 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -1079,12 +1079,12 @@ class CartRuleCore extends ObjectModel
 		if (!CartRule::isFeatureActive() || !Validate::isLoadedObject($context->cart))
 			return;
 
-		$result = Db::getInstance()->executeS('
+		$sql = '
 		SELECT cr.*
 		FROM '._DB_PREFIX_.'cart_rule cr
 		LEFT JOIN '._DB_PREFIX_.'cart_rule_shop crs ON cr.id_cart_rule = crs.id_cart_rule
 		LEFT JOIN '._DB_PREFIX_.'cart_rule_carrier crca ON cr.id_cart_rule = crca.id_cart_rule
-		'.($context->cart->id_carrier ? 'INNER JOIN '._DB_PREFIX_.'carrier c ON (c.id_reference = crca.id_carrier AND c.deleted = 0)' : '').'		
+		'.($context->cart->id_carrier ? 'LEFT JOIN '._DB_PREFIX_.'carrier c ON (c.id_reference = crca.id_carrier AND c.deleted = 0)' : '').'		
 		LEFT JOIN '._DB_PREFIX_.'cart_rule_country crco ON cr.id_cart_rule = crco.id_cart_rule
 		WHERE cr.active = 1
 		AND cr.code = ""
@@ -1108,9 +1108,9 @@ class CartRuleCore extends ObjectModel
 			'.($context->customer->id ? 'OR 0 < (
 				SELECT cg.id_group
 				FROM '._DB_PREFIX_.'customer_group cg
-				LEFT JOIN '._DB_PREFIX_.'cart_rule_group crg ON cg.id_group = crg.id_group
+				LEFT JOIN '._DB_PREFIX_.'cart_rule_group crg ON (cg.id_group = crg.id_group AND cg.id_group = '.(int)$context->customer->id_default_group.')
 				WHERE cr.id_cart_rule = crg.id_cart_rule
-				AND cg.id_customer = '.(int)$context->customer->id.' LIMIT 1
+				AND cg.id_customer = '.(int)$context->customer->id.' LMIT 1
 			)' : '').'
 		)
 		AND (
@@ -1122,8 +1122,8 @@ class CartRuleCore extends ObjectModel
 			)
 		)
 		AND cr.id_cart_rule NOT IN (SELECT id_cart_rule	FROM '._DB_PREFIX_.'cart_cart_rule WHERE id_cart = '.(int)$context->cart->id.')
-		ORDER BY priority');
-		
+		ORDER BY priority';
+		$result = Db::getInstance()->executeS($sql);
 		if ($result)
 		{
 			$cart_rules = ObjectModel::hydrateCollection('CartRule', $result);
diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl
index 45a74566a..051bcf39e 100644
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -116,8 +116,7 @@ var delete_txt = '{l s='Delete' mod='blockcart' js=1}';
 		</dl>
 	{/if}
 		<p {if $products}class="hidden"{/if} id="cart_block_no_products">{l s='No products' mod='blockcart'}</p>
-	{if $discounts|@count > 0}
-		<table id="vouchers">
+		<table id="vouchers"{if $discounts|@count == 0} style="display:none;"{/if}>
 			<tbody>
 					{foreach from=$discounts item=discount}
 						{if $discount.value_real > 0}
@@ -132,11 +131,9 @@ var delete_txt = '{l s='Delete' mod='blockcart' js=1}';
 							</td>
 						</tr>
 						{/if}
-					{/foreach}
+					{/foreach}					
 			</tbody>
 		</table>
-		{/if}
-		
 		<p id="cart-prices">
 			<span id="cart_block_shipping_cost" class="price ajax_cart_shipping_cost">{$shipping_cost}</span>
 			<span>{l s='Shipping' mod='blockcart'}</span>
diff --git a/themes/default/modules/blockcart/blockcart.tpl b/themes/default/modules/blockcart/blockcart.tpl
index 15b222a77..287510b41 100644
--- a/themes/default/modules/blockcart/blockcart.tpl
+++ b/themes/default/modules/blockcart/blockcart.tpl
@@ -116,27 +116,24 @@ var delete_txt = '{l s='Delete' mod='blockcart' js=1}';
 		</dl>
 	{/if}
 		<p class="cart_block_no_products{if $products} hidden{/if}" id="cart_block_no_products">{l s='No products' mod='blockcart'}</p>
-	{if $discounts|@count > 0}
-		<table id="vouchers">
+		<table id="vouchers"{if $discounts|@count == 0} style="display:none;"{/if}>
 			<tbody>
-					{foreach from=$discounts item=discount}
-						{if $discount.value_real > 0}
-						<tr class="bloc_cart_voucher" id="bloc_cart_voucher_{$discount.id_discount}">
-							<td class="quantity">1x</td>
-							<td class="name" title="{$discount.description}">{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|escape:'htmlall':'UTF-8'}</td>
-							<td class="price">-{if $priceDisplay == 1}{convertPrice price=$discount.value_tax_exc}{else}{convertPrice price=$discount.value_real}{/if}</td>
-							<td class="delete">
-								{if strlen($discount.code)}
-									<a class="delete_voucher" href="{$link->getPageLink('$order_process', true)}?deleteDiscount={$discount.id_discount}" title="{l s='Delete' mod='blockcart'}" rel="nofollow"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete' mod='blockcart'}" class="icon" /></a>
-								{/if}
-							</td>
-						</tr>
+{foreach from=$discounts item=discount}
+{if $discount.value_real > 0}
+				<tr class="bloc_cart_voucher" id="bloc_cart_voucher_{$discount.id_discount}">
+					<td class="quantity">1x</td>
+					<td class="name" title="{$discount.description}">{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|escape:'htmlall':'UTF-8'}</td>
+					<td class="price">-{if $priceDisplay == 1}{convertPrice price=$discount.value_tax_exc}{else}{convertPrice price=$discount.value_real}{/if}</td>
+					<td class="delete">
+						{if strlen($discount.code)}
+							<a class="delete_voucher" href="{$link->getPageLink('$order_process', true)}?deleteDiscount={$discount.id_discount}" title="{l s='Delete' mod='blockcart'}" rel="nofollow"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete' mod='blockcart'}" class="icon" /></a>
 						{/if}
-					{/foreach}
+					</td>
+				</tr>
+{/if}
+{/foreach}
 			</tbody>
-		</table>
-		{/if}
-		
+		</table>		
 		<p id="cart-prices">
 			<span id="cart_block_shipping_cost" class="price ajax_cart_shipping_cost">{$shipping_cost}</span>
 			<span>{l s='Shipping' mod='blockcart'}</span>

From dc2e2d0adfd474b30dc219961f8e4b387b41ea42 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Mon, 15 Apr 2013 12:10:27 +0200
Subject: [PATCH 37/67] // remove sql parse error

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

diff --git a/classes/CartRule.php b/classes/CartRule.php
index a583962f0..228f15607 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -1110,7 +1110,7 @@ class CartRuleCore extends ObjectModel
 				FROM '._DB_PREFIX_.'customer_group cg
 				LEFT JOIN '._DB_PREFIX_.'cart_rule_group crg ON (cg.id_group = crg.id_group AND cg.id_group = '.(int)$context->customer->id_default_group.')
 				WHERE cr.id_cart_rule = crg.id_cart_rule
-				AND cg.id_customer = '.(int)$context->customer->id.' LMIT 1
+				AND cg.id_customer = '.(int)$context->customer->id.' LIMIT 1
 			)' : '').'
 		)
 		AND (

From 1bfe494e05e35c2352b7d529edfb7976297ee87b Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Mon, 15 Apr 2013 13:42:57 +0200
Subject: [PATCH 38/67] [-] Installer : do not select activity if not defined

---
 install-dev/theme/views/configure.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-dev/theme/views/configure.phtml b/install-dev/theme/views/configure.phtml
index ff9b6f95c..c67b110e7 100644
--- a/install-dev/theme/views/configure.phtml
+++ b/install-dev/theme/views/configure.phtml
@@ -26,7 +26,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 			<select id="infosActivity" name="shop_activity" class="chosen">
 				<option value="0" style="font-weight: bold" <?php if (!$this->session->shop_activity): ?>selected="selected"<?php endif; ?>><?php echo $this->l('Please choose your main activity') ?></option>
 				<?php foreach ($this->list_activities as $i => $activity): ?>
-					<option value="<?php echo $i ?>" <?php if ($this->session->shop_activity == $i): ?>selected="selected"<?php endif; ?>><?php echo $activity ?></option>
+					<option value="<?php echo $i ?>" <?php if (isset($this->session->shop_activity) && $this->session->shop_activity == $i): ?>selected="selected"<?php endif; ?>><?php echo $activity ?></option>
 				<?php endforeach; ?>
 				<option value="0"><?php echo $this->l('Other activity...') ?></option>
 			</select>

From eafaf2de03a4cac1cf9b9078f67488ab7536540a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Mon, 15 Apr 2013 14:33:20 +0200
Subject: [PATCH 39/67] // small changes in installer

---
 install-dev/classes/datas.php              |   2 +-
 install-dev/controllers/http/configure.php |  43 +-
 install-dev/models/install.php             |   1 -
 modules/gsitemap/config.xml                |  12 -
 modules/gsitemap/gsitemap-cron.php         |  19 -
 modules/gsitemap/gsitemap.php              | 460 ---------------------
 modules/gsitemap/index.php                 |  35 --
 modules/gsitemap/logo.gif                  | Bin 378 -> 0 bytes
 modules/gsitemap/logo.png                  | Bin 2337 -> 0 bytes
 modules/gsitemap/translations/index.php    |  35 --
 10 files changed, 23 insertions(+), 584 deletions(-)
 delete mode 100755 modules/gsitemap/config.xml
 delete mode 100755 modules/gsitemap/gsitemap-cron.php
 delete mode 100644 modules/gsitemap/gsitemap.php
 delete mode 100644 modules/gsitemap/index.php
 delete mode 100644 modules/gsitemap/logo.gif
 delete mode 100755 modules/gsitemap/logo.png
 delete mode 100644 modules/gsitemap/translations/index.php

diff --git a/install-dev/classes/datas.php b/install-dev/classes/datas.php
index b6156fe9c..964d737cf 100644
--- a/install-dev/classes/datas.php
+++ b/install-dev/classes/datas.php
@@ -95,7 +95,7 @@ class Datas
 		),
 		'shop_activity'	=> array(
 			'name' => 'activity',
-			'default' => 1,
+			'default' => 0,
 			'validate' => 'isInt',
 		),
 		'shop_country' => array(
diff --git a/install-dev/controllers/http/configure.php b/install-dev/controllers/http/configure.php
index ce237f7a9..1b35a3a9f 100644
--- a/install-dev/controllers/http/configure.php
+++ b/install-dev/controllers/http/configure.php
@@ -227,28 +227,29 @@ class InstallControllerHttpConfigure extends InstallControllerHttp
 	{
 		// List of activities
 		$list_activities = array(
-			$this->l('Lingerie and Adult'),
-			$this->l('Animals and Pets'),
-			$this->l('Art and Culture'),
-			$this->l('Babies'),
-			$this->l('Beauty and Personal Care'),
-			$this->l('Cars'),
-			$this->l('Computer Hardware and Software'),
-			$this->l('Download'),
-			$this->l('Fashion and accessories'),
-			$this->l('Flowers, Gifts and Crafts'),
-			$this->l('Food and beverage'),
-			$this->l('HiFi, Photo and Video'),
-			$this->l('Home and Garden'),
-			$this->l('Home Appliances'),
-			$this->l('Jewelry'),
-			$this->l('Mobile and Telecom'),
-			$this->l('Services'),
-			$this->l('Shoes and accessories'),
-			$this->l('Sports and Entertainment'),
-			$this->l('Travel'),
+			1 => $this->l('Lingerie and Adult'),
+			2 => $this->l('Animals and Pets'),
+			3 => $this->l('Art and Culture'),
+			4 => $this->l('Babies'),
+			5 => $this->l('Beauty and Personal Care'),
+			6 => $this->l('Cars'),
+			7 => $this->l('Computer Hardware and Software'),
+			8 => $this->l('Download'),
+			9 => $this->l('Fashion and accessories'),
+			10 => $this->l('Flowers, Gifts and Crafts'),
+			11 => $this->l('Food and beverage'),
+			12 => $this->l('HiFi, Photo and Video'),
+			13 => $this->l('Home and Garden'),
+			14 => $this->l('Home Appliances'),
+			15 => $this->l('Jewelry'),
+			16 => $this->l('Mobile and Telecom'),
+			17 => $this->l('Services'),
+			18 => $this->l('Shoes and accessories'),
+			19 => $this->l('Sports and Entertainment'),
+			20 => $this->l('Travel'),
 		);
-		sort($list_activities);
+
+		asort($list_activities);
 		$this->list_activities = $list_activities;
 
 		// Countries list
diff --git a/install-dev/models/install.php b/install-dev/models/install.php
index f450ddc40..2780f23de 100644
--- a/install-dev/models/install.php
+++ b/install-dev/models/install.php
@@ -557,7 +557,6 @@ class InstallModelInstall extends InstallAbstractModel
 				'graphvisifire',
 				'graphxmlswfcharts',
 				'gridhtml',
-				'gsitemap',
 				'homefeatured',
 				'homeslider',
 				'pagesnotfound',
diff --git a/modules/gsitemap/config.xml b/modules/gsitemap/config.xml
deleted file mode 100755
index 8cb6e8b39..000000000
--- a/modules/gsitemap/config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-        <module>
-            <name>gsitemap</name>
-            <displayName><![CDATA[Google sitemap]]></displayName>
-            <version><![CDATA[1.9]]></version>
-            <description><![CDATA[Generate your Google sitemap file.]]></description>
-            <author><![CDATA[PrestaShop]]></author>
-            <tab><![CDATA[seo]]></tab>
-            <is_configurable>1</is_configurable>
-            <need_instance>0</need_instance>
-	<limited_countries></limited_countries>
-        </module>
\ No newline at end of file
diff --git a/modules/gsitemap/gsitemap-cron.php b/modules/gsitemap/gsitemap-cron.php
deleted file mode 100755
index e8ae96de2..000000000
--- a/modules/gsitemap/gsitemap-cron.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-include(dirname(__FILE__).'/../../config/config.inc.php');
-include(dirname(__FILE__).'/gsitemap.php');
-
-if (substr(Tools::encrypt('gsitemap/cron'), 0, 10) != Tools::getValue('token') || !Module::isInstalled('gsitemap'))
-	die('Bad token');
-
-$gsitemap = new Gsitemap();
-
-if (!defined('_PS_BASE_URL_'))
-	define('_PS_BASE_URL_', Tools::getShopDomain(true));
-if (!defined('_PS_BASE_URL_SSL_'))
-	define('_PS_BASE_URL_SSL_', Tools::getShopDomainSsl(true));
-
-$context = Context::getContext();
-$context->link = new Link();
-
-echo $gsitemap->generateSitemapIndex();
\ No newline at end of file
diff --git a/modules/gsitemap/gsitemap.php b/modules/gsitemap/gsitemap.php
deleted file mode 100644
index c0a747e31..000000000
--- a/modules/gsitemap/gsitemap.php
+++ /dev/null
@@ -1,460 +0,0 @@
-<?php
-/*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-if (!defined('_PS_VERSION_'))
-	exit;
-
-class Gsitemap extends Module
-{
-	private $_html = '';
-	private $_postErrors = array();
-
-	public function __construct()
-	{
-		$this->name = 'gsitemap';
-		$this->tab = 'seo';
-		$this->version = '1.9';
-		$this->author = 'PrestaShop';
-		$this->need_instance = 0;
-
-		parent::__construct();
-
-		$this->displayName = $this->l('Google sitemap');
-		$this->description = $this->l('Generate your Google sitemap file.');
-
-		if (!defined('GSITEMAP_FILE'))
-			define('GSITEMAP_FILE', dirname(__FILE__).'/../../sitemap.xml');
-	}
-
-	public function uninstall()
-	{
-		file_put_contents(GSITEMAP_FILE, '');
-		return parent::uninstall();
-	}
-
-	private function _postValidation()
-	{
-		file_put_contents(GSITEMAP_FILE, '');
-		if (!($fp = fopen(GSITEMAP_FILE, 'w')))
-			$this->_postErrors[] = sprintf($this->l('Cannot create %ssitemap.xml file..'), realpath(dirname(__FILE__.'/../..')).'/');
-		else
-			fclose($fp);
-	}
-
-	private function getUrlWith($url, $key, $value)
-	{
-		if (empty($value))
-			return $url;
-		if (strpos($url, '?') !== false)
-			return $url.'&'.$key.'='.$value;
-		return $url.'?'.$key.'='.$value;
-	}
-
-	private function _postProcess()
-	{
-		Configuration::updateValue('GSITEMAP_ALL_CMS', (int)Tools::getValue('GSITEMAP_ALL_CMS'));
-		Configuration::updateValue('GSITEMAP_ALL_PRODUCTS', (int)Tools::getValue('GSITEMAP_ALL_PRODUCTS'));
-
-		if (Shop::isFeatureActive())
-			$res = $this->generateSitemapIndex();
-		else
-			$res = $this->generateSitemap(Configuration::get('PS_SHOP_DEFAULT'), GSITEMAP_FILE);
-
-		$this->_html .= '<h3 class="'. ($res ? 'conf confirm' : 'alert error') .'" style="margin-bottom: 20px">';
-		$this->_html .= $res ? $this->l('Sitemap file generated.') : $this->l('Error while creating sitemap file.');
-		$this->_html .= '</h3>';
-	}
-
-	/**
-	 * Generate sitemap index to reference the sitemap of each shop
-	 *
-	 * @return bool
-	 */
-	public function generateSitemapIndex()
-	{
-		$xmlString = <<<XML
-<?xml version="1.0" encoding="UTF-8" ?>
-<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
-</sitemapindex>
-XML;
-		$xml = new SimpleXMLElement($xmlString);
-
-		$sql = 'SELECT s.id_shop, su.domain, su.domain_ssl, CONCAT(su.physical_uri, su.virtual_uri) as uri
-				FROM '._DB_PREFIX_.'shop s
-				INNER JOIN '._DB_PREFIX_.'shop_url su ON s.id_shop = su.id_shop AND su.main = 1
-				WHERE s.active = 1
-					AND s.deleted = 0
-					AND su.active = 1';
-		if (!$result = Db::getInstance()->executeS($sql))
-			return false;
-
-		$res = true;
-		foreach ($result as $row)
-		{
-			$info = pathinfo(GSITEMAP_FILE);
-			$filename = $info['filename'].'-'.$row['id_shop'].'.'.$info['extension'];
-
-			$replaceUrl = array('http://'.$row['domain'].$row['uri'], ((Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://').$row['domain_ssl'].$row['uri']);
-
-			$last = $this->generateSitemap($row['id_shop'], $info['dirname'].'/'.$filename, $replaceUrl);
-			if ($last)
-			{
-				$this->_addSitemapIndexNode($xml, 'http://'.$row['domain'].(($row['uri']) ? $row['uri'] : '/').$filename, date('Y-m-d'));
-			}
-			$res &= $last;
-		}
-
-		$fp = fopen(GSITEMAP_FILE, 'w');
-		fwrite($fp, $xml->asXML());
-		fclose($fp);
-
-		return $res && file_exists(GSITEMAP_FILE);
-	}
-
-	/**
-	 * Generate a sitemap for a shop
-	 *
-	 * @param int $id_shop
-	 * @param string $filename
-	 * @return bool
-	 */
-	private function generateSitemap($id_shop, $filename = '', $replace_url = array())
-	{
-		$langs = Language::getLanguages();
-		$shop = new Shop($id_shop);
-		if (!$shop->id)
-			return false;
-
-		$xmlString = <<<XML
-<?xml version="1.0" encoding="UTF-8" ?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
-</urlset>
-XML;
-
-		$xml = new SimpleXMLElement($xmlString);
-
-		if (Configuration::get('PS_REWRITING_SETTINGS') && count($langs) > 1)
-			foreach($langs as $lang)
-			{
-				$this->_addSitemapNode($xml, Tools::getShopDomain(true, true).__PS_BASE_URI__.$lang['iso_code'].'/', '1.00', 'daily', date('Y-m-d'));
-			}
-		else
-			$this->_addSitemapNode($xml, Tools::getShopDomain(true, true).__PS_BASE_URI__, '1.00', 'daily', date('Y-m-d'));
-
-		/* Product Generator */
-		$sql = 'SELECT p.id_product, pl.link_rewrite, DATE_FORMAT(IF(ps.date_upd,ps.date_upd,ps.date_add), \'%Y-%m-%d\') date_upd, pl.id_lang, cl.`link_rewrite` category, ean13, i.id_image, il.legend legend_image, (
-					SELECT MIN(level_depth)
-					FROM '._DB_PREFIX_.'product p2
-					'.Shop::addSqlAssociation('product', 'p2').'
-					LEFT JOIN '._DB_PREFIX_.'category_product cp2 ON p2.id_product = cp2.id_product
-					LEFT JOIN '._DB_PREFIX_.'category c2 ON cp2.id_category = c2.id_category
-					WHERE p2.id_product = p.id_product AND product_shop.`active` = 1 AND c2.`active` = 1) AS level_depth
-				FROM '._DB_PREFIX_.'product p
-				LEFT JOIN '._DB_PREFIX_.'product_shop ps ON (ps.id_product = p.id_product AND ps.id_shop = '.(int)$id_shop.')
-				LEFT JOIN '._DB_PREFIX_.'product_lang pl ON (p.id_product = pl.id_product)
-				LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (ps.id_category_default = cl.id_category AND pl.id_lang = cl.id_lang AND cl.id_shop = '.(int)$id_shop.')
-				LEFT JOIN '._DB_PREFIX_.'image i ON p.id_product = i.id_product
-				LEFT JOIN '._DB_PREFIX_.'image_lang il ON (i.id_image = il.id_image)
-				LEFT JOIN '._DB_PREFIX_.'lang l ON (pl.id_lang = l.id_lang)
-				WHERE l.`active` = 1
-					AND ps.`active` = 1
-					AND ps.id_shop = '.(int)$id_shop.'
-				'.(Configuration::get('GSITEMAP_ALL_PRODUCTS') ? '' : 'HAVING level_depth IS NOT NULL').'
-				ORDER BY pl.id_product, pl.id_lang ASC';
-
-		$resource = Db::getInstance(_PS_USE_SQL_SLAVE_)->query($sql);
-
-		// array used to know which product/image was already added (blacklist)
-		$done = null;
-		$sitemap = null;
-
-		// iterates on the products, to gather the image ids
-		while ($product = Db::getInstance()->nextRow($resource))
-		{
-			// if the product has not been added
-			$id_product = $product['id_product'];
-			if (!isset($done[$id_product]['added']))
-			{
-				// priority
-				if (($priority = 0.7 - ($product['level_depth'] / 10)) < 0.1)
-					$priority = 0.1;
-
-				// adds the product
-				$tmpLink = $this->context->link->getProductLink((int)($product['id_product']), $product['link_rewrite'], $product['category'], $product['ean13'], (int)($product['id_lang']));
-				$sitemap = $this->_addSitemapNode($xml, $tmpLink, $priority, 'weekly', substr($product['date_upd'], 0, 10));
-
-				// considers the product has added
-				$done[$id_product]['added'] = true;
-			}
-
-			// if the image has not been added
-			$id_image = $product['id_image'];
-			if (!isset($done[$id_product][$id_image]) && $id_image)
-			{
-				// adds the image
-				$this->_addSitemapNodeImage($sitemap, $product);
-
-				// considers the image as added
-				$done[$id_product][$id_image] = true;
-			}
-		}
-
-		/* Categories Generator */
-		if (Configuration::get('PS_REWRITING_SETTINGS'))
-			$categories = Db::getInstance()->executeS('
-			SELECT c.id_category, c.level_depth, link_rewrite, DATE_FORMAT(IF(date_upd,date_upd,date_add), \'%Y-%m-%d\') AS date_upd, cl.id_lang
-			FROM '._DB_PREFIX_.'category c
-			LEFT JOIN '._DB_PREFIX_.'category_lang cl ON c.id_category = cl.id_category
-			LEFT JOIN '._DB_PREFIX_.'lang l ON cl.id_lang = l.id_lang
-			WHERE l.`active` = 1 AND c.`active` = 1 AND c.id_category != 1
-			ORDER BY cl.id_category, cl.id_lang ASC');
-		else
-			$categories = Db::getInstance()->executeS(
-			'SELECT c.id_category, c.level_depth, DATE_FORMAT(IF(date_upd,date_upd,date_add), \'%Y-%m-%d\') AS date_upd
-			FROM '._DB_PREFIX_.'category c
-			ORDER BY c.id_category ASC');
-
-
-		foreach($categories as $category)
-		{
-			if (($priority = 0.9 - ($category['level_depth'] / 10)) < 0.1)
-				$priority = 0.1;
-
-			$tmpLink = Configuration::get('PS_REWRITING_SETTINGS') ?
-				$this->context->link->getCategoryLink((int)$category['id_category'], $category['link_rewrite'], (int)$category['id_lang'])
-				: $this->context->link->getCategoryLink((int)$category['id_category']);
-			$this->_addSitemapNode($xml, htmlspecialchars($tmpLink), $priority, 'weekly', substr($category['date_upd'], 0, 10));
-		}
-
-		/* CMS Generator */
-		if (Configuration::get('GSITEMAP_ALL_CMS') || !Module::isInstalled('blockcms'))
-			$sql_cms = '
-			SELECT DISTINCT '.(Configuration::get('PS_REWRITING_SETTINGS') ? 'cl.id_cms, cl.link_rewrite, cl.id_lang' : 'cl.id_cms').
-			' FROM '._DB_PREFIX_.'cms_lang cl
-			LEFT JOIN '._DB_PREFIX_.'lang l ON (cl.id_lang = l.id_lang)
-			WHERE l.`active` = 1
-			ORDER BY cl.id_cms, cl.id_lang ASC';
-		else if (Module::isInstalled('blockcms'))
-			$sql_cms = '
-			SELECT DISTINCT '.(Configuration::get('PS_REWRITING_SETTINGS') ? 'cl.id_cms, cl.link_rewrite, cl.id_lang' : 'cl.id_cms').
-			' FROM '._DB_PREFIX_.'cms_block_page b
-			LEFT JOIN '._DB_PREFIX_.'cms_lang cl ON (b.id_cms = cl.id_cms)
-			LEFT JOIN '._DB_PREFIX_.'lang l ON (cl.id_lang = l.id_lang)
-			WHERE l.`active` = 1
-			ORDER BY cl.id_cms, cl.id_lang ASC';
-
-		$cmss = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql_cms);
-		foreach($cmss as $cms)
-		{
-			$tmpLink = Configuration::get('PS_REWRITING_SETTINGS') ?
-				$this->context->link->getCMSLink((int)$cms['id_cms'], $cms['link_rewrite'], false, (int)$cms['id_lang'])
-				: $this->context->link->getCMSLink((int)$cms['id_cms']);
-			$this->_addSitemapNode($xml, $tmpLink, '0.8', 'daily');
-		}
-
-		/* Add classic pages (contact, best sales, new products...) */
-		$pages = array(
-			'supplier' => false,
-			'manufacturer' => false,
-			'new-products' => false,
-			'prices-drop' => false,
-			'stores' => false,
-			'authentication' => true,
-			'best-sales' => false,
-			'contact-form' => true);
-
-		// Don't show suppliers and manufacturers if they are disallowed
-		if (!Module::getInstanceByName('blockmanufacturer')->id && !Configuration::get('PS_DISPLAY_SUPPLIERS'))
-			unset($pages['manufacturer']);
-
-		if (!Module::getInstanceByName('blocksupplier')->id && !Configuration::get('PS_DISPLAY_SUPPLIERS'))
-			unset($pages['supplier']);
-
-		// Generate nodes for pages
-		if(Configuration::get('PS_REWRITING_SETTINGS'))
-			foreach ($pages as $page => $ssl)
-				foreach($langs as $lang)
-					$this->_addSitemapNode($xml, $this->context->link->getPageLink($page, $ssl, $lang['id_lang']), '0.5', 'monthly');
-		else
-			foreach($pages as $page => $ssl)
-				$this->_addSitemapNode($xml, $this->context->link->getPageLink($page, $ssl), '0.5', 'monthly');
-
-		$xml_string = $xml->asXML();
-
-		// Replace URL in XML strings by real shops URL
-		if ($replace_url)
-			$xml_string = str_replace(array(Tools::getShopDomain(true).__PS_BASE_URI__, Tools::getShopDomainSsl(true).__PS_BASE_URI__), $replace_url, $xml_string);
-
-		$fp = fopen($filename, 'w');
-		fwrite($fp, $xml_string);
-		fclose($fp);
-
-		return file_exists($filename);
-	}
-
-	private function _addSitemapIndexNode($xml, $loc, $last_mod)
-	{
-		$sitemap = $xml->addChild('sitemap');
-		$sitemap->addChild('loc', htmlspecialchars($loc));
-		$sitemap->addChild('lastmod', $last_mod);
-		return $sitemap;
-	}
-
-	private function _addSitemapNode($xml, $loc, $priority, $change_freq, $last_mod = NULL)
-	{
-		$sitemap = $xml->addChild('url');
-		$sitemap->addChild('loc', htmlspecialchars($loc));
-		$sitemap->addChild('priority',  number_format($priority,1,'.',''));
-		if ($last_mod)
-			$sitemap->addChild('lastmod', $last_mod);
-		$sitemap->addChild('changefreq', $change_freq);
-		return $sitemap;
-	}
-
-	private function _addSitemapNodeImage($xml, $product)
-	{
-		$image = $xml->addChild('image', null, 'http://www.google.com/schemas/sitemap-image/1.1');
-		$image->addChild('loc', htmlspecialchars($this->context->link->getImageLink($product['link_rewrite'], (int)$product['id_product'].'-'.(int)$product['id_image'])), 'http://www.google.com/schemas/sitemap-image/1.1');
-
-		$legend_image = preg_replace('/(&+)/i', '&amp;', $product['legend_image']);
-		$image->addChild('caption', $legend_image, 'http://www.google.com/schemas/sitemap-image/1.1');
-		$image->addChild('title', $legend_image, 'http://www.google.com/schemas/sitemap-image/1.1');
-	}
-
-	private function _displaySitemap()
-	{
-		if (Shop::isFeatureActive())
-		{
-			$sql = 'SELECT s.id_shop, su.domain, su.domain_ssl, CONCAT(su.physical_uri, su.virtual_uri) as uri
-					FROM '._DB_PREFIX_.'shop s
-					INNER JOIN '._DB_PREFIX_.'shop_url su ON s.id_shop = su.id_shop AND su.main = 1
-					WHERE s.active = 1
-						AND s.deleted = 0
-						AND su.active = 1';
-			if (!$result = Db::getInstance()->executeS($sql))
-				return '';
-
-			$this->_html .= '<h2>'.$this->l('Sitemap index').'</h2>';
-			$this->_html .= '<p>'.$this->l('Your Google sitemap file is online at the following address:').'<br />
-				<a href="'.Tools::getShopDomain(true, true).__PS_BASE_URI__.'sitemap.xml" target="_blank"><b>'.Tools::getShopDomain(true, true).__PS_BASE_URI__.'sitemap.xml</b></a></p><br />';
-
-			$info = pathinfo(GSITEMAP_FILE);
-			foreach ($result as $shop)
-			{
-				$filename = $info['dirname'].'/'.$info['filename'].'-'.$shop['id_shop'].'.'.$info['extension'];
-				if (file_exists($filename) && filesize($filename))
-				{
-					$fp = fopen($filename, 'r');
-					$fstat = fstat($fp);
-					fclose($fp);
-					$xml = simplexml_load_file($filename);
-
-					$nbPages = count($xml->url);
-					$sitemap_uri = 'http://'.$shop['domain'].$shop['uri'].$info['filename'].'-'.$shop['id_shop'].'.'.$info['extension'];
-
-					$this->_html .= '<h2>'.$this->l('Sitemap for: ').$shop['domain'].$shop['uri'].'</h2>';
-					$this->_html .= '<p>'.$this->l('Your Google sitemap file is online at the following address:').'<br />
-					<a href="'.$sitemap_uri.'" target="_blank"><b>'.$sitemap_uri.'</b></a></p><br />';
-
-					$this->_html .= $this->l('Update:').' <b>'.utf8_encode(strftime('%A %d %B %Y %H:%M:%S',$fstat['mtime'])).'</b><br />';
-					$this->_html .= $this->l('Filesize:').' <b>'.number_format(($fstat['size']*.000001), 3).'MB</b><br />';
-					$this->_html .= $this->l('Indexed pages:').' <b>'.$nbPages.'</b><br /><br />';
-				}
-			}
-		}
-		elseif (file_exists(GSITEMAP_FILE) && filesize(GSITEMAP_FILE))
-		{
-			$fp = fopen(GSITEMAP_FILE, 'r');
-			$fstat = fstat($fp);
-			fclose($fp);
-			$xml = simplexml_load_file(GSITEMAP_FILE);
-
-			$nbPages = count($xml->url);
-
-			$this->_html .= '<p>'.$this->l('Your Google sitemap file is online at the following address:').'<br />
-			<a href="'.Tools::getShopDomain(true, true).__PS_BASE_URI__.'sitemap.xml" target="_blank"><b>'.Tools::getShopDomain(true, true).__PS_BASE_URI__.'sitemap.xml</b></a></p><br />';
-
-			$this->_html .= $this->l('Update:').' <b>'.utf8_encode(strftime('%A %d %B %Y %H:%M:%S',$fstat['mtime'])).'</b><br />';
-			$this->_html .= $this->l('Filesize:').' <b>'.number_format(($fstat['size']*.000001), 3).'MB</b><br />';
-			$this->_html .= $this->l('Indexed pages:').' <b>'.$nbPages.'</b><br /><br />';
-		}
-	}
-
-	private function _displayForm()
-	{
-		if (Tools::usingSecureMode())
-			$domain = Tools::getShopDomainSsl(true);
-		else
-			$domain = Tools::getShopDomain(true);
-
-		$this->_html .= '
-			<form action="'.Tools::htmlentitiesUTF8($_SERVER['REQUEST_URI']).'" method="post">
-				<div style="margin:0 0 20px 0;">
-					<input type="checkbox" name="GSITEMAP_ALL_PRODUCTS" id="GSITEMAP_ALL_PRODUCTS" style="vertical-align: middle;" value="1" '.(Configuration::get('GSITEMAP_ALL_PRODUCTS') ? 'checked="checked"' : '').' /> <label class="t" for="GSITEMAP_ALL_PRODUCTS">'.$this->l('Sitemap also includes products from inactive categories.').'</label>
-				</div>
-				<div style="margin:0 0 20px 0;">
-					<input type="checkbox" name="GSITEMAP_ALL_CMS" id="GSITEMAP_ALL_CMS" style="vertical-align: middle;" value="1" '.(Configuration::get('GSITEMAP_ALL_CMS') ? 'checked="checked"' : '').' /> <label class="t" for="GSITEMAP_ALL_CMS">'.$this->l('Sitemap also includes CMS pages not found in a CMS block.').'</label>
-				</div>
-				<input name="btnSubmit" class="button" type="submit"
-				value="'.((!file_exists(GSITEMAP_FILE)) ? $this->l('Generate a sitemap file.') : $this->l('Update the sitemap file.')).'" />
-			</form><br />
-			<h2>'.$this->l('Use cron job to re-build the sitemap:').'</h2>
-			<p>
-				<b>'.$domain.__PS_BASE_URI__.'modules/gsitemap/gsitemap-cron.php?&token='.substr(Tools::encrypt('gsitemap/cron'),0,10).'&GSITEMAP_ALL_CMS='.((int)Configuration::get('GSITEMAP_ALL_CMS')).'&GSITEMAP_ALL_PRODUCTS='.((int)Configuration::get('GSITEMAP_ALL_PRODUCTS')).'</b>
-			</p>';
-	}
-
-	public function getContent()
-	{
-		if (Tools::isSubmit('btnSubmit'))
-		{
-			$this->_postValidation();
-			if (!count($this->_postErrors))
-				$this->_postProcess();
-			else
-				foreach ($this->_postErrors as $err)
-					$this->_html .= '<div class="alert error">'.$err.'</div>';
-		}
-
-		$this->_html .= '
-			<fieldset>
-				<legend>'.$this->l('Search Engine Optimization (SEO).').'</legend>
-				<br />
-				'.$this->l('See').' <a href="http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=156184&from=40318&rd=1" style="font-weight:bold;text-decoration:underline;" target="_blank">
-				'.$this->l('This page').'</a> '.$this->l('For more information').'
-				<br />';
-
-		$this->_displaySitemap();
-		$this->_displayForm();
-
-		$this->_html .= '</fieldset>';
-		return $this->_html;
-	}
-
-}
-
diff --git a/modules/gsitemap/index.php b/modules/gsitemap/index.php
deleted file mode 100644
index 3f6561f72..000000000
--- a/modules/gsitemap/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-				    	
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-						
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-						
-header("Location: ../");
-exit;
\ No newline at end of file
diff --git a/modules/gsitemap/logo.gif b/modules/gsitemap/logo.gif
deleted file mode 100644
index d24a14a90921f6b698df98d4c7135dfc7d97dd70..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 378
zcmV-=0fqiYNk%w1VGsZi0M!5h025YktnbGo08gz|s<y&cbG#f{vF-o%042RGw?Na`
z`3n}L!p{B&W9WR3$9kmJzuxe~+v6xEi_R1oBs#H7v^)R*|F6>e6)LJGTgxdhbmjK_
zMs&&qHnH6p5{Zx56(4|an&}rilgut6O|?=0B9{06|II1@97(Xv-1EWp{}VCAATGs1
zZrlI$|6+ux-Ru7rKfl}>0A+>P(kKrxV7L=3pw=KSftlYiH?h#=|Jx-R4l2v(|NlI-
zM9~ljA^8LV2LS&7EC2ui01yBW000J;zy_%@s0@w1iZbEzH7wAmR62TEdN5ppvg*_V
z5a{W7P;pkU-jyNJK!4VmNG(l8ptL7Wq%cjTV-_J4E`L&R7BvQjQXWqkD2!1zPc0>W
zP$mZvIyxy90#6SJ4hK;TIT#cl7CTQHEDH>nP&yz4786!55(^(276%6x0JwP;CMFvN
Y5;iL_JSZ=~u98zbP1)MpJ~BZ7JC9qMJpcdz

diff --git a/modules/gsitemap/logo.png b/modules/gsitemap/logo.png
deleted file mode 100755
index 21c29316c9c7b50e0d35cf3bcd56bbdae46123e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2337
zcmV++3EuXJP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU)!%0LzRCwC7R|{}d)fxWoxpz1F$c8*2
zB%1(XbZ|Otk;jZ}wVkOWBZ4i^s%R}U2vq1y)xuOA96->vsBN{S>cG$r$aI)0tpWwg
zqm@x8NGQ}0Dujd(^4cVu>}Io%yN`QszjHSW2?@4##=CQ7?>+b2bN>JPzyCY`(eT+X
zbtmwm3Os8Kb|`En@X|uyIo=xh952Uip#8&Xw_EW;do8Q!9NT#-apW)7@##~oy+DT?
z^I0a8#%ty4_q`W4lsRcb`ecn5WC?+c$A^awY{rk;KEU*sUqGg<5h`@3nu@gIhE_Ql
zr&m6QP5wLa$JxuF#Rs66=CGw4ssfK{?F+1%GmjmaoB_UqwfiIe>u3L0YxgS(W-j?2
zL?{4fp%bo}N{BoM5?4Br4(Tv_<50VKJ7!zfP3IW1?f@bi?knK!fPB{2Tv^Y7y%$4J
z9A1LxgkU6PvrG#nEjN(hk7n1`bBqPyEJLy@L`D#usE$;350thbVjOe0pPu#ga&X$l
zQv#9Z&D<&F7+lLW)Bq(1yVIGEQ|(Ut@GfA-Ss>B^jQ4W_C-8XQW{`YHG&IBEFNH<V
zGkS_&3mEYPGJR2)?cFv3c7}o2`92huSHmP4DH^b-q(2wX9P-E+aGhbo0hRRDD}b^_
zC*p1u8v8N|XDBMO&5nm6aA{mLnMTIz=2Qx-WC})TAd3jEJn6Mi;37KG0EJ`nv>Z3p
zVIjG}0KO*dAFZON<25M#DumFW(SQNtED9dD2Z47EV?s|D$!HvkE6?^tp)rW*2yl+(
zWvii)UV?@TxhNf0**vb|!SxG98jz!m#>skHf#@v?++FO=2YNaTs7@1G>fT3t%`D7x
zpM*#ZU~D1<m2FT1(9PCaP=wmWKY{Zyv(e0;<M=X$aVt`c)Q>q`G1soaBAmY&0z?+2
z<>W%4z|v_6Y}uKQ(y4?v?nA@Tdl8LB@ObGsyy~Bb@QHIw!fPZ#>(bR|So2eqkcH})
zLR|h+KBiO@VbN2sV{CDi?PPbT9e?=itEgFvkN0jsHM`Qo3{WK<t*n+c%on)rcTog4
zdvImX3iNhHaOB7?{A|S?Sn|a8?bt(eB50Li&6y&ki!0#@Gv53K>z_f*I42&t|1q?t
z-od5d1%`ywH>Tj>xsT$l-P_CWd$wug{*8Eg1On1jk+E=Ql@t9T6UwQ1X#E7J`{X^W
z{Cxst-g+Pu&HAn;QK}`dChrWkq!*wg?FEwq{r`R$_s_ovC)<AsB`=12LN7RP&p-gJ
z!PB^7+Bb2jrD-K6Su2Japk^Htgu(KfNb6t5xr39@=h%fOxAnt6*@<2~h$ER_5GBH7
z2pcWMGV#3s1nw#bB0)Z;Nx~leW5nYz7<^8~nOQMg77$GkRsD2sN%!y&aK2zCx#zav
z6ot5Q^c$Fd_;pl25J5|@6ydZ9p*Yac(t)Jdj_K-y$f%^CLq*5sZp_i%hc{V?H#t{d
zgqk4pHfHk?79BHbK#IhPr#fv%0Xs6oLr^xJt%~1Wyc=V`vIA9Hbc`AALUDxyWz`OQ
zCV!O&nW~HEt~vyN^#t-ppkhKLimR)zVCGo3DG$^pq}UQPAQs^>Ta1y@<MN+MIw(bA
z1PS>c>H;nV-e!755T58p^SlC-9gH#kva&2c6P5#4tXlL~r<mti!*UG1vuZxBUd=w*
z9!IlHhJw*T8{b8`@RqGt7$O7`0SS$fR!~r+B9jzQjO=^=t_W`3&;?71g(A7G^5;Y?
zwiD$b`!t(G7tS=Gz5X^N`@Lvvq5&D?;6{e`&5b~~7rlRb1FuMB9}xoE9xmuB5w=&d
zOK?M~d#xPKP#Rj)uyK>YQ@N-^ap7MIozW~914(S#^H0PFqWIufr6}(IDlSlUjvZ(F
z5V*wqv*D%K{Q~B4TH*|SgcM5>CW6cYT5IracN<et$w1+Tbm;jC?iB)^9cehY#i^8N
zjaG}iB<ce1;=rHF5$No~(L)FE^B0%kkq5tJPqMtO0&mVLf`{{a)}7!=Tcv7;kzHbV
z78Fwn(_TR|6-0<^StY}u5N<-RGCPVFH^Vo#5W$6hI_=~Rs-dq(NA1NZ&Yf>Y+vPeO
zKlod?eLlF$e6pIs52l)kCrx<V0+u1yMO>=j2olQhN|LxdfY+zkY&PksX~}(EhlrJ<
zam8u`rf+1JboLP$!HueY68^r!i^BW>j_&&nDsP=g4IukcQWVnoT1f;(t~#>JVVjY-
z5dq1^JhyBtp*$vOkYZs{0C&rJxEiQzN*E$uNH(!D(vnEU-1x`alQ3<;M|f;gALGb^
zCTUQo%<JryJEBlVt&m1Yu^gr-{DN_}L>jK>x8dtvg=EnI=#w6W)y2fFJOQij*HB8^
zQF}Or8Q(pIsb6<N*VE9=3#<cfv1@=V{j;g14VRpoY{wkaBT49@5|UU&1IrO_n}x3O
zCzwNx(AvEm;~~*{p%p!Y(4NJpZ+ZiFe@RDclVX=|Do(<$=0hQet~R$3LDjCBN+wMl
zn(?C}Anh%o5*CmH{_s}nIoUq*DHJ;gm?8NjW*&ka7RvoDlCK|5Z5zgSd<XHalla1n
zKA7ZmzS50Kr5aaTTTor&&n_X<8xsB|9I$!7^s5Z)MoP4xyYxwx+&wTd!j7q786+i}
zytmV|8>KVe#lVGo(O>rvy-N`VyOJeI$pIpQ!GCph3Jga;Ud5rO(dl~y@%&@9e9F30
zhy+>8(u~Tdv%J+a9+(t{Xd(me*f65XCPV}4;h3x=<B(f5GemBKRywO{Lb)b#qZ%-j
zpvxY9>C+DfU%Y-B@}`h6QqUX<YgV!!3$MMKSa|!WP~VsgwgC=R{9os^qH(g)b&h(P
zy6M@DYb9<pz^ft36H9*DFzvAYPiHzMOIszk3DSs9IS|>N%f(&E@bSnHi{&&_6-<&2
z4LvY?PM16nQs8klcQR52PqW@ZEI;qdvKfl(DNlC%M}PqUwU(@49(S&900000NkvXX
Hu0mjfLTX<)

diff --git a/modules/gsitemap/translations/index.php b/modules/gsitemap/translations/index.php
deleted file mode 100644
index 3f6561f72..000000000
--- a/modules/gsitemap/translations/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-				    	
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-						
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-						
-header("Location: ../");
-exit;
\ No newline at end of file

From c83bc07f204d3299848a6a4236d847938cb42111 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Mon, 15 Apr 2013 16:21:03 +0200
Subject: [PATCH 40/67] [-] BO : Remove undefined name when module can not be
 installed

---
 controllers/admin/AdminModulesController.php | 2 +-
 modules/blockadvertising/config.xml          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index 5ce5d6a59..9d516d1d9 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -629,7 +629,7 @@ class AdminModulesControllerCore extends AdminController
 											$this->errors[] = $this->l('Error on downloading the lastest version');
 										else
 											if(!$this->extractArchive(_PS_MODULE_DIR_.$modaddons->name.'.zip', false))
-												$this->errors[] = $this->l(sprintf("Module %s can't be upgraded: ", $module->displayName));
+												$this->errors[] = $this->l(sprintf("Module %s can't be upgraded: ", $modaddons->name));
 									}
 							}
 					}
diff --git a/modules/blockadvertising/config.xml b/modules/blockadvertising/config.xml
index 37f1f7221..62b227aae 100755
--- a/modules/blockadvertising/config.xml
+++ b/modules/blockadvertising/config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
         <module>
             <name>blockadvertising</name>
-            <displayName><![CDATA[Block advertising]]></displayName>
+            <displayName><![CDATA[Bloc publicit&eacute;]]></displayName>
             <version><![CDATA[0.5]]></version>
-            <description><![CDATA[Adds an advertisement block to selected sections of your e-commerce webiste.]]></description>
+            <description><![CDATA[Ajoute un bloc affichant une publicit&eacute;]]></description>
             <author><![CDATA[PrestaShop]]></author>
             <tab><![CDATA[advertising_marketing]]></tab>
             <is_configurable>1</is_configurable>

From be6b93825849735654bd56cba2b565f6d9940cec Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Mon, 15 Apr 2013 18:30:41 +0200
Subject: [PATCH 41/67] [-] FO : First part of fix #PSCFV-8636, cart rule on
 specifice carrier / all carriers

---
 controllers/front/OrderController.php       |  2 +-
 controllers/front/OrderOpcController.php    |  4 ++--
 controllers/front/ParentOrderController.php | 18 ++++++++++++++----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php
index 190bdd1de..80b4775bb 100644
--- a/controllers/front/OrderController.php
+++ b/controllers/front/OrderController.php
@@ -347,7 +347,7 @@ class OrderControllerCore extends ParentOrderController
 
 		$this->context->smarty->assign(
 			array(
-				'free_shipping' => false, // Deprecated since a cart rule can be applied the specific carriers only
+			//	'free_shipping' => false, // Deprecated since a cart rule can be applied the specific carriers only
 				'is_guest' => (isset($this->context->customer->is_guest) ? $this->context->customer->is_guest : 0)
 			));
 	}
diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index fcc6fb222..9b90e22a4 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -316,7 +316,7 @@ class OrderOpcControllerCore extends ParentOrderController
 		// If a rule offer free-shipping, force hidding shipping prices
 		$free_shipping = false;
 		foreach ($this->context->cart->getCartRules() as $rule)
-			if ($rule['free_shipping'])
+			if ($rule['free_shipping'] && !$rule['carrier_restriction'])
 			{
 				$free_shipping = true;
 				break;
@@ -500,7 +500,7 @@ class OrderOpcControllerCore extends ParentOrderController
 		$oldMessage = Message::getMessageByCartId((int)($this->context->cart->id));
 
 		$vars = array(
-			'free_shipping' => false, // Deprecated since a cart rule can be applied the specific carriers only
+		//	'free_shipping' => false, // Deprecated since a cart rule can be applied the specific carriers only
 			'checkedTOS' => (int)($this->context->cookie->checkedTOS),
 			'recyclablePackAllowed' => (int)(Configuration::get('PS_RECYCLABLE_PACK')),
 			'giftAllowed' => (int)(Configuration::get('PS_GIFT_WRAPPING')),
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index 164ba87b2..3483b2cce 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -454,15 +454,15 @@ class ParentOrderControllerCore extends FrontController
 	}
 
 	protected function _assignCarrier()
-	{
+	{	
 		$address = new Address($this->context->cart->id_address_delivery);
 		$id_zone = Address::getZoneById($address->id);
 		$carriers = $this->context->cart->simulateCarriersOutput();
 		$checked = $this->context->cart->simulateCarrierSelectedOutput();
 		$delivery_option_list = $this->context->cart->getDeliveryOptionList();
 		$this->setDefaultCarrierSelection($delivery_option_list);
-		
-		$this->context->smarty->assign(array(
+
+		$this->context->smarty->assign(array(		
 			'address_collection' => $this->context->cart->getAddressCollection(),
 			'delivery_option_list' => $delivery_option_list,
 			'carriers' => $carriers,
@@ -497,8 +497,18 @@ class ParentOrderControllerCore extends FrontController
 			$this->link_conditions .= '?content_only=1';
 		else
 			$this->link_conditions .= '&content_only=1';
-
+		
+		$free_shipping = false;
+		foreach ($this->context->cart->getCartRules() as $rule)
+		{
+			if ($rule['free_shipping'] && !$rule['carrier_restriction'])
+			{
+				$free_shipping = true;
+				break;
+			}			
+		}	
 		$this->context->smarty->assign(array(
+			'free_shipping' => $free_shipping,
 			'checkedTOS' => (int)($this->context->cookie->checkedTOS),
 			'recyclablePackAllowed' => (int)(Configuration::get('PS_RECYCLABLE_PACK')),
 			'giftAllowed' => (int)(Configuration::get('PS_GIFT_WRAPPING')),

From d0ae9a5a463ec478512bbfa4bd0e1cb1b8feff0a Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Mon, 15 Apr 2013 18:51:41 +0200
Subject: [PATCH 42/67] [-] FO : Class free order name for validateOrder

---
 controllers/front/ParentOrderController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index 3483b2cce..075198f2f 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -30,6 +30,8 @@
 class FreeOrder extends PaymentModule
 {
 	public $active = 1;
+	public $name = 'free_order';
+	public $displayName = 'free_order';	
 }
 
 class ParentOrderControllerCore extends FrontController

From 6e58a24325310602eb1779a03c3d0cdeb91c50d4 Mon Sep 17 00:00:00 2001
From: ccauw <ch.webinfo@laposte.net>
Date: Mon, 15 Apr 2013 20:19:10 +0300
Subject: [PATCH 43/67] [*] BO : Add block "close_td" in list_content.tpl

[*] BO : Add block "close_td" in list_content.tpl

{block name="td_content"}
.....
{/block}
{block name="close_td"}

{/block}

So now we can override "td" and "/td" tags.
So we can create

"td" "a" ... content.... "/a" "/td"

when overriding the block open-td and close-td
and we can use "a" tag with "href" rather than "onclick" to create view links in the list.
And the user can choose to open the link in another tab or window.
---
 admin-dev/themes/default/template/helpers/list/list_content.tpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/admin-dev/themes/default/template/helpers/list/list_content.tpl b/admin-dev/themes/default/template/helpers/list/list_content.tpl
index 596c5ba3e..add0db76d 100644
--- a/admin-dev/themes/default/template/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl
@@ -116,6 +116,8 @@
 				{if isset($params.color) && isset($tr.color)}
 					</span>
 				{/if}
+			{/block}
+			{block name="close_td"}
 				</td>
 			{/block}
 		{/foreach}

From 188cddb46532a9fd1a6d9035e386066677f7b859 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 16 Apr 2013 10:22:46 +0200
Subject: [PATCH 44/67] [-] Fo : Fix big pic alt with jqzoom

---
 js/jquery/plugins/jqzoom/jquery.jqzoom.js | 7 ++++---
 themes/default/js/product.js              | 3 ++-
 themes/default/product.tpl                | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/js/jquery/plugins/jqzoom/jquery.jqzoom.js b/js/jquery/plugins/jqzoom/jquery.jqzoom.js
index 2e03940a7..d74f8dc1c 100755
--- a/js/jquery/plugins/jqzoom/jquery.jqzoom.js
+++ b/js/jquery/plugins/jqzoom/jquery.jqzoom.js
@@ -31,9 +31,10 @@
 				var imageWidth = $(this).get(0).offsetWidth;
 				var imageHeight = $(this).get(0).offsetHeight;
 
-				noalt = $(this).attr("alt");
+				attr = typeof($(this).attr("rel")) != 'undefined' ? "rel" : "alt";
+				noalt = $(this).attr(attr);
 				var bigimage = noalt;
-				$(this).attr("alt", '');
+				$(this).attr(attr, '');
 
 				if($("div.zoomdiv").get().length == 0)
 					$(this).after("<div class='zoomdiv'><img class='bigimg' src='"+bigimage+"'/></div>");
@@ -67,7 +68,7 @@
 					$("div.zoomdiv").get(0).scrollLeft = (scrollx) * scalex ;
 				});
 			}, function() {
-				$(this).attr("alt", noalt);
+				$(this).attr(attr, noalt);
 				$("div.zoomdiv").hide();
 				$(document.body).unbind("mousemove");
 				$(".lenszoom").remove();
diff --git a/themes/default/js/product.js b/themes/default/js/product.js
index 4c71eaef4..7bae47cc0 100644
--- a/themes/default/js/product.js
+++ b/themes/default/js/product.js
@@ -424,7 +424,7 @@ function displayImage(domAAroundImgThumb, no_animation)
 		{
 			$('#bigpic').attr('src', newSrc);
 			if (typeof(jqZoomEnabled) != 'undefined' && jqZoomEnabled)
-				$(this).attr('alt', domAAroundImgThumb.attr('href'));
+				$('#bigpic').attr('rel', domAAroundImgThumb.attr('href'));
 		}
 		$('#views_block li a').removeClass('shown');
 		$(domAAroundImgThumb).addClass('shown');
@@ -528,6 +528,7 @@ $(document).ready(function()
 	//set jqZoom parameters if needed
 	if (typeof(jqZoomEnabled) != 'undefined' && jqZoomEnabled)
 	{
+		$('#bigpic').attr('rel', $('#bigpic').attr('src').replace('thickbox', 'large'));
 		$('img.jqzoom').jqueryzoom({
 			xzoom: 200, //zooming div default width(default width value is 200)
 			yzoom: 200, //zooming div default width(default height value is 200)
diff --git a/themes/default/product.tpl b/themes/default/product.tpl
index 388f57834..905f8f50a 100644
--- a/themes/default/product.tpl
+++ b/themes/default/product.tpl
@@ -183,7 +183,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 		<div id="image-block">
 		{if $have_image}
 			<span id="view_full_size">
-				<img src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')}" {if $jqZoomEnabled}class="jqzoom" alt="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'thickbox_default')}"{else} title="{$product->name|escape:'htmlall':'UTF-8'}" alt="{$product->name|escape:'htmlall':'UTF-8'}" {/if} id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}" />
+				<img src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')}"{if $jqZoomEnabled} class="jqzoom"{/if} title="{$product->name|escape:'htmlall':'UTF-8'}" alt="{$product->name|escape:'htmlall':'UTF-8'}" id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}"/>
 				<span class="span_link">{l s='Maximize'}</span>
 			</span>
 		{else}

From 5290a3edcb95fb0f80cad5d71d5fc9d98599bbfc Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 16 Apr 2013 10:51:16 +0200
Subject: [PATCH 45/67] [*] FO : add steps to authentication pull request
 002f468958 thanks to radovanx

---
 themes/default/authentication.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/default/authentication.tpl b/themes/default/authentication.tpl
index 0249bf084..a826a1562 100644
--- a/themes/default/authentication.tpl
+++ b/themes/default/authentication.tpl
@@ -70,12 +70,12 @@ $(document).ready(function() {
 </script>
 
 <h1>{if !isset($email_create)}{l s='Log in'}{else}{l s='Create an account'}{/if}</h1>
-
+{if !isset($back) || $back != 'my-account'}{assign var='current_step' value='login'}{include file="$tpl_dir./order-steps.tpl"}{/if} 
 {include file="$tpl_dir./errors.tpl"}
 {assign var='stateExist' value=false}
 {if !isset($email_create)}
 	<script type="text/javascript">
-	{literal}
+	{literal}	
 	$(document).ready(function(){
 		// Retrocompatibility with 1.4
 		if (typeof baseUri === "undefined" && typeof baseDir !== "undefined")

From de7dc3faf67c0742c7f1e569f8273b6e801c6336 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 16 Apr 2013 10:53:08 +0200
Subject: [PATCH 46/67] // remove additionnal /t

---
 themes/default/authentication.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/default/authentication.tpl b/themes/default/authentication.tpl
index a826a1562..d35447f6b 100644
--- a/themes/default/authentication.tpl
+++ b/themes/default/authentication.tpl
@@ -75,7 +75,7 @@ $(document).ready(function() {
 {assign var='stateExist' value=false}
 {if !isset($email_create)}
 	<script type="text/javascript">
-	{literal}	
+	{literal}
 	$(document).ready(function(){
 		// Retrocompatibility with 1.4
 		if (typeof baseUri === "undefined" && typeof baseDir !== "undefined")

From 50cd001d395bc0e94154b072a457f3cb19aad346 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 16 Apr 2013 11:28:22 +0200
Subject: [PATCH 47/67] [-] FO : Undefined free_shipping in POC when updateQty

---
 controllers/front/OrderController.php    |  1 -
 controllers/front/OrderOpcController.php | 12 +++++++++++-
 themes/default/order-carrier.tpl         |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php
index 80b4775bb..37b5d90b8 100644
--- a/controllers/front/OrderController.php
+++ b/controllers/front/OrderController.php
@@ -347,7 +347,6 @@ class OrderControllerCore extends ParentOrderController
 
 		$this->context->smarty->assign(
 			array(
-			//	'free_shipping' => false, // Deprecated since a cart rule can be applied the specific carriers only
 				'is_guest' => (isset($this->context->customer->is_guest) ? $this->context->customer->is_guest : 0)
 			));
 	}
diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index 9b90e22a4..225f0e30a 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -498,9 +498,19 @@ class OrderOpcControllerCore extends ParentOrderController
 		$wrapping_fees = $this->context->cart->getGiftWrappingPrice(false);
 		$wrapping_fees_tax_inc = $wrapping_fees = $this->context->cart->getGiftWrappingPrice();
 		$oldMessage = Message::getMessageByCartId((int)($this->context->cart->id));
+		
+		$free_shipping = false;
+		foreach ($this->context->cart->getCartRules() as $rule)
+		{
+			if ($rule['free_shipping'] && !$rule['carrier_restriction'])
+			{
+				$free_shipping = true;
+				break;
+			}			
+		}		
 
 		$vars = array(
-		//	'free_shipping' => false, // Deprecated since a cart rule can be applied the specific carriers only
+			'free_shipping' => $free_shipping,
 			'checkedTOS' => (int)($this->context->cookie->checkedTOS),
 			'recyclablePackAllowed' => (int)(Configuration::get('PS_RECYCLABLE_PACK')),
 			'giftAllowed' => (int)(Configuration::get('PS_GIFT_WRAPPING')),
diff --git a/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl
index 25e164044..a8b9c2f2f 100644
--- a/themes/default/order-carrier.tpl
+++ b/themes/default/order-carrier.tpl
@@ -170,7 +170,7 @@
 								</td>
 								<td>
 								<div class="delivery_option_price">
-									{if $option.total_price_with_tax && !$free_shipping}
+									{if $option.total_price_with_tax && (!isset($free_shipping) || (isset($free_shipping) && !$free_shipping))}
 										{if $use_taxes == 1}
 											{convertPrice price=$option.total_price_with_tax} {l s='(tax incl.)'}
 										{else}

From 5757e56864aaed3da7ba71527587a8e3d9118c2d Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Tue, 16 Apr 2013 11:35:27 +0200
Subject: [PATCH 48/67] Merged Pull request #303 - Thanks to @kpodemski

---
 .../default/template/controllers/modules/tab_module_line.tpl    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
index a73256926..8c860d2e8 100644
--- a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
@@ -66,7 +66,7 @@
 					{else if !isset($module->not_on_disk)}
 						{$module->optionsHtml}
 						<div class="clear">&nbsp;</div>
-						<a href="#" class="button action_tab_module" data-option="select_{$module->name}" class="button">Valider</a>
+						<a href="#" class="button action_tab_module" data-option="select_{$module->name}" class="button">{l s='Submit'}</a>
 					{else}
 						<a href="{$module->options.install_url}" class="button">{l s='Install'}</a>
 					{/if}

From 03eadb3d6a411677f72a45263c63f7a0b114fb98 Mon Sep 17 00:00:00 2001
From: Andrew <Kluev.andrew@gmail.com>
Date: Tue, 16 Apr 2013 13:39:42 +0400
Subject: [PATCH 49/67] Remove spaces before and after dot

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

diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php
index 570a5a1e7..0d4591455 100644
--- a/classes/controller/Controller.php
+++ b/classes/controller/Controller.php
@@ -175,9 +175,9 @@ abstract class ControllerCore
 			// then using displayAjax[action]
 			if ($this->ajax)
 			{
-				$action = 'displayAjax' . Tools::toCamelCase(Tools::getValue('action', true));
+				$action = Tools::toCamelCase(Tools::getValue('action', true));
 				if (!empty($action) && method_exists($this, $action))
-					$this->{$action}();
+					$this->{'displayAjax'.$action}();
 				elseif (method_exists($this, 'displayAjax'))
 					$this->displayAjax();
 			}

From dface458a9d48c399886dc390d3c3509be3e561b Mon Sep 17 00:00:00 2001
From: Andrew <Kluev.andrew@gmail.com>
Date: Tue, 16 Apr 2013 13:43:24 +0400
Subject: [PATCH 50/67] Remove spaces before and after dot

---
 tools/profiling/Controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/profiling/Controller.php b/tools/profiling/Controller.php
index 41dc03ead..923faccec 100644
--- a/tools/profiling/Controller.php
+++ b/tools/profiling/Controller.php
@@ -227,9 +227,9 @@ abstract class Controller extends ControllerCore
 			// then using displayAjax[action]
 			if ($this->ajax)
 			{
-				$action = 'displayAjax' . Tools::toCamelCase(Tools::getValue('action', true));
+				$action = 'displayAjax'.Tools::toCamelCase(Tools::getValue('action', true));
 				if (!empty($action) && method_exists($this, $action))
-					$this->{$action}();
+					$this->{'displayAjax'.$action}();
 				elseif (method_exists($this, 'displayAjax'))
 					$this->displayAjax();
 			}

From 3615c225b3925a50471d74df9b24f1b166c9ff9c Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 16 Apr 2013 11:44:09 +0200
Subject: [PATCH 51/67] // small change on quantity_per_user cart rule created
 on ValidateOrder

---
 classes/PaymentModule.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index a2464ba9c..8a9f2e643 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -435,6 +435,7 @@ abstract class PaymentModuleCore extends Module
 
 							$voucher->id_customer = $order->id_customer;
 							$voucher->quantity = 1;
+							$voucher->quantity_per_user = 1;
 							if ($voucher->add())
 							{
 								// If the voucher has conditions, they are now copied to the new voucher

From e271524cc430e09e25549bf9a8a4bf8f5fdb6e17 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Tue, 16 Apr 2013 11:48:17 +0200
Subject: [PATCH 52/67] Merged Pull request #302 - Thanks to @kpodemski

---
 .../template/controllers/modules/js.tpl       | 40 +++++++++++++++++++
 .../template/controllers/modules/list.tpl     | 13 +++++-
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/admin-dev/themes/default/template/controllers/modules/js.tpl b/admin-dev/themes/default/template/controllers/modules/js.tpl
index b0bc45df2..d920b668b 100644
--- a/admin-dev/themes/default/template/controllers/modules/js.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/js.tpl
@@ -321,6 +321,46 @@
 			catch(e){}
 			return false;
 		});
+		
+		$('.toggle_favorite').live('click', function(event)
+	    {
+	      var el = $(this);
+	      var value_pref = el.data('value');
+	      var module_pref = el.data('module');
+	      var action_pref = 'f';
+	      try
+	      {
+	        resAjax = $.ajax({
+	            type:"POST",
+	            url : ajaxCurrentIndex,
+	            async: true,
+	            data : {
+	              ajax : "1",
+	              token : token,
+	              controller : "AdminModules",
+	              action : "saveFavoritePreferences",
+	              action_pref : action_pref,
+	              module_pref : module_pref,
+	              value_pref : value_pref
+	            },
+	            success : function(data)
+	            {
+	              // res.status  = cache or refresh
+	              if (data == 'OK')
+	              {
+	                el.parent('div').find('.toggle_favorite').toggle();
+	              }
+	                
+	            },
+	            error: function(res,textStatus,jqXHR)
+	            {
+	              //jAlert("TECHNICAL ERROR"+res);
+	            }
+	        });
+	      }
+	      catch(e){}
+	      return false;
+	    });
 	});
 
 	{/literal}
diff --git a/admin-dev/themes/default/template/controllers/modules/list.tpl b/admin-dev/themes/default/template/controllers/modules/list.tpl
index ff01f4620..aaee81658 100644
--- a/admin-dev/themes/default/template/controllers/modules/list.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/list.tpl
@@ -79,7 +79,18 @@
 						<p class="desc">{if isset($module->description) && $module->description ne ''}{l s='Description'} : {$module->description}{else}&nbsp;{/if}</p>
 						{if isset($module->message)}<div class="conf">{$module->message}</div>{/if}
 						<div class="row-actions-module">
-							{if !isset($module->not_on_disk)}{$module->optionsHtml}{else}&nbsp;{/if}
+							{if !isset($module->not_on_disk)}
+								{$module->optionsHtml}
+								{if isset($module->preferences) && $module->preferences['favorite'] == 1}
+									<a class="action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#">{l s='Remove from Favorites'}</a>
+									<a class="action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#" style="display: none;">{l s='Mark as Favorite'}</a>
+								{else}
+									<a class="action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#" style="display: none;">{l s='Remove from Favorites'}</a>
+									<a class="action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#">{l s='Mark as Favorite'}</a>
+								{/if}
+							{else}
+								&nbsp;
+							{/if}
 						</div>
 					</div>
 				</td>

From 7bb98b16f307fec0ce1adb2b0e1daf02b2eb5dc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Tue, 16 Apr 2013 12:01:04 +0200
Subject: [PATCH 53/67] [-] Installer: installer now work even if no
 settings.inc.php file is created with an installer session already here

---
 classes/Tools.php                        | 12 ++++++------
 install-dev/controllers/http/process.php | 11 ++++++++---
 install-dev/models/install.php           |  4 ++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/classes/Tools.php b/classes/Tools.php
index ca10a4785..08705746b 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -2347,16 +2347,16 @@ exit;
 		$addons_url = 'api.addons.prestashop.com';
 		$postData = '';
 		$postDataArray = array(
-			'version' => _PS_VERSION_,
-			'iso_lang' => strtolower(Context::getContext()->language->iso_code),
-			'iso_code' => strtolower(Country::getIsoById(Configuration::get('PS_COUNTRY_DEFAULT'))),
-			'shop_url' => urlencode(Tools::getShopDomain()),
-			'mail' => urlencode(Configuration::get('PS_SHOP_EMAIL'))
+			'version' => isset($params['version']) ? $params['version'] : _PS_VERSION_,
+			'iso_lang' => Tools::strtolower(isset($params['iso_lang']) ? $params['iso_lang'] : Context::getContext()->language->iso_code),
+			'iso_code' => Tools::strtolower(isset($params['iso_country']) ? $params['iso_country'] : Country::getIsoById(Configuration::get('PS_COUNTRY_DEFAULT'))),
+			'shop_url' => urlencode(isset($params['shop_url']) ? $params['shop_url'] : Tools::getShopDomain()),
+			'mail' => urlencode(isset($params['email']) ? $params['email'] : Configuration::get('email'))
 		);
 		foreach ($postDataArray as $postDataKey => $postDataValue)
 			$postData .= '&'.$postDataKey.'='.$postDataValue;
 		$postData = ltrim($postData, '&');
-		
+
 		// Config for each request
 		if ($request == 'native')
 		{
diff --git a/install-dev/controllers/http/process.php b/install-dev/controllers/http/process.php
index 047a84370..f9d98996f 100644
--- a/install-dev/controllers/http/process.php
+++ b/install-dev/controllers/http/process.php
@@ -331,8 +331,6 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 	 */
 	public function display()
 	{
-		$this->initializeContext();
-		
 		// The installer SHOULD take less than 32M, but may take up to 35/36M sometimes. So 42M is a good value :)
 		$low_memory = Tools::getMemoryLimit() < Tools::getOctets('42M');
 
@@ -361,8 +359,15 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 		$this->process_steps[] = $install_modules;
 		
 		$install_modules = array('key' => 'installModulesAddons', 'lang' => $this->l('Install modules Addons'));
+
+		$params = array('iso_lang' => $this->language->getLanguageIso(), 
+							'iso_country' => $this->session->shop_country, 
+							'email' => $this->session->admin_email, 
+							'shop_url' => Tools::getHttpHost(),
+							'version' => _PS_INSTALL_VERSION_);
+
 		if ($low_memory)
-			foreach ($this->model_install->getAddonsModulesList() as $module)
+			foreach ($this->model_install->getAddonsModulesList($params) as $module)
 				$install_modules['subtasks'][] = array('module' => (string)$module['name'], 'id_module' => (string)$module['id_module']);
 		$this->process_steps[] = $install_modules;
 
diff --git a/install-dev/models/install.php b/install-dev/models/install.php
index 2780f23de..ca62908fc 100644
--- a/install-dev/models/install.php
+++ b/install-dev/models/install.php
@@ -587,10 +587,10 @@ class InstallModelInstall extends InstallAbstractModel
 		return $modules;
 	}
 	
-	public function getAddonsModulesList()
+	public function getAddonsModulesList($params = array())
 	{
 		$addons_modules = array();
-		$content = Tools::addonsRequest('install-modules');
+		$content = Tools::addonsRequest('install-modules', $params);
 		$xml = @simplexml_load_string($content, null, LIBXML_NOCDATA);
 			
 		if ($xml !== false and isset($xml->module))

From b95e8e0bc95f3ac69058c48f499d280f12833169 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 16 Apr 2013 12:15:31 +0200
Subject: [PATCH 54/67] [-] BO : Remove typo in address formating fields links

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

diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php
index 00d1a8cd1..5a80556cd 100644
--- a/controllers/admin/AdminCountriesController.php
+++ b/controllers/admin/AdminCountriesController.php
@@ -442,7 +442,7 @@ class AdminCountriesControllerCore extends AdminController
 			$html .= '<li>
 				<a href="javascript:void(0);" onClick="displayAvailableFields(\''.$class_name.'\')">'.$class_name.'</a>';
 			foreach (AddressFormat::getValidateFields($class_name) as $name)
-				$fields[] = '<a style="color:#4B8;" href="javascript:void(0);" class="addPattern" '.$name.' id="'.($class_name == 'Address' ? $name : $class_name.':'.$name).'">
+				$fields[] = '<a style="color:#4B8;" href="javascript:void(0);" class="addPattern" id="'.($class_name == 'Address' ? $name : $class_name.':'.$name).'">
 					'.$name.'</a>';
 			$html .= '
 				<div class="availableFieldsList" id="availableListFieldsFor_'.$class_name.'" style="width:300px;">

From f6d97ea7bb778c3378d4ad10782ad6b9fe84ebb2 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 16 Apr 2013 14:08:51 +0200
Subject: [PATCH 55/67] [-] FO : address alias lost

---
 themes/default/address.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/default/address.tpl b/themes/default/address.tpl
index f193fec91..689440edd 100644
--- a/themes/default/address.tpl
+++ b/themes/default/address.tpl
@@ -220,7 +220,7 @@ $(function(){ldelim}
 		</p>
 		<p class="required text" id="adress_alias">
 			<label for="alias">{l s='Please assign an address title for future reference.'} <sup>*</sup></label>
-			<input type="text" id="alias" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else if isset($address->alias)}{$address->alias}{else if !isset($select_address)}{l s='My address'}{/if}" />
+			<input type="text" id="alias" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else if isset($address->alias)}{$address->alias}{elseif !$select_address}{l s='My address'}{/if}" />
 		</p>
 	</fieldset>
 	<p class="submit2">

From 0c85403f13323e446beee70324c8b690855884b2 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 16 Apr 2013 14:09:37 +0200
Subject: [PATCH 56/67] [-] FO : Disable confirm order when already clicked

---
 themes/default/js/order-opc.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/themes/default/js/order-opc.js b/themes/default/js/order-opc.js
index c053b38c2..162f95553 100644
--- a/themes/default/js/order-opc.js
+++ b/themes/default/js/order-opc.js
@@ -265,6 +265,7 @@ function confirmFreeOrder()
 	else
 		$('#opc_account-overlay').fadeIn('slow');
 	$('#opc_delivery_methods-overlay, #opc_payment_methods-overlay').fadeOut('slow');
+	$('#confirmOrder').attr('disabled', 'disabled');
 	$.ajax({
 		type: 'POST',
 		headers: { "cache-control": "no-cache" },
@@ -275,6 +276,7 @@ function confirmFreeOrder()
 		data: 'ajax=true&method=makeFreeOrder&token=' + static_token ,
 		success: function(html)
 		{
+			$('#confirmOrder').attr('disabled', '');
 			var array_split = html.split(':');
 			if (array_split[0] == 'freeorder')
 			{

From 3d8b28ac93755b4eff4800163788a4d5ce58bd34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Tue, 16 Apr 2013 14:14:04 +0200
Subject: [PATCH 57/67] [-] BO: Fix admin carts currency prices on view and
 listing

---
 controllers/admin/AdminCartsController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index 90a845d02..fc0cf91ce 100755
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -101,15 +101,15 @@ class AdminCartsControllerCore extends AdminController
 	{
 		if (!($cart = $this->loadObject(true)))
 			return;
-
 		$customer = new Customer($cart->id_customer);
+		$currency = new Currency($cart->id_currency);
 		$this->context->cart = $cart;
+		$this->context->currency = $currency;
 		$this->context->customer = $customer;
 		$products = $cart->getProducts();
 		$customized_datas = Product::getAllCustomizedDatas((int)$cart->id);
 		Product::addCustomizationPrice($products, $customized_datas);
 		$summary = $cart->getSummaryDetails();
-		$currency = new Currency($cart->id_currency);
 
 		/* Display order information */
 		$id_order = (int)Order::getOrderByCartId($cart->id);
@@ -739,6 +739,7 @@ class AdminCartsControllerCore extends AdminController
 	{
 		$context = Context::getContext();
 		$context->cart = new Cart($id_cart);
+		$context->currency = new Currency((int)$context->cart->id_currency);
 		$context->customer = new Customer((int)$context->cart->id_customer);
 		return Cart::getTotalCart($id_cart, true, Cart::BOTH_WITHOUT_SHIPPING);
 	}

From 0f98ff12e1993e22451ef61cc188c0dc68300c89 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 16 Apr 2013 15:00:24 +0200
Subject: [PATCH 58/67] [-] FO : empty cache getContextualValue_ when updating
 cart quantity

---
 classes/Cart.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/Cart.php b/classes/Cart.php
index 41a7e1d24..1ccb6a72b 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -953,6 +953,7 @@ class CartCore extends ObjectModel
 		$this->update(true);
 		$context = Context::getContext()->cloneContext();
 		$context->cart = $this;
+		Cache::clean('getContextualValue_*');
 		if ($auto_add_cart_rule)
 			CartRule::autoAddToCart($context);
 

From a40f61e922b7036549579caecd9ac215cc9decae Mon Sep 17 00:00:00 2001
From: ldecoker <info@ld-webdesign.be>
Date: Tue, 16 Apr 2013 18:34:20 +0300
Subject: [PATCH 59/67] ";" in wrong place

Should be after display but inside quotes
---
 .../template/controllers/attributes/helpers/form/form.tpl       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
index f5cc56a04..365736bbd 100644
--- a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
@@ -27,7 +27,7 @@
 
 {block name="label"}
 	{if $input.type == 'color'}
-		<div id="colorAttributeProperties" style="display:{if $colorAttributeProperties}block{else}none{/if}";>
+		<div id="colorAttributeProperties" style="display:{if $colorAttributeProperties}block{else}none{/if};">
 	{/if}
 	{$smarty.block.parent}
 {/block}

From 27212bd126b0660dc38cf876f2f42ed4bb47d8f6 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 16 Apr 2013 18:56:00 +0200
Subject: [PATCH 60/67] [-] CORE : Fix bug last part #PSCFV-8636, cart rule
 with a reduction and free shipping

---
 classes/Cart.php                  | 8 ++++++--
 classes/CartRule.php              | 2 +-
 classes/PaymentModule.php         | 5 +++--
 themes/default/js/cart-summary.js | 6 ++++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/classes/Cart.php b/classes/Cart.php
index 1ccb6a72b..0d7e4711a 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -2870,8 +2870,12 @@ class CartCore extends ObjectModel
 			{
 				$cart_rule['value_real'] -= $total_shipping;
 				$cart_rule['value_tax_exc'] -= $total_shipping_tax_exc;
-				$total_discounts -= $total_shipping;
-				$total_discounts_tax_exc -= $total_shipping_tax_exc;
+				$cart_rule['value_real'] = Tools::ps_round($cart_rule['value_real'], (int)$context->currency->decimals * _PS_PRICE_DISPLAY_PRECISION_);
+				$cart_rule['value_tax_exc'] = Tools::ps_round($cart_rule['value_tax_exc'], (int)$context->currency->decimals * _PS_PRICE_DISPLAY_PRECISION_);
+				if ($total_discounts > $cart_rule['value_real'])
+					$total_discounts -= $total_shipping;
+				if ($total_discounts_tax_exc > $cart_rule['value_tax_exc'])
+					$total_discounts_tax_exc -= $total_shipping_tax_exc;
 
 				// Update total shipping
 				$total_shipping = 0;
diff --git a/classes/CartRule.php b/classes/CartRule.php
index 228f15607..1b0177810 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -912,7 +912,7 @@ class CartRuleCore extends ObjectModel
 						if ($cart_vat_amount == 0 || $cart_amount_te == 0)
 							$cart_average_vat_rate = 0;
 						else
-							$cart_average_vat_rate = $cart_vat_amount / $cart_amount_te;
+							$cart_average_vat_rate = Tools::ps_round($cart_vat_amount / $cart_amount_te, 3);
 
 						if ($this->reduction_tax && !$use_tax)
 							$reduction_value += $prorata * $reduction_amount / (1 + $cart_average_vat_rate);
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 8a9f2e643..f23fd83b7 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -429,13 +429,14 @@ abstract class PaymentModuleCore extends Module
 
 							// Set the new voucher value
 							if ($voucher->reduction_tax)
-								$voucher->reduction_amount = $values['tax_incl'] - $order->total_products_wt;
+								$voucher->reduction_amount = $values['tax_incl'] - $order->total_products_wt - $order->total_shipping_tax_incl;
 							else
-								$voucher->reduction_amount = $values['tax_excl'] - $order->total_products;
+								$voucher->reduction_amount = $values['tax_excl'] - $order->total_products - $order->total_shipping_tax_excl;
 
 							$voucher->id_customer = $order->id_customer;
 							$voucher->quantity = 1;
 							$voucher->quantity_per_user = 1;
+							$voucher->free_shipping = 0;
 							if ($voucher->add())
 							{
 								// If the voucher has conditions, they are now copied to the new voucher
diff --git a/themes/default/js/cart-summary.js b/themes/default/js/cart-summary.js
index f4477fec2..c1c0ac3c7 100644
--- a/themes/default/js/cart-summary.js
+++ b/themes/default/js/cart-summary.js
@@ -655,9 +655,9 @@ function updateCartSummary(json)
 			location.reload();
 
 		if (priceDisplayMethod !== 0)
-			$('#total_discount').html(formatCurrency(json.total_discounts_tax_exc, currencyFormat, currencySign, currencyBlank));
+			$('#total_discount').html('-' + formatCurrency(json.total_discounts_tax_exc, currencyFormat, currencySign, currencyBlank));
 		else
-			$('#total_discount').html(formatCurrency(json.total_discounts, currencyFormat, currencySign, currencyBlank));
+			$('#total_discount').html('-' + formatCurrency(json.total_discounts, currencyFormat, currencySign, currencyBlank));
 
 		$('.cart_discount').each(function(){
 			var idElmt = $(this).attr('id').replace('cart_discount_','');
@@ -667,10 +667,12 @@ function updateCartSummary(json)
 				if (json.discounts[i].id_discount == idElmt)
 				{
 					if (json.discounts[i].value_real !== '!')
+					{
 						if (priceDisplayMethod !== 0)
 							$('#cart_discount_' + idElmt + ' td.cart_discount_price span.price-discount').html(formatCurrency(json.discounts[i].value_tax_exc * -1, currencyFormat, currencySign, currencyBlank));
 						else
 							$('#cart_discount_' + idElmt + ' td.cart_discount_price span.price-discount').html(formatCurrency(json.discounts[i].value_real * -1, currencyFormat, currencySign, currencyBlank));
+					}
 					toDelete = false;
 				}
 			if (toDelete)

From 9f9562f92ba616b293cab9f34a52ae05b1339fc6 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Wed, 17 Apr 2013 10:02:32 +0200
Subject: [PATCH 61/67] Merge Pull request #98 - Thanks to @phproberto

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

diff --git a/classes/Product.php b/classes/Product.php
index 379adb6dd..80944c55d 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -2139,7 +2139,10 @@ class ProductCore extends ObjectModel
 
 			$sql = 'SELECT p.*, product_shop.*, stock.`out_of_stock` out_of_stock, pl.`description`, pl.`description_short`,
 						pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`, pl.`name`,
-						p.`ean13`, p.`upc`, MAX(image_shop.`id_image`) id_image, il.`legend`
+						p.`ean13`, p.`upc`, MAX(image_shop.`id_image`) id_image, il.`legend`,
+						DATEDIFF(product_shop.`date_add`, DATE_SUB(NOW(),
+						INTERVAL '.(Validate::isUnsignedInt(Configuration::get('PS_NB_DAYS_NEW_PRODUCT')) ? Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20).'
+							DAY)) > 0 AS new
 					FROM `'._DB_PREFIX_.'product` p
 					LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (
 						p.`id_product` = pl.`id_product`

From 76f584a70d12e73998654a081b60f9c3df387461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Wed, 17 Apr 2013 11:39:11 +0200
Subject: [PATCH 62/67] // pscleaner clean address inversion between customers
 and manufacturers/suppliers

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

diff --git a/modules/pscleaner/pscleaner.php b/modules/pscleaner/pscleaner.php
index 353f82f4f..d091230fd 100644
--- a/modules/pscleaner/pscleaner.php
+++ b/modules/pscleaner/pscleaner.php
@@ -435,7 +435,7 @@ class PSCleaner extends Module
 				);
 				foreach ($tables as $table)
 					$db->execute('TRUNCATE TABLE `'._DB_PREFIX_.bqSQL($table).'`');
-				$db->execute('DELETE FROM `'._DB_PREFIX_.'address` WHERE id_customer > 0');
+				$db->execute('DELETE FROM `'._DB_PREFIX_.'address` WHERE id_manufacturer > 0 OR id_supplier > 0 OR id_warehouse > 0');
 
 				Image::deleteAllImages(_PS_PROD_IMG_DIR_);
 				if (!file_exists(_PS_PROD_IMG_DIR_))
@@ -488,7 +488,7 @@ class PSCleaner extends Module
 				);
 				foreach ($tables as $table)
 					$db->execute('TRUNCATE TABLE `'._DB_PREFIX_.bqSQL($table).'`');
-				$db->execute('DELETE FROM `'._DB_PREFIX_.'address` WHERE id_manufacturer > 0 OR id_supplier > 0');
+				$db->execute('DELETE FROM `'._DB_PREFIX_.'address` WHERE id_customer > 0');
 				break;
 		}
 	}

From a172632600e66f02dab46ff1aa1fb86d743694ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Wed, 17 Apr 2013 14:44:20 +0200
Subject: [PATCH 63/67] // Fix smarty cache after modules translation update

---
 classes/Language.php                              | 2 ++
 classes/Tools.php                                 | 2 +-
 controllers/admin/AdminTranslationsController.php | 9 ++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/classes/Language.php b/classes/Language.php
index 281343fed..3ce4b1908 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -801,6 +801,8 @@ class LanguageCore extends ObjectModel
 			$files_list = $gz->listContent();
 			if (!$gz->extract(_PS_TRANSLATIONS_DIR_.'../', false))
 				$errors[] = Tools::displayError('Cannot decompress the translation file for the following language: ').(string)$iso;
+			// Clear smarty modules cache
+			Tools::clearCache();
 			if (!Language::checkAndAddLanguage((string)$iso, $lang_pack, false, $params))
 				$errors[] = Tools::displayError('An error occurred while creating the language: ').(string)$iso;
 			else
diff --git a/classes/Tools.php b/classes/Tools.php
index 08705746b..49db8cd9e 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -2117,7 +2117,7 @@ exit;
 	 *
 	 * @param Smarty $smarty
 	 */
-	public static function clearCache($smarty, $tpl = false, $cache_id = null, $compile_id = null)
+	public static function clearCache($smarty = null, $tpl = false, $cache_id = null, $compile_id = null)
 	{
 		if (is_null($smarty))
 			$smarty = Context::getContext()->smarty;
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index a02e767dd..df8898e62 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -686,6 +686,9 @@ class AdminTranslationsControllerCore extends AdminController
 						if (pathinfo($file2check['filename'], PATHINFO_BASENAME) == 'index.php' && file_put_contents(_PS_TRANSLATIONS_DIR_.'../'.$file2check['filename'], Tools::getDefaultIndexContent()))
 							continue;
 
+					// Clear smarty modules cache
+					Tools::clearCache();
+
 					if (Validate::isLanguageFileName($filename))
 					{
 						if (!Language::checkAndAddLanguage($iso_code))
@@ -735,13 +738,14 @@ class AdminTranslationsControllerCore extends AdminController
 							$this->errors[] = Tools::displayError('The archive cannot be extracted.'). ' '.$error->message;
 						else
 						{
-
 							if (!Language::checkAndAddLanguage($arr_import_lang[0]))
 								$conf = 20;
 							else
 							{
 								// Reset cache 
 								Language::loadLanguages();
+								// Clear smarty modules cache
+								Tools::clearCache();
 
 								AdminTranslationsController::checkAndAddMailsFiles($arr_import_lang[0], $files_list);
 								if ($tab_errors = AdminTranslationsController::addNewTabs($arr_import_lang[0], $files_list))
@@ -1340,6 +1344,9 @@ class AdminTranslationsControllerCore extends AdminController
 						foreach ($arr_files as $value)
 							$this->findAndWriteTranslationsIntoFile($value['file_name'], $value['files'], $value['theme'], $value['module'], $value['dir']);
 
+						// Clear modules cache
+						Tools::clearCache();
+
 						// Redirect
 						if (Tools::getValue('submitTranslationsModulesAndStay'))
 							$this->redirect(true);

From 39e3b079dd6a66e85d9f1dc06a73c6102f552558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Wed, 17 Apr 2013 18:14:58 +0200
Subject: [PATCH 64/67] [-] FO: Add the protocol content to the cache id of 
 modules #PSCFV-8810

---
 classes/module/Module.php                   | 2 +-
 modules/blockcategories/blockcategories.php | 2 +-
 modules/blocksearch/blocksearch.php         | 6 ------
 modules/blocktopmenu/blocktopmenu.php       | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/classes/module/Module.php b/classes/module/Module.php
index 6958ed9df..2877c1bad 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -1597,7 +1597,7 @@ abstract class ModuleCore
 	{
 		if ($name === null)
 			$name = $this->name;
-		return $name.'|'.(int)$this->context->shop->id.'|'.(int)Group::getCurrent()->id.'|'.(int)$this->context->language->id;
+		return $name.'|'.(int)Tools::usingSecureMode().'|'.(int)$this->context->shop->id.'|'.(int)Group::getCurrent()->id.'|'.(int)$this->context->language->id;
 	}
 
 	public function display($file, $template, $cacheId = null, $compileId = null)
diff --git a/modules/blockcategories/blockcategories.php b/modules/blockcategories/blockcategories.php
index 767ad74f0..bdaca904e 100644
--- a/modules/blockcategories/blockcategories.php
+++ b/modules/blockcategories/blockcategories.php
@@ -227,7 +227,7 @@ class BlockCategories extends Module
 		$id_product = (int)Tools::getValue('id_product', 0);
 		$id_category = (int)Tools::getValue('id_category', 0);
 		$id_lang = (int)$this->context->language->id;
-		return 'blockcategories|'.$this->context->shop->id.'|'.$groups.'|'.$id_lang.'|'.$id_product.'|'.$id_category;
+		return 'blockcategories|'.(int)Tools::usingSecureMode().'|'.$this->context->shop->id.'|'.$groups.'|'.$id_lang.'|'.$id_product.'|'.$id_category;
 	}
 
 	public function hookFooter($params)
diff --git a/modules/blocksearch/blocksearch.php b/modules/blocksearch/blocksearch.php
index 1df62a660..48d1a70c1 100644
--- a/modules/blocksearch/blocksearch.php
+++ b/modules/blocksearch/blocksearch.php
@@ -117,11 +117,5 @@ public function hookDisplayMobileHeader($params)
 
 		return true;
 	}
-	
-	protected function getCacheId($name = null)
-	{
-		$cache_id = parent::getCacheId($name);
-		return $cache_id.'|'.(int)Tools::usingSecureMode();
-	}
 }
 
diff --git a/modules/blocktopmenu/blocktopmenu.php b/modules/blocktopmenu/blocktopmenu.php
index 8ead2c49c..a47f6cc35 100644
--- a/modules/blocktopmenu/blocktopmenu.php
+++ b/modules/blocktopmenu/blocktopmenu.php
@@ -717,7 +717,7 @@ class Blocktopmenu extends Module
 	{
 		parent::getCacheId($name);
 		$page_name = in_array($this->page_name, array('category', 'supplier', 'manufacturer', 'cms', 'product')) ? $this->page_name : 'index';
-		return 'blocktopmenu|'.$page_name.'|'.(int)$this->context->shop->id.'|'.implode(', ',$this->user_groups).'|'.(int)$this->context->language->id.'|'.(int)Tools::getValue('id_category').'|'.(int)Tools::getValue('id_manufacturer').'|'.(int)Tools::getValue('id_supplier').'|'.(int)Tools::getValue('id_cms').'|'.(int)Tools::getValue('id_product');
+		return 'blocktopmenu|'.(int)Tools::usingSecureMode().'|'.$page_name.'|'.(int)$this->context->shop->id.'|'.implode(', ',$this->user_groups).'|'.(int)$this->context->language->id.'|'.(int)Tools::getValue('id_category').'|'.(int)Tools::getValue('id_manufacturer').'|'.(int)Tools::getValue('id_supplier').'|'.(int)Tools::getValue('id_cms').'|'.(int)Tools::getValue('id_product');
 	}
 
 	public function hookDisplayTop($param)

From 859175dde1916462aee6ac8c4d768cc627fd7991 Mon Sep 17 00:00:00 2001
From: sLorenzini <sarah.lorenzini@prestashop.com>
Date: Thu, 18 Apr 2013 11:22:40 +0200
Subject: [PATCH 65/67] [-] FO: fixed some css bug for ie7

---
 themes/default/css/global.css  | 8 ++++++++
 themes/default/css/product.css | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/themes/default/css/global.css b/themes/default/css/global.css
index 804b0d47a..b5b23061e 100644
--- a/themes/default/css/global.css
+++ b/themes/default/css/global.css
@@ -20,6 +20,8 @@ sub{vertical-align:baseline}
 legend{color:#000}
 input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit}
 input,button,textarea,select{font-size:100%}
+
+.ie7 input, .ie7 select{line-height:18px}
 a {cursor:pointer}
 
 .clearfix:before,
@@ -345,6 +347,8 @@ ul.footer_links li .icon {
 #center_column .sortPagiBar p {padding:0;}
 #center_column .sortPagiBar form {display:inline-block;}
 
+.ie7 #center_column .sortPagiBar form {display:inline;}
+
 .sortPagiBar #productsSortForm {float:right;}
 	.sortPagiBar select#selectPrductSort {
 		margin:0 0 0 10px;
@@ -406,6 +410,10 @@ ul.pagination li.disabled span {color:#ccc}
 
 #pagination_previous {float:left}
 #pagination_next {float:right}
+
+.ie7 #pagination_previous,
+.ie7 #pagination_next {float:none}
+
 #pagination_previous a, #pagination_previous span,
 #pagination_next a, #pagination_next span {
 	padding:0 8px;
diff --git a/themes/default/css/product.css b/themes/default/css/product.css
index 32994d266..35b563544 100644
--- a/themes/default/css/product.css
+++ b/themes/default/css/product.css
@@ -169,7 +169,7 @@ span.view_scroll_spacer {
 	text-align:right;
 }
 
-.ie7 #pb-left-column #buy_block label {margin-right:5px}
+.ie7 #pb-left-column #buy_block label {margin-right:5px;float:left}
 
 /* short description pack */
 .short_description_pack {
@@ -196,7 +196,8 @@ span.view_scroll_spacer {
 
 .ie7 #attributes .attribute_list {
 	display:inline;
-	zoom:1
+	zoom:1;
+	float:right
 }
 
 #attributes .attribute_list ul{

From 5a815e7b1927b8bc75cd96bf9df219044b3bc1df Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Thu, 18 Apr 2013 11:26:50 +0200
Subject: [PATCH 66/67] [-] FO : Fix bug #PSCFV-8728 context country not
 updated after changing delivery address in OPC

---
 controllers/front/OrderOpcController.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index 225f0e30a..166afebeb 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -190,6 +190,13 @@ class OrderOpcControllerCore extends ParentOrderController
 									$this->context->cart->id_address_invoice = Tools::isSubmit('same') ? $this->context->cart->id_address_delivery : (int)(Tools::getValue('id_address_invoice'));
 									if (!$this->context->cart->update())
 										$this->errors[] = Tools::displayError('An error occurred while updating your cart.');
+										
+									$infos = Address::getCountryAndState((int)($this->context->cart->id_address_delivery));
+									if (isset($infos['id_country']) && $infos['id_country'])
+									{
+										$country = new Country((int)$infos['id_country']);
+										$this->context->country = $country;
+									}
 
 									// Address has changed, so we check if the cart rules still apply
 									CartRule::autoRemoveFromCart($this->context);

From be250c9eccc223c91786400e475bccb931804544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Thu, 18 Apr 2013 11:36:55 +0200
Subject: [PATCH 67/67] // Revert a93cfbec07432ce9104e32075eb5da3871899d85

---
 classes/controller/Controller.php | 4 ++--
 tools/profiling/Controller.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php
index 0d4591455..27ebaf040 100644
--- a/classes/controller/Controller.php
+++ b/classes/controller/Controller.php
@@ -175,8 +175,8 @@ abstract class ControllerCore
 			// then using displayAjax[action]
 			if ($this->ajax)
 			{
-				$action = Tools::toCamelCase(Tools::getValue('action', true));
-				if (!empty($action) && method_exists($this, $action))
+				$action = Tools::getValue('action');
+				if (!empty($action) && method_exists($this, 'displayAjax'.Tools::toCamelCase($action, true))) 
 					$this->{'displayAjax'.$action}();
 				elseif (method_exists($this, 'displayAjax'))
 					$this->displayAjax();
diff --git a/tools/profiling/Controller.php b/tools/profiling/Controller.php
index 923faccec..16aec04d7 100644
--- a/tools/profiling/Controller.php
+++ b/tools/profiling/Controller.php
@@ -227,8 +227,8 @@ abstract class Controller extends ControllerCore
 			// then using displayAjax[action]
 			if ($this->ajax)
 			{
-				$action = 'displayAjax'.Tools::toCamelCase(Tools::getValue('action', true));
-				if (!empty($action) && method_exists($this, $action))
+				$action = Tools::getValue('action');
+				if (!empty($action) && method_exists($this, 'displayAjax'.Tools::toCamelCase($action))) 
 					$this->{'displayAjax'.$action}();
 				elseif (method_exists($this, 'displayAjax'))
 					$this->displayAjax();