Add action to export directly to Excel xlsx files.

add PHPExcel to tools.
Merge pull request #691 from djfm/development
2013-09-23 20:37:46 +01:00 · 2013-09-23 19:01:59 +01:00 · 2013-09-23 07:51:57 -07:00 · 2013-09-23 11:36:15 +02:00 · 2013-09-23 11:24:26 +02:00 · 2013-09-23 11:24:14 +02:00
800 changed files with 121438 additions and 27662 deletions
@@ -1,80 +1,140 @@
-	- (d)oekia
-	- Alexander Otchenashev
-	- Benjamin PONGY
-	- Burhan
-	- Caleydon Media
-	- Damien Metzger
-	- DamienMetzger
-	- Damon Skelhorn
-	- Daniel
-	- David Gasperoni
-	- DrySs
-	- DrÿSs'
-	- François Gaillard
-	- Gabriel Schwardy
-	- Gregory Roussac
-	- Ha!*!*y
-	- Jonathan Danse
-	- Krystian Podemski
-	- Marco Cervellin
-	- Michel Courtade
-	- Milow
-	- Patanock
-	- Pierre
-	- PrestaEdit
-	- Raphaël Malié
-	- Rémi Gaillard
-	- Samy Rabih
-	- Sarah Lorenzini
-	- Shagshag
-	- Vincent Augagneur
-	- Xavier POITAU
-	- aFolletete
-	- aKorczak
-	- aNiassy
-	- adonis karavokyros
-	- anat
-	- bLeveque
-	- bMancone
-	- bumbu
-	- cmouleyre
-	- dMetzger
-	- dSevere
-	- djfm
-	- fBrignoli
-	- fSerny
-	- fram
-	- gBrunier
-	- gCharmes
-	- gPoulain
-	- gRoussac
-	- hAitmansour
-	- ivancasasempere
-	- jBreux
-	- jObregon
-	- jessylenne
-	- jmCollin
-	- kpodemski
-	- lBrieu
-	- lCherifi
-	- lLefevre
-	- mBertholino
-	- mDeflotte
-	- mMarinetti
-	- marcinsz101
-	- montes
-	- nPellicari
-	- nezenmoins
-	- oleacorner
-	- rGaillard
-	- rMalie
-	- rMontagne
-	- root
-	- sLorenzini
-	- sThiebaut
-	- tDidierjean
-	- vAugagneur
-	- vChabot
-	- vKham
-	- vSchoener
-
+- adonis karavokyros
+- aFolletete
+- Agence CINS
+- aKorczak
+- Alexander Otchenashev
+- anat
+- Andrew
+- aNiassy
+- antoniofr
+- AntonLejon
+- Arnaud Lemercier
+- Axome
+- Benjamin PONGY
+- BigZ
+- bLeveque
+- bMancone
+- bumbu
+- Burhan
+- Cédric Mouleyre
+- Caleydon Media
+- cam.lafit
+- Captain FLAM
+- Captain-FLAM
+- ccauw
+- ChristopheBoucaut
+- cippest
+- cmouleyre
+- Corentin Delcourt
+- Cosmin Hutanu
+- Damien Metzger
+- DamienMetzger
+- Damon Skelhorn
+- Daniel
+- David Gasperoni
+- Davy Rolink
+- djfm
+- dMetzger
+- (d)oekia
+- Dragan Skrbic
+- DrÿSs'
+- dreammeup
+- DrySs
+- dSevere
+- Edouard Gaulué
+- emily-d
+- Fabio Chelly
+- fBrignoli
+- fram
+- François Gaillard
+- fSerny
+- Gabriel Schwardy
+- gBrunier
+- gCharmes
+- gPoulain
+- Grégoire Bélorgey
+- Gregory Roussac
+- gRoussac
+- Guillaume DELOINCE
+- hAitmansour
+- Ha!*!*y
+- indesign47
+- inem0o
+- ivancasasempere
+- Jérôme Nadaud
+- jBreux
+- jeromenadaud
+- Jerome Nadaud
+- jessylenne
+- jmCollin
+- jObregon
+- Jonathan Danse
+- joseantgv
+- Kevin Granger
+- kpodemski
+- Krystian Podemski
+- lBrieu
+- lCherifi
+- ldecoker
+- lLefevre
+- marcinsz101
+- Marco Cervellin
+- Mats Rynge
+- MatthieuB
+- Maxence
+- mBertholino
+- mDeflotte
+- Michel Courtade
+- Milow
+- minic studio
+- misthero
+- mMarinetti
+- montes
+- nezenmoins
+- Nicolas Sorosac
+- Nils-Helge Garli Hegvik
+- nPellicari
+- nturato
+- oleacorner
+- Otto Nascarella
+- Patanock
+- PhpMadman
+- Pierre
+- Piotr Kaczor
+- Piotr Moćko
+- PrestaEdit
+- prestarocket
+- pxls
+- Rémi Gaillard
+- Raphaël Malié
+- raulgundin
+- rGaillard
+- Rimas Kudelis
+- rMalie
+- rMontagne
+- root
+- runningz
+- Sébastien
+- Sébastien Bocahu
+- Samy Rabih
+- Sarah Lorenzini
+- Seb
+- Seynaeve
+- Shagshag
+- sLorenzini
+- soware
+- Staging
+- sThiebaut
+- Sylvain WITMEYER
+- tDidierjean
+- vAugagneur
+- vChabot
+- Vincent Augagneur
+- Vincent Schoener
+- Vincent Terenti
+- vinvin27
+- vKham
+- vSchoener
+- Xavier
+- Xavier POITAU
+- Yoozio
@@ -2,47 +2,48 @@ README
 ======
 ![PrestaShop](http://www.prestashop.com/images/banners/general/prestashop_728x90.png "PrestaShop")

-PREPARATION
+ABOUT
 --------

-To install PrestaShop, you need a remote web server or on your computer (MAMP), with access to a database like MySQL.
-You'll need access to phpMyAdmin to create a database and to indicate the information in the database in the installer.
+PrestaShop is a free and open-source e-commerce web application, committed to providing the best shopping cart experience for both merchants and consumers.
+
+
+SERVER CONFIGURATION
+--------
+
+To install PrestaShop, you need a web server running PHP5 and any flavor of MySQL5 (MySQL, MariaDB, Percona Server...).
+You will also need a database administration tool, such as phpMyAdmin, in order to create a database for PrestaShop.
+We recommend the Apache or Nginx web servers.
+
+If your host does not offer PHP5 by default, here are a few [explanations][2] about PHP5 or the .htaccess file for certain hosting services (1&1, Free, Lycos, OVH, Infomaniak, Amen, GoDaddy, etc).
+
+If you want your online store ready to go, visit [http://www.prestabox.com][1]: it lets you create your online store in less than 10 minutes without any technical knowledge.

-If you do not host and unable to create your store, we offer a turnkey store, which lets you create your online store in less than 10 minutes without any technical knowledge.
-We invite you to visit: [http://www.prestabox.com][1]

 INSTALLATION
 --------

-Simply go to your PrestaShop web directory and use installer :-)
+With your web browser, go to the root of your PrestaShop directory, and the installer will start. Follow the instructions until PrestaShop is installed.

-If you have any PHP error, perhaps you don't have PHP5 or you need to activate it on your web host.
-Please go to our forum to find pre-installation settings (PHP 5, htaccess) for certain hosting services (1&1, Free, Lycos, OVH, Infomaniak, Amen, GoDaddy, etc).
+If you have any PHP error, perhaps you don't have PHP5 or you need to activate it on your web host. See the page linked above.
+If you don't find any solution to start the installer, please post on [the PrestaShop forums][3].

-English webhost [specifics settings][2]
-
-
-If you don't find any solution to launch installer, please post on [our forum][3]
-
-
-There are always solutions for your issues ;-)

 DOCUMENTATION
 --------

-For any extra documentation (how-to), please read our [Online documentation][4]
+The official PrestaShop documentation is available online [on its own website][4].


 FORUMS
 --------

-You can also discuss, help and contribute with PrestaShop community on [our forums][5]
+You can discuss, help and contribute with PrestaShop community on [the PrestaShop forums][5].

-
-Thanks for downloading and using PrestaShop e-commerce Open-source solution!
+Thank you for downloading and using PrestaShop e-commerce Open-source solution!

 [1]: http://www.prestabox.com
 [2]: http://www.prestashop.com/forums/topic/2946-pre-installation-settings-php-5-htaccess-for-certain-hosting-services/
 [3]: http://www.prestashop.com/forums/forum/7-installing-prestashop/
 [4]: http://doc.prestashop.com
-[5]: http://www.prestashop.com/forums/
+[5]: http://www.prestashop.com/forums/
@@ -26,45 +26,12 @@

 define('_PS_ADMIN_DIR_', getcwd());
 include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
+
 /* Getting cookie or logout */
 require_once(_PS_ADMIN_DIR_.'/init.php');

 $context = Context::getContext();

-if (Tools::isSubmit('changeParentUrl'))
-	echo '<script type="text/javascript">parent.parent.document.location.href = "'.addslashes(urldecode(Tools::getValue('changeParentUrl'))).'";</script>';
-if (Tools::isSubmit('installBoughtModule'))
-{
-	$file = false;
-	while ($file === false OR file_exists(_PS_MODULE_DIR_.$file))
-		$file = uniqid();
-	$file = _PS_MODULE_DIR_.$file.'.zip';
-	$sourceFile = 'http://addons.prestashop.com/iframe/getboughtfile.php?id_order_detail='.Tools::getValue('id_order_detail').'&token='.Tools::getValue('token');
-	if (!copy($sourceFile, $file))
-	{
-		if (!($content = file_get_contents($sourceFile)))
-			die(displayJavascriptAlert('Access denied: Please download your module directly from PrestaShop Addons website'));
-		elseif (!file_put_contents($file, $content))
-			die(displayJavascriptAlert('Local error: your module directory is not writable'));
-	}
-	$first6 = fread($fd = fopen($file, 'r'), 6);
-	if (!strncmp($first6, 'Error:', 6))
-	{
-		$displayJavascriptAlert = displayJavascriptAlert(fread($fd, 1024));
-		fclose($fd);
-		unlink($file);
-		die($displayJavascriptAlert);
-	}
-	fclose($fd);
-	if (!Tools::ZipExtract($file, _PS_MODULE_DIR_))
-	{
-		unlink($file);
-		die(displayJavascriptAlert('Cannot unzip file'));
-	}
-	unlink($file);
-	die(displayJavascriptAlert('Module copied to disk'));
-}
-
 if (Tools::isSubmit('ajaxReferrers'))
 {
 	require(_PS_CONTROLLER_DIR_.'admin/AdminReferrersController.php');
@@ -101,39 +68,6 @@ if (Tools::isSubmit('ajaxProductPackItems'))
 	die('['.implode(',', $jsonArray).']');
 }

-if (Tools::isSubmit('ajaxStates') AND Tools::isSubmit('id_country'))
-{
-	$states = Db::getInstance()->executeS('
-	SELECT s.id_state, s.name
-	FROM '._DB_PREFIX_.'state s
-	LEFT JOIN '._DB_PREFIX_.'country c ON (s.`id_country` = c.`id_country`)
-	WHERE s.id_country = '.(int)(Tools::getValue('id_country')).' AND s.active = 1 AND c.`contains_states` = 1
-	ORDER BY s.`name` ASC');
-
-	if (is_array($states) AND !empty($states))
-	{
-		$list = '';
-		if (Tools::getValue('no_empty') != true)
-		{
-			$empty_value = (Tools::isSubmit('empty_value')) ? Tools::getValue('empty_value') : '----------';
-			$list = '<option value="0">'.Tools::htmlentitiesUTF8($empty_value).'</option>'."\n";
-		}
-
-		foreach ($states AS $state)
-			$list .= '<option value="'.(int)($state['id_state']).'"'.((isset($_GET['id_state']) AND $_GET['id_state'] == $state['id_state']) ? ' selected="selected"' : '').'>'.$state['name'].'</option>'."\n";
-	}
-	else
-		$list = 'false';
-
-	die($list);
-}
-
-if (Tools::getValue('form_language_id'))
-{
-	if (!($context->cookie->employee_form_lang = (int)(Tools::getValue('form_language_id'))))
-		die ('Error while updating cookie.');
-	die ('Form language updated.');
-}

 if (Tools::isSubmit('submitTrackClickOnHelp'))
 {
@@ -144,15 +78,6 @@ if (Tools::isSubmit('submitTrackClickOnHelp'))
        HelpAccess::trackClick($label, $version);
 }

-if (Tools::isSubmit('toggleScreencast'))
-{
-	if (Validate::isLoadedObject($context->employee))
-	{
-		$context->employee->bo_show_screencast = !$context->employee->bo_show_screencast;
-		$context->employee->update();
-	}
-}
-
 if (Tools::isSubmit('getChildrenCategories') && Tools::isSubmit('id_category_parent'))
 {
 	$children_categories = Category::getChildrenWithNbSelectedSubCat(Tools::getValue('id_category_parent'), Tools::getValue('selectedCat'), Context::getContext()->language->id, null, Tools::getValue('use_shop_context'));
@@ -200,17 +125,6 @@ if (Tools::isSubmit('getParentCategoriesId') && $id_category = Tools::getValue('
 	die(Tools::jsonEncode($output));
 }

-/* Update attribute */
-if (Tools::isSubmit('ajaxUpdateTaxRule'))
-{
-	$id_tax_rule = Tools::getValue('id_tax_rule');
-	$tax_rules = new TaxRule((int)$id_tax_rule);
-	$output = array();
-	foreach ($tax_rules as $key => $result)
-		$output[$key] = $result;
-	die(Tools::jsonEncode($output));
-}
-
 if (Tools::isSubmit('getZones'))
 {
 	$zones = Zone::getZones();
@@ -223,8 +137,3 @@ if (Tools::isSubmit('getZones'))
 	$array = array('hasError' => false, 'errors' => '', 'data' => $html);
 	die(Tools::jsonEncode($html));
 }
-
-function displayJavascriptAlert($s)
-{
-	echo '<script type="text/javascript">alert(\''.addslashes($s).'\');</script>';
-}
@@ -37,7 +37,6 @@ $height = Tools::getValue('height');
 $id_employee = Tools::getValue('id_employee');
 $id_lang = Tools::getValue('id_lang');

-
 if (!isset($cookie->id_employee) || !$cookie->id_employee  || $cookie->id_employee != $id_employee)
    die(Tools::displayError());
    
@@ -47,6 +46,51 @@ if (!Validate::isModuleName($module))
 if (!Tools::file_exists_cache($module_path = dirname(__FILE__).'/../modules/'.$module.'/'.$module.'.php'))
 	die(Tools::displayError());

+$shop_id = '';
+Shop::setContext(Shop::CONTEXT_ALL);
+if (Context::getContext()->cookie->shopContext)
+{
+	$split = explode('-', Context::getContext()->cookie->shopContext);
+	if (count($split) == 2)
+	{
+		if ($split[0] == 'g')
+		{
+			if (Context::getContext()->employee->hasAuthOnShopGroup($split[1]))
+				Shop::setContext(Shop::CONTEXT_GROUP, $split[1]);
+			else
+			{
+				$shop_id = Context::getContext()->employee->getDefaultShopID();
+				Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
+			}
+		}
+		else if (Shop::getShop($split[1]) && Context::getContext()->employee->hasAuthOnShop($split[1]))
+		{
+			$shop_id = $split[1];
+			Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
+		}
+		else
+		{
+			$shop_id = Context::getContext()->employee->getDefaultShopID();
+			Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
+		}
+	}
+}
+
+// Check multishop context and set right context if need
+if (Shop::getContext())
+{
+	if (Shop::getContext() == Shop::CONTEXT_SHOP && !Shop::CONTEXT_SHOP)
+		Shop::setContext(Shop::CONTEXT_GROUP, Shop::getContextShopGroupID());
+	if (Shop::getContext() == Shop::CONTEXT_GROUP && !Shop::CONTEXT_GROUP)
+		Shop::setContext(Shop::CONTEXT_ALL);
+}
+
+// Replace existing shop if necessary
+if (!$shop_id)
+	Context::getContext()->shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
+elseif (Context::getContext()->shop->id != $shop_id)
+	Context::getContext()->shop = new Shop($shop_id);
+
 require_once($module_path);

 $graph = new $module();
@@ -57,4 +101,3 @@ if ($option)

 $graph->create($render, $type, $width, $height, $layers);
 $graph->draw();
-
@@ -30,14 +30,14 @@ echo '			</div>
 			<div id="footer">
 				<div style="float:left;margin-left:10px;padding-top:6px">
 					<a href="http://www.prestashop.com/" target="_blank" style="font-weight:700;color:#666666">PrestaShop&trade; '._PS_VERSION_.'</a><br />
-					<span style="font-size:10px">'.translate('Load time:').' '.number_format(microtime(true) - $timerStart, 3, '.', '').'s</span>
+					<span style="font-size:10px">'.Translate::getAdminTranslation('Load time:').' '.number_format(microtime(true) - $timerStart, 3, '.', '').'s</span>
 				</div>
 				<div style="float:right;height:40px;margin-right:10px;line-height:38px;vertical-align:middle">';
 if (strtoupper(Context::getContext()->language->iso_code) == 'FR') echo '<span style="color: #812143; font-weight: bold;">Questions / Renseignements / Formations :</span> <strong>+33 (0)1.40.18.30.04</strong> de 09h &agrave; 18h ';

-echo '				| <a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">'.translate('Contact').'</a>
-					| <a href="http://forge.prestashop.com" target="_blank" class="footer_link">'.translate('Bug Tracker').'</a>
-					| <a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">'.translate('Forum').'</a>	
+echo '				| <a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">'.Translate::getAdminTranslation('Contact').'</a>
+					| <a href="http://forge.prestashop.com" target="_blank" class="footer_link">'.Translate::getAdminTranslation('Bug Tracker').'</a>
+					| <a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">'.Translate::getAdminTranslation('Forum').'</a>	
 				</div>
 			</div>
 		</div>
@@ -223,8 +223,16 @@ function checkPSVersion()
 	return $upgrader->checkPSVersion();
 }

+/**
+ * Deprecated since > 1.5.4.1
+ * Use Translate::getAdminTranslation($string) instead
+ *
+ * @param string $string
+ */
 function translate($string)
 {
+	Tools::displayAsDeprecated();
+	
 	global $_LANGADM;
 	if (!is_array($_LANGADM))
 		return str_replace('"', '&quot;', $string);
@@ -233,7 +241,6 @@ function translate($string)
 	return str_replace('"', '&quot;', stripslashes($str));
 }

-
 /**
 * Returns a new Tab object
 *
@@ -461,7 +468,7 @@ function runAdminTab($tab, $ajaxMode = false)
 				echo '<div class="path_bar">
 			<div id="help-button" class="floatr" style="display: none; font-family: Verdana; font-size: 10px; margin-right: 4px; margin-top: 4px;">
 			</div>
-				<a href="?token='.Tools::getAdminToken($tab.intval(Tab::getIdFromClassName($tab)).(int)Context::getContext()->employee->id).'">'.translate('Back Office').'</a>
+				<a href="?token='.Tools::getAdminToken($tab.intval(Tab::getIdFromClassName($tab)).(int)Context::getContext()->employee->id).'">'.Translate::getAdminTranslation('Back Office').'</a>
 				'.$bread.'</div>';

 			if (!$ajaxMode && Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL && Context::getContext()->controller->multishop_context != Shop::CONTEXT_ALL)
@@ -470,10 +477,10 @@ function runAdminTab($tab, $ajaxMode = false)
 				if (Shop::getContext() == Shop::CONTEXT_GROUP)
 				{
 					$shop_group = new ShopGroup((int)Shop::getContextShopGroupID());
-					printf(translate('You are configuring your store for group shop %s'), '<b>'.$shop_group->name.'</b>');
+					printf(Translate::getAdminTranslation('You are configuring your store for group shop %s'), '<b>'.$shop_group->name.'</b>');
 				}
 				elseif (Shop::getContext() == Shop::CONTEXT_SHOP)
-					printf(translate('You are configuring your store for shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
+					printf(Translate::getAdminTranslation('You are configuring your store for shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
 				echo '</div>';
 			}
 			if (Validate::isLoadedObject($adminObj))
@@ -546,8 +553,8 @@ function runAdminTab($tab, $ajaxMode = false)


 						// we can display the correct url
-						// die(Tools::jsonEncode(array(translate('Invalid security token'),$url)));
-						die(Tools::jsonEncode(translate('Invalid security token')));
+						// die(Tools::jsonEncode(array(Translate::getAdminTranslation('Invalid security token'),$url)));
+						die(Tools::jsonEncode(Translate::getAdminTranslation('Invalid security token')));
 					}
 					else
 					{
@@ -559,17 +566,17 @@ function runAdminTab($tab, $ajaxMode = false)
 						if (false === strpos($url, '?token=') AND false === strpos($url, '&token='))
 							$url .= '&token='.$adminObj->token;

-						$message = translate('Invalid security token');
+						$message = Translate::getAdminTranslation('Invalid security token');
 						echo '<html><head><title>'.$message.'</title></head><body style="font-family:Arial,Verdana,Helvetica,sans-serif;background-color:#EC8686">
 							<div style="background-color:#FAE2E3;border:1px solid #000000;color:#383838;font-weight:700;line-height:20px;margin:0 0 10px;padding:10px 15px;width:500px">
 								<img src="../img/admin/error2.png" style="margin:-4px 5px 0 0;vertical-align:middle">
 								'.$message.'
 							</div>';
 						echo '<a href="'.htmlentities($url).'" method="get" style="float:left;margin:10px">
-								<input type="button" value="'.Tools::htmlentitiesUTF8(translate('I understand the risks and I really want to display this page')).'" style="height:30px;margin-top:5px" />
+								<input type="button" value="'.Tools::htmlentitiesUTF8(Translate::getAdminTranslation('I understand the risks and I really want to display this page')).'" style="height:30px;margin-top:5px" />
 							</a>
 							<a href="index.php" method="get" style="float:left;margin:10px">
-								<input type="button" value="'.Tools::htmlentitiesUTF8(translate('Take me out of here!')).'" style="height:40px" />
+								<input type="button" value="'.Tools::htmlentitiesUTF8(Translate::getAdminTranslation('Take me out of here!')).'" style="height:40px" />
 							</a>
 						</body></html>';
 						die;
@@ -50,6 +50,53 @@ if (!Validate::isModuleName($module))
 if (!Tools::file_exists_cache($module_path = dirname(__FILE__).'/../modules/'.$module.'/'.$module.'.php'))
 	die(Tools::displayError());

+	
+$shop_id = '';
+Shop::setContext(Shop::CONTEXT_ALL);
+if (Context::getContext()->cookie->shopContext)
+{
+	$split = explode('-', Context::getContext()->cookie->shopContext);
+	if (count($split) == 2)
+	{
+		if ($split[0] == 'g')
+		{
+			if (Context::getContext()->employee->hasAuthOnShopGroup($split[1]))
+				Shop::setContext(Shop::CONTEXT_GROUP, $split[1]);
+			else
+			{
+				$shop_id = Context::getContext()->employee->getDefaultShopID();
+				Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
+			}
+		}
+		else if (Shop::getShop($split[1]) && Context::getContext()->employee->hasAuthOnShop($split[1]))
+		{
+			$shop_id = $split[1];
+			Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
+		}
+		else
+		{
+			$shop_id = Context::getContext()->employee->getDefaultShopID();
+			Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
+		}
+	}
+}
+
+// Check multishop context and set right context if need
+if (Shop::getContext())
+{
+	if (Shop::getContext() == Shop::CONTEXT_SHOP && !Shop::CONTEXT_SHOP)
+		Shop::setContext(Shop::CONTEXT_GROUP, Shop::getContextShopGroupID());
+	if (Shop::getContext() == Shop::CONTEXT_GROUP && !Shop::CONTEXT_GROUP)
+		Shop::setContext(Shop::CONTEXT_ALL);
+}
+
+// Replace existing shop if necessary
+if (!$shop_id)
+	Context::getContext()->shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
+elseif (Context::getContext()->shop->id != $shop_id)
+	Context::getContext()->shop = new Shop($shop_id);
+	
+	
 require_once($module_path);

 $grid = new $module();
@@ -41,7 +41,7 @@ echo '
 		<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/plugins/cluetip/jquery.cluetip.css" />
 		<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/css/admin.css" />
 		<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/plugins/chosen/jquery.chosen.css" />
-		<title>PrestaShop&trade; - '.translate('Administration panel').'</title>
+		<title>PrestaShop&trade; - '.Translate::getAdminTranslation('Administration panel').'</title>
 		<script type="text/javascript">
 			var helpboxes = '.Configuration::get('PS_HELPBOX').';
 			var roundMode = '.Configuration::get('PS_PRICE_ROUND_MODE').';
@@ -78,7 +78,7 @@ echo '
 						html = "";
 						nb_notifs = 0;
 						$.each(json.order, function(property, value) {
-							html += "<li>'.translate('A new order has been made on your shop.').'<br />'.translate('Order number : ').'<strong>#" + parseInt(value.id_order) + "</strong><br />'.translate('Total : ').'<strong>" + value.total_paid_real + "</strong><br />'.translate('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'&vieworder&id_order=" + parseInt(value.id_order) + "\">'.translate('Click here to see that order').'</a></li>";
+							html += "<li>'.Translate::getAdminTranslation('A new order has been made on your shop.').'<br />'.Translate::getAdminTranslation('Order number : ').'<strong>#" + parseInt(value.id_order) + "</strong><br />'.Translate::getAdminTranslation('Total : ').'<strong>" + value.total_paid_real + "</strong><br />'.Translate::getAdminTranslation('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'&vieworder&id_order=" + parseInt(value.id_order) + "\">'.Translate::getAdminTranslation('Click here to see that order').'</a></li>";
 						});

 						if (html != "")
@@ -99,7 +99,7 @@ echo '
 						html = "";
 						nb_notifs = 0;
 						$.each(json.customer, function(property, value) {
-							html += "<li>'.translate('A new customer registered on your shop.').'<br />'.translate('Customer name : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'&viewcustomer&id_customer=" + parseInt(value.id_customer) + "\">'.translate('Click here to see that customer').'</a></li>";
+							html += "<li>'.Translate::getAdminTranslation('A new customer registered on your shop.').'<br />'.Translate::getAdminTranslation('Customer name : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'&viewcustomer&id_customer=" + parseInt(value.id_customer) + "\">'.Translate::getAdminTranslation('Click here to see that customer').'</a></li>";
 						});
 						if (html != "")
 						{
@@ -121,7 +121,7 @@ echo '
 						html = "";
 						nb_notifs = 0;
 						$.each(json.customer_message, function(property, value) {
-							html += "<li>'.translate('A new message posted on your shop.').'<br />'.translate('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'&viewcustomer_thread&id_customer_thread=" + parseInt(value.id_customer_thread) + "\">'.translate('Click here to see that message').'</a></li>";
+							html += "<li>'.Translate::getAdminTranslation('A new message posted on your shop.').'<br />'.Translate::getAdminTranslation('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'&viewcustomer_thread&id_customer_thread=" + parseInt(value.id_customer_thread) + "\">'.Translate::getAdminTranslation('Click here to see that message').'</a></li>";
 						});

 						if (html != "")
@@ -149,14 +149,14 @@ echo '
 			if (Shop::isFeatureActive())
 			{
 				if (Shop::getContext() == Shop::CONTEXT_ALL)
-					$youEditFieldFor = translate('A modification of this field will be applied for all shops');
+					$youEditFieldFor = Translate::getAdminTranslation('A modification of this field will be applied for all shops');
 				elseif (Shop::getContext() == Shop::CONTEXT_GROUP)
 				{
 					$shop_group = new ShopGroup((int)Shop::getContextShopGroupID());
-					$youEditFieldFor = sprintf(translate('A modification of this field will be applied for all shops of group %s'), '<b>'.$shop_group->name.'</b>');
+					$youEditFieldFor = sprintf(Translate::getAdminTranslation('A modification of this field will be applied for all shops of group %s'), '<b>'.$shop_group->name.'</b>');
 				}
 				else
-					$youEditFieldFor = sprintf(translate('A modification of this field will be applied for the shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
+					$youEditFieldFor = sprintf(Translate::getAdminTranslation('A modification of this field will be applied for the shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
 				echo 'hints.html(hints.html()+\'<br /><span class="red">'.addslashes($youEditFieldFor).'</span>\');';
 			}

@@ -202,10 +202,10 @@ echo '		var html = "";
 				{
 					echo '<div id="orders_notif" class="notifs"><span id="orders_notif_number_wrapper" class="number_wrapper"><span id="orders_notif_value">0</span></span>
 							<div id="orders_notif_wrapper" class="notifs_wrapper">
-								<h3>'.translate('Last orders').'</h3>
-								<p class="no_notifs">'.translate('No new orders has been made on your shop').'</p>
+								<h3>'.Translate::getAdminTranslation('Last orders').'</h3>
+								<p class="no_notifs">'.Translate::getAdminTranslation('No new orders has been made on your shop').'</p>
 								<ul id="list_orders_notif"></ul>
-								<p><a href="index.php?tab=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'">'.translate('Show all orders').'</a></p>
+								<p><a href="index.php?tab=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'">'.Translate::getAdminTranslation('Show all orders').'</a></p>
 							</div>
 						</div>';
 				}
@@ -213,10 +213,10 @@ echo '		var html = "";
 				{
 					echo '<div id="customers_notif" class="notifs notifs_alternate"><span id="customers_notif_number_wrapper" class="number_wrapper"><span id="customers_notif_value">0</span></span>
 							<div id="customers_notif_wrapper" class="notifs_wrapper">
-								<h3>'.translate('Last customers').'</h3>
-								<p class="no_notifs">'.translate('No new customers registered on your shop').'</p>
+								<h3>'.Translate::getAdminTranslation('Last customers').'</h3>
+								<p class="no_notifs">'.Translate::getAdminTranslation('No new customers registered on your shop').'</p>
 								<ul id="list_customers_notif"></ul>
-								<p><a href="index.php?tab=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'">'.translate('Show all customers').'</a></p>
+								<p><a href="index.php?tab=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'">'.Translate::getAdminTranslation('Show all customers').'</a></p>
 							</div>
 						</div>';
 				}
@@ -224,26 +224,26 @@ echo '		var html = "";
 				{
 					echo '<div id="customer_messages_notif" class="notifs"><span id="customer_messages_notif_number_wrapper" class="number_wrapper"><span id="customer_messages_notif_value">0</span></span>
 							<div id="customer_messages_notif_wrapper" class="notifs_wrapper">
-								<h3>'.translate('Last messages').'</h3>
-								<p class="no_notifs">'.translate('No new messages posted on your shop').'</p>
+								<h3>'.Translate::getAdminTranslation('Last messages').'</h3>
+								<p class="no_notifs">'.Translate::getAdminTranslation('No new messages posted on your shop').'</p>
 								<ul id="list_customer_messages_notif"></ul>
-								<p><a href="index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'">'.translate('Show all messages').'</a></p>
+								<p><a href="index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'">'.Translate::getAdminTranslation('Show all messages').'</a></p>
 							</div>
 						</div>';
 				}
-	echo		'</div>
+	echo			'</div>
 	
 	<div id="employee_box">
 				<div id="employee_infos">
-					<div class="employee_name">'.translate('Welcome,').' <strong>'.Context::getContext()->employee->firstname.'&nbsp'.Context::getContext()->employee->lastname.'</strong></div>
+					<div class="employee_name">'.Translate::getAdminTranslation('Welcome,').' <strong>'.Context::getContext()->employee->firstname.'&nbsp'.Context::getContext()->employee->lastname.'</strong></div>
 					<div class="clear"></div>
 					<ul id="employee_links">
-						<li><a href="'.htmlentities(Context::getContext()->link->getAdminLink('AdminEmployees'), ENT_COMPAT, 'UTF-8').'&id_employee={$employee->id}&amp;updateemployee">'.translate('My preferences').'</a></li>
+						<li><a href="'.htmlentities(Context::getContext()->link->getAdminLink('AdminEmployees'), ENT_COMPAT, 'UTF-8').'&id_employee={$employee->id}&amp;updateemployee">'.Translate::getAdminTranslation('My preferences').'</a></li>
 						<li class="separator">&nbsp;</li>
-						<li><a id="header_logout" href="index.php?logout">'.translate('logout').'</a></li>
+						<li><a id="header_logout" href="index.php?logout">'.Translate::getAdminTranslation('logout').'</a></li>
 					</ul>';
 					if (defined(_PS_BASE_URL_))
-						echo '<a href="'._PS_BASE_URL_.'" id="header_foaccess" target="_blank" title="'.translate('View my shop').'">'.translate('View my shop').'</a>';
+						echo '<a href="'._PS_BASE_URL_.'" id="header_foaccess" target="_blank" title="'.Translate::getAdminTranslation('View my shop').'">'.Translate::getAdminTranslation('View my shop').'</a>';
 				echo '</div>
 			</div>
 			
@@ -252,18 +252,18 @@ echo '		var html = "";
 				<form method="post" action="index.php?controller=AdminSearch&amp;token='.Tools::getAdminTokenLite('AdminSearch').'">
 					<input type="text" name="bo_query" id="bo_query" value="'.Tools::safeOutput(Tools::stripslashes(Tools::getValue('bo_query'))).'" />
 					<select name="bo_search_type" id="bo_search_type" class="chosen no-search">
-						<option value="0">'.translate('everywhere').'</option>
-						<option value="1" '.(Tools::getValue('bo_search_type') == 1 ? 'selected="selected"' : '').'>'.translate('catalog').'</option>
-						<optgroup label="'.translate('customers').':">
-							<option value="2" '.(Tools::getValue('bo_search_type') == 2 ? 'selected="selected"' : '').'>'.translate('by name').'</option>
-							<option value="6" '.(Tools::getValue('bo_search_type') == 6 ? 'selected="selected"' : '').'>'.translate('by ip address').'</option>
+						<option value="0">'.Translate::getAdminTranslation('everywhere').'</option>
+						<option value="1" '.(Tools::getValue('bo_search_type') == 1 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('catalog').'</option>
+						<optgroup label="'.Translate::getAdminTranslation('customers').':">
+							<option value="2" '.(Tools::getValue('bo_search_type') == 2 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('by name').'</option>
+							<option value="6" '.(Tools::getValue('bo_search_type') == 6 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('by ip address').'</option>
 						</optgroup>
-						<option value="3" '.(Tools::getValue('bo_search_type') == 3 ? 'selected="selected"' : '').'>'.translate('orders').'</option>
-						<option value="4" '.(Tools::getValue('bo_search_type') == 4 ? 'selected="selected"' : '').'>'.translate('invoices').'</option>
-						<option value="5" '.(Tools::getValue('bo_search_type') == 5 ? 'selected="selected"' : '').'>'.translate('carts').'</option>
-						<option value="7" '.(Tools::getValue('bo_search_type') == 7 ? 'selected="selected"' : '').'>'.translate('modules').'</option>
+						<option value="3" '.(Tools::getValue('bo_search_type') == 3 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('orders').'</option>
+						<option value="4" '.(Tools::getValue('bo_search_type') == 4 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('invoices').'</option>
+						<option value="5" '.(Tools::getValue('bo_search_type') == 5 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('carts').'</option>
+						<option value="7" '.(Tools::getValue('bo_search_type') == 7 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('modules').'</option>
 					</select>
-					<input type="submit" id="bo_search_submit" class="button" value="'.translate('Search').'"/>
+					<input type="submit" id="bo_search_submit" class="button" value="'.Translate::getAdminTranslation('Search').'"/>
 				</form>
 			</div>
 			<div id="header_quick">
@@ -277,7 +277,7 @@ echo '		var html = "";
 				}
 				</script>
 				<select onchange="quickSelect(this);" id="quick_select">
-					<option value="0">'.translate('Quick Access').'</option>';
+					<option value="0">'.Translate::getAdminTranslation('Quick Access').'</option>';
 foreach (QuickAccess::getQuickAccesses(Context::getContext()->language->id) AS $quick)
 {
 	preg_match('/controller=(.+)(&.+)?$/', $quick['link'], $adminTab);
@@ -342,8 +342,8 @@ echo '
 				<div id="main">
 				<div id="content">'
 			.(file_exists(_PS_ADMIN_DIR_.'/../install') ? '<div style="background-color: #FFEBCC;border: 1px solid #F90;line-height: 20px;margin: 0px 0px 10px;padding: 10px 20px;">'
-				.translate('For security reasons, you must also:').' '.
-				translate('delete the /install folder').
+				.Translate::getAdminTranslation('For security reasons, you must also:').' '.
+				Translate::getAdminTranslation('delete the /install folder').
 				'</div>' : '').'
 				';
 				if(defined('_PS_MODE_DEV_') && _PS_MODE_DEV_)
@@ -352,7 +352,7 @@ echo '
 if (Shop::isFeatureActive() && Context::getContext()->controller->multishop_context != Shop::CONTEXT_ALL)
 {
   echo '<div class="multishop_toolbar">
-        <span class="text_multishop">'.translate('Multistore configuration for').'</span>'.
+        <span class="text_multishop">'.Translate::getAdminTranslation('Multistore configuration for').'</span>'.
 		Helper::renderShopList();
    echo '</div>';
 }
@@ -30,6 +30,7 @@ select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disab

 /*BUTTON*/
 .button{
+	cursor: pointer;
 	background: #e3e3e3 url('../img/bg-button-degrade.png') repeat-x scroll left top;
 	background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
 	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
@@ -231,6 +232,7 @@ a.module_toggle_all{color: #268CCD;}
 .toolbarBox .process-icon-save-and-preview { background-image: url('../img/process-icon-preview.png');}
 .toolbarBox .process-icon-import { background-image: url('../img/process-icon-export-csv.png');}
 .toolbarBox .process-icon-export { background-image: url('../img/process-icon-export-csv.png');}
+.toolbarBox .process-icon-export-excel { background-image: url('../img/process-icon-export-csv.png');}
 .toolbarBox .process-icon-export-all { background-image: url('../img/process-icon-export-csv-details.png');}
 .toolbarBox .process-icon-export-stock-state-quantities-csv { background-image: url('../img/process-icon-export-csv.png');}
 .toolbarBox .process-icon-export-stock-state-prices-csv { background-image: url('../img/process-icon-export-csv-details.png');}
@@ -673,4 +675,4 @@ ul.listForm li {padding-bottom:3px;}

 /************** SCENE *****************/

-#large_scene_image{clear:both;border:1px solid transparent;}
+#large_scene_image{clear:both;border:1px solid transparent;}
@@ -27,13 +27,7 @@

 {block name="label"}
 	{if $input.name == 'vat_number'}
-		{if $vat == 'is_applicable'}
-			<div id="vat_area" style="display: visible">
-		{else if $vat == 'management'}
-			<div id="vat_area" style="display: hidden">
-		{else}
-			<div style="display: none;">
-		{/if}
+		<div id="vat_area" style="display: visible">
 	{/if}

 	{if $input.type == 'text_customer' && !isset($customer)}
@@ -72,7 +66,8 @@
 						{
 							if (msg)
 							{
-								var infos = msg.infos.split('_');
+								var infos = msg.infos.replace("\\'", "'").split('_');
+
 								$('input[name=firstname]').val(infos[0]);
 								$('input[name=lastname]').val(infos[1]);
 								$('input[name=company]').val(infos[2]);
@@ -29,6 +29,9 @@
 	{if $input.type == 'color'}
 		<div id="colorAttributeProperties" style="display:{if $colorAttributeProperties}block{else}none{/if};">
 	{/if}
+	{if $input.type == 'closediv'}
+		</div>
+	{/if}
 	{$smarty.block.parent}
 {/block}

@@ -24,15 +24,34 @@
 *}
 {extends file="helpers/form/form.tpl"}
 {block name="script"}
-	var string_price = '{l s="Will be applied when the price will be:" js=1}';
-	var string_weight = '{l s="Will be applied when the weight will be:" js=1}';
+	var string_price = '{l s='Will be applied when the price is' js=1}';
+	var string_weight = '{l s='Will be applied when the weight is' js=1}';
 {/block}

 {block name="field"}
 	{if $input.name == 'zones'}
+		<div class="ranges_not_follow warn" style="display:none">
+			<label>{l s="Ranges are not correctly ordered:"}</label>
+			<a href="#" onclick="checkRangeContinuity(true); return false;" class="button" style="text-decoration:none">{l s="Reordering"}</a>
+		</div>
 		{include file='controllers/carrier_wizard/helpers/form/form_ranges.tpl'}
+		<!--
+<div class="validate_range" style="display:none">
+			<a href="#" class="button" id="validate_range_button">{l s="Validate"}</a>
+		</div>
+-->
 		<div class="new_range">
-			<a href="#" onclick="add_new_range();return false;" class="button" id="add_new_range">{l s="Add new range"}<img src="../img/admin/add.gif"/></a>
+			<a href="#" onclick="add_new_range();return false;" class="button" id="add_new_range">{l s='Add new range'}</a>
+		</div>
+	{/if}
+	{if $input.name == 'logo'}
+		<div class="margin-form">
+			<input id="carrier_logo_input" type="file" onchange="uploadCarrierLogo();" name="carrier_logo_input" />
+			<input type="hidden" id="logo" name="logo" value="" />
+			<p class="preference_description">
+				{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"} {l s='MB max.'}
+				<br />{l s='Current size:'} <span id="carrier_logo_size">{l s='undefined'}</span>.
+			</p>
 		</div>
 	{/if}
 	{$smarty.block.parent}
@@ -1,43 +1,48 @@
+		<script>var zones_nbr = {$zones|count +3} ; /*corresponds to the third input text (max, min and all)*/</script>
 		<div style="float:left" id="zone_ranges">
 			<table cellpadding="5" cellspacing="0" id="zones_table">
 				<tr class="range_inf">
 					<td class="range_type"></td>
-					<td class="border_left border_bottom">>=</td>
+					<td class="border_left border_bottom range_sign">>=</td>
 					{foreach from=$ranges key=r item=range}
-						<td class="border_bottom center"><input name="range_inf[{$range.id_range|intval}]" type="text" value="{$range.delimiter1|string_format:"%.6f"}" /></td>
+						<td class="border_bottom center"><input name="range_inf[{$range.id_range|intval}]" type="text" value="{$range.delimiter1|string_format:"%.6f"}" /><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
 					{foreachelse}
-						<td class="border_bottom center"><input name="range_inf[{$range.id_range|intval}]" type="text" /></td>
+						<td class="border_bottom center"><input name="range_inf[{$range.id_range|intval}]" type="text" /><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
 					{/foreach}
 				</tr>
 				<tr class="range_sup">
 					<td class="center range_type"></td>
-					<td class="border_left "><</td>
+					<td class="border_left range_sign"><</td>
 					{foreach from=$ranges key=r item=range}
-						<td class="center"><input name="range_sup[{$range.id_range|intval}]" type="text" value="{$range.delimiter2|string_format:"%.6f"}" /></td>
+						<td class="center"><input name="range_sup[{$range.id_range|intval}]" type="text" {if isset($form_id) && !$form_id} value="" {else} value="{if isset($change_ranges) && $range.id_range == 0} {else}{$range.delimiter2|string_format:"%.6f"}{/if}" {/if}/><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
 					{foreachelse}
-						<td class="center"><input name="range_sup[{$range.id_range|intval}]" type="text" /></td>
+						<td class="center"><input name="range_sup[{$range.id_range|intval}]" type="text" /><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
 					{/foreach}
 				</tr>
 				<tr class="fees_all">
 					<td class="border_top border_bottom border_bold"><span class="fees_all" {if $ranges|count == 0}style="display:none" {/if}>All</span></td>
-					<td></td>
+					<td><input type="checkbox" onclick="checkAllZones(this);" ></td>
 					{foreach from=$ranges key=r item=range}
-						<td class="center border_top border_bottom">
-							<input type="text" />
+						<td class="center border_top border_bottom {if $range.id_range != 0} validated {/if}"  >
+							<input type="text" {if isset($form_id) &&  !$form_id} disabled="disabled"{/if} {if $range.id_range == 0} style="display:none"{/if} /><span class="currency_sign" {if $range.id_range == 0} style="display:none" {/if}>&nbsp; {$currency_sign}</span>
 						</td>
 					{foreachelse}
 						<td class="center border_top border_bottom">
-							<input style="display:none" type="text" />
-							<button class="button">{l s="Validate"}</button>
+							<input style="display:none" type="text"  /><span class="currency_sign" style="display:none">&nbsp; {$currency_sign}</span>
 						</td>
 					{/foreach}
 				</tr>
 				{foreach from=$zones key=i item=zone}
 				<tr class="fees {if $i is odd}alt_row{/if}" data-zoneid="{$zone.id_zone}">
-					<td>{$zone.name}</td>
-					<td class="zone"><input class="input_zone" name="zone_{$zone.id_zone}" value="1" type="checkbox" {if isset($fields_value[$input.name][$zone.id_zone])} checked="checked"{/if}/></td>
+					<td><label for="zone_{$zone.id_zone}">{$zone.name}</label></td>
+					<td class="zone">
+						<input class="input_zone" id="zone_{$zone.id_zone}" name="zone_{$zone.id_zone}" value="1" type="checkbox" {if isset($fields_value['zones'][$zone.id_zone]) && $fields_value['zones'][$zone.id_zone]} checked="checked"{/if}/>
+					</td>
 					{foreach from=$ranges key=r item=range}
-						<td class="center"><input name="fees[{$zone.id_zone|intval}][{$range.id_range|intval}]" type="text" value="{if isset($price_by_range[$range.id_range][$zone.id_zone])} {$price_by_range[$range.id_range][$zone.id_zone]|string_format:"%.6f"} {/if}" /></td>
+						<td class="center">
+							<input name="fees[{$zone.id_zone|intval}][{$range.id_range|intval}]" type="text" 
+							{if !isset($fields_value['zones'][$zone.id_zone]) || (isset($fields_value['zones'][$zone.id_zone]) && !$fields_value['zones'][$zone.id_zone])} disabled="disabled"{/if} {if isset($price_by_range[$range.id_range][$zone.id_zone]) && $price_by_range[$range.id_range][$zone.id_zone] && isset($fields_value['zones'][$zone.id_zone]) && $fields_value['zones'][$zone.id_zone]} value="{$price_by_range[$range.id_range][$zone.id_zone]|string_format:'%.6f'}" {else} value="" {/if} /> &nbsp; {$currency_sign}
+						</td>
 					{/foreach}
 				</tr>
 				{/foreach}
@@ -48,7 +53,7 @@
 						{if $smarty.foreach.ranges.first}
 							<td class="center">&nbsp;</td>
 						{else}
-							<td class="center"><button class="button">{l s="Delete"}</button</td>
+							<td class="center"><button class="button">{l s='Delete'}</button</td>
 						{/if}
 					{/foreach}
 				</tr>
@@ -29,12 +29,19 @@
 	var labelNext = '{$labels.next|addslashes}';
 	var labelPrevious = '{$labels.previous|addslashes}';
 	var	labelFinish = '{$labels.finish|addslashes}';
-	var	labelDelete = '{l s="Delete" js=1}';
-	var	labelValidate = '{l s="Validate" js=1}';
+	var	labelDelete = '{l s='Delete' js=1}';
+	var	labelValidate = '{l s='Validate' js=1}';
 	var validate_url = '{$validate_url|addslashes}';
 	var carrierlist_url = '{$carrierlist_url|addslashes}';
 	var nbr_steps = {$wizard_steps.steps|count};
 	var enableAllSteps = {if $enableAllSteps|intval == 1}true{else}false{/if};
+	var need_to_validate = '{l s='Please validate the last range before create a new one.' js=1}';
+	var delete_range_confirm = '{l s='Are you sure to delete this range ?' js=1}';
+	var currency_sign = '{$currency_sign}';
+	var PS_WEIGHT_UNIT = '{$PS_WEIGHT_UNIT}';
+	var invalid_range = '{l s='This range is not valid' js=1}';
+	var range_is_overlapping = '{l s='Ranges are overlapping' js=1}';
+	var multistore_enable = '{$multistore_enable}';
 </script>
 <div id="carrier_wizard" class="swMain">
 	<ul class="nbr_steps_{$wizard_steps.steps|count}">
@@ -51,7 +58,7 @@
 	{/foreach}
 	</ul>
 	{foreach from=$wizard_contents.contents key=step_nbr item=content}
-		<div id="step-{$step_nbr + 1}" style="padding-bottom:10px"> 	
+		<div id="step-{$step_nbr + 1}" class="step_container"> 	
 			{$content}
 		</div>
 	{/foreach}
@@ -23,25 +23,18 @@
 *	International Registered Trademark & Property of PrestaShop SA
 *}

-<div id="carrier_logo_block" style="position:absolute;top:15px;right:15px">
-	<img id="carrier_logo_img" src="{if $carrier_logo}{$carrier_logo}{else}../img/404.gif{/if}" />
-	<p>
-		<input id="carrier_logo_input" type="file" onchange="uploadCarrierLogo();" name="carrier_logo_input" />
-		<input type="hidden" id="logo" name="logo" value="" />
-	</p>
+<div id="carrier_logo_block">
+	<img id="carrier_logo_img" src="{if $carrier_logo}{$carrier_logo}{else}../img/admin/carrier-default.jpg{/if}" />
+	<br/>
 	<a id="carrier_logo_remove" {if !$carrier_logo}style="display:none"{/if} href="javascript:removeCarrierLogo();"><img src="../img/admin/disabled.gif" /> {l s='Remove the logo'}</a>
-	<p>
-		{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"} {l s='MB max.'}
-		<br />{l s='Current size:'} <span id="carrier_logo_size">{l s='undefined'}</span>.
-	</p>
 </div>

 <script type="text/javascript">
-	var carrier_translation_undefined = '{l s='undefined' js='1'}';
+	var carrier_translation_undefined = '{l s='undefined' js=1}';

 	function removeCarrierLogo()
 	{
-		$('#carrier_logo_img').attr('src', '../img/404.gif');
+		$('#carrier_logo_img').attr('src', '../img/admin/carrier-default.jpg');
 		$('#logo').val('null');
 		fixCarrierLogoDisplay();
 		$('#carrier_logo_remove').hide();
@@ -24,40 +24,45 @@
 *}

 <script type="text/javascript">
-	var summary_translation_undefined = '{l s='[undefined]' js='1'}';
-	
-	var summary_translation_meta_informations = '{l s='This carrier is @s1 and display to the customers the following delay: @s2.' js='1'}';
-	var summary_translation_free = '<strong>{l s='free' js='1'}</strong>';
-	var summary_translation_paid = '<strong>{l s='paid' js='1'}</strong>';
-	
-	var summary_translation_range = '{l s='This carrier can deliver orders from @s1 to @s2. If the order is out of range, the behavior is to @s3.' js='1'}';
-	
-	var summary_translation_shipping_cost = '{l s='The shipping cost is calculated @s1 and the tax rule @s2 is applied.' js='1'}';
-	var summary_translation_price = '<strong>{l s='according to the price' js='1'}</strong>';
-	var summary_translation_weight = '<strong>{l s='according to the weight' js='1'}</strong>';
+	var summary_translation_undefined = '{l s='[undefined]' js=1}';
+	var summary_translation_meta_informations = '{l s='This carrier is @s1 and the delivery announced is: @s2.' js=1}';
+	var summary_translation_free = '<strong>{l s='free' js=1}</strong>';
+	var summary_translation_paid = '<strong>{l s='not free' js=1}</strong>';
+	var summary_translation_range = '<span class="is_free">{l s='This carrier can deliver orders from @s1 to @s2.' js=1}</span>';
+	var summary_translation_range_limit =  '{l s='If the order is out of range, the behavior is to @s3.' js=1}';
+	var summary_translation_shipping_cost = '{l s='The shipping cost is calculated @s1 and the tax rule @s2 will be applied.' js=1}';
+	var summary_translation_price = '<strong>{l s='according to the price' js=1}</strong>';
+	var summary_translation_weight = '<strong>{l s='according to the weight' js=1}</strong>';
 </script>
+<div class="defaultForm">
+	<fieldset>
+		{l s='Carrier name:'} <strong id="summary_name"></strong>
+		<div class="clear">&nbsp;</div>
+		<div id="summary_meta_informations"></div>
+		<div class="clear">&nbsp;</div>
+		<div id="summary_shipping_cost"></div>
+		<div class="clear">&nbsp;</div>
+		<div id="summary_range"></div>
+		<div class="clear">&nbsp;</div>
+		<div>
+			{l s='This carrier will be proposed for those delivery zones:'}
+			<ul id="summary_zones"></ul>
+		</div>
+		<div class="clear">&nbsp;</div>
+		<div>
+			{l s='And it will be proposed for those client groups:'}
+			<ul id="summary_groups"></ul>
+		</div>
+		{if $is_multishop}
+		<div class="clear">&nbsp;</div>
+		<div>
+			{l s='Finally, this carrier will be proposed in those shops:'}
+			<ul id="summary_shops"></ul>
+		</div>
+		{/if}
+		<div class="clear">&nbsp;</div>
+		{$active_form}
+	</fieldset>
+	</div>
+<div class="clear">&nbsp;</div>

-<fieldset>
-	{l s='Carrier name:'} <strong id="summary_name"></strong>
-	<div class="clear">&nbsp;</div>
-	<div id="summary_meta_informations"></div>
-	<div class="clear">&nbsp;</div>
-	<div id="summary_shipping_cost"></div>
-	<div class="clear">&nbsp;</div>
-	<div id="summary_range"></div>
-	<div class="clear">&nbsp;</div>
-	<div>
-		{l s='It will be displayed only for the following zones:'}
-		<ul id="summary_zones"></ul>
-	</div>
-	<div class="clear">&nbsp;</div>
-	<div>
-		{l s='It will be displayed only for the following groups:'}
-		<ul id="summary_groups"></ul>
-	</div>
-	<div class="clear">&nbsp;</div>
-	<div>
-		{l s='It will be displayed only for the following shops:'}
-		<ul id="summary_shops"></ul>
-	</div>
-</fieldset>
@@ -34,7 +34,7 @@
 					{if $shared_category}
 						<p class="warn">{l s='If you delete this picture, it will be deleted in all of your shared shops!'}</p>
 					{/if}
-					<br>
+					<br />
 					<a href="{$current}&{$identifier}={$form_id}&token={$token}&{if $shared_category}forcedeleteImage=1{else}deleteImage=1{/if}">
 						<img src="../img/admin/delete.gif" alt="{l s='Delete'}" /> {l s='Delete'}
 					</a>
@@ -71,4 +71,4 @@
 			<span>{$input.customer}</span><br />
 		</p>
 	{/if}
-{/block}
+{/block}
@@ -35,7 +35,7 @@
 {/block}
 {block name=leadin}
 	{if isset($delete_customer) && $delete_customer}
-		<form action="{$REQUEST_URI}" method="post">
+		<form action="{$REQUEST_URI|escape:'htmlall':'UTF-8'}" method="post">
 			<div class="warn">
 				<h2>{l s='How do you want to delete these customer(s)?'}</h2>
 				<p>{l s='There are two ways of deleting a customer. Please choose your preferred method.'}</p>
@@ -52,10 +52,10 @@
 				{foreach $POST as $key => $value}
 					{if is_array($value)}
 						{foreach $value as $val}
-							<input type="hidden" name="{$key}[]" value="{$val}" />
+							<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}[]" value="{$val|escape:'htmlall':'UTF-8'}" />
 						{/foreach}
 					{else}
-						<input type="hidden" name="{$key}" value="{$value}" />
+						<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}" value="{$value|escape:'htmlall':'UTF-8'}" />
 					{/if}
 				{/foreach}
 				<br /><input type="submit" class="button" value="{l s='Delete'}" />
@@ -149,7 +149,7 @@
 	</div>
 	
 	<div style="width:50%;float:left;">
-		<div style="margin-left:15px;"
+		<div style="margin-left:15px;">
 			<h2>{l s='Vouchers'} ({count($discounts)})</h2>
 			{if count($discounts)}
 				<table cellspacing="0" cellpadding="0" class="table">
@@ -488,4 +488,4 @@
 	</div>
 {/block}
 </div>	
-<div class="clear">&nbsp;</div>
+<div class="clear">&nbsp;</div>
@@ -48,11 +48,11 @@
 		<script type="text/javascript">
 		$(document).ready(function() {
 			$("#group_discount_category").fancybox({
-				onStart: function () {
+				beforeLoad: function () {
 					$('#group_discount_category_fancybox').show();
 					initFancyBox();
 				},
-				onClosed: function () {
+				beforeClose: function () {
 					$('#group_discount_category_fancybox').hide();
 				}
 			});
@@ -106,7 +106,7 @@
 				if ($(this).attr('name') == 'category_reduction['+$('[name="id_category"]:checked').val()+']')
 				{
 					exist = true;
-					jAlert('{l s='This category already exists for this group.' js='1'}');
+					jAlert('{l s='This category already exists for this group.' js=1}');
 					return false;
 				}
 			});
@@ -268,4 +268,4 @@
 	{else}
 		{$smarty.block.parent}
 	{/if}
-{/block}
+{/block}
@@ -58,6 +58,7 @@
 		</ul>
 	</fieldset>
 	<h2>{l s='Members of this customer group'}</h2>
+	<p>{l s='Limited to the 100th first customers.'} {l s='Please use filters to narrow your search.'}</p>
 	{$customerList}

 {/block}
@@ -110,14 +110,14 @@ $(document).ready(function() {
 		</ul>

 	<div id="partner_preactivation">
-		<p class="center"><img src="../img/loader.gif" alt="" /></p>
+		<p class="center"><img src="../img/loader.gif" alt="" /> {l s='Loading...'}</p>
 	</div>

 	<div class="separation"></div>


 	{$tips_optimization}
-	<div id="discover_prestashop"><p class="center"><img src="../img/loader.gif" alt="" />{l s='Loading...'}</p></div>
+	<div id="discover_prestashop"><p class="center"><img src="../img/loader.gif" alt="" /> {l s='Loading...'}</p></div>

 	{hook h="displayAdminHomeInfos"}
 	{hook h="displayBackOfficeHome"} {*old name of the hook*}
@@ -212,7 +212,7 @@ $(document).ready(function() {
 		{
 			// don't show/hide screencast if it's deactivated
 			{if $employee->bo_show_screencast}
-			$('#adminpresentation').fadeOut('slow');
+				$('#adminpresentation').fadeOut('slow');
 			{/if}
 			$('#partner_preactivation').fadeOut('slow');
 			$('#discover_prestashop').fadeOut('slow');
@@ -223,7 +223,7 @@ $(document).ready(function() {
 		$.fancybox(
 			this.href,
 			{
-				'width'				: 	660,
+				'width'				: 	920,
 				'height'			: 	384,
 				'transitionIn'		: 'none',
 				'transitionOut'		: 'none',
@@ -1,8 +1,8 @@
 {*
 * 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:
@@ -10,72 +10,25 @@
 * 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
 *}
-
 {include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
 <div class="leadin">{block name="leadin"}{/block}</div>
-
 {if $module_confirmation}
 	<div class="module_confirmation conf confirm">
 		{l s='Your .CSV file has been sucessfully imported into your shop.'}
 	</div>
 {/if}
-
-<script type="text/javascript">
-
-	var truncateAuthorized = {$truncateAuthorized|intval};
-
-	$(document).ready(function(){
-		activeClueTip();
-		$("a#upload_file_import_link").fancybox({
-				'titleShow' : false,
-				'transitionIn' : 'elastic',
-				'transitionOut' : 'elastic'
-		});
-
-		$('#preview_import').submit(function(e) {
-			if ($('#truncate').get(0).checked)
-			{
-				console.log(truncateAuthorized);
-				if (truncateAuthorized)
-				{
-					if (!confirm('{l s='Are you sure that you would like to delete this' js=1}' + ' ' + $.trim($('#entity > option:selected').text().toLowerCase()) + '?'))
-					{
-						e.preventDefault();
-					}
-				}
-				else
-				{
-					jAlert('{l s='You do not have permission to delete here. When the multistore is enabled, only a SuperAdmin can delete all items before an import.' js='1'}');
-					return false;
-				}
-			}
-		});
-	});
-
-	function activeClueTip()
-	{
-		$('.info_import').cluetip({
-			splitTitle: '|',
-		    showTitle: false
-	 	});
-	};
-</script>
-
-{** 
- * Upload fancybox 
- *}
 <div style="display: none">
 	<div id="upload_file_import" style="padding-left: 10px; background-color: #EBEDF4; border: 1px solid #CCCED7">
 		<div class="clear">&nbsp;</div>
@@ -97,28 +50,16 @@
 		</form>
 	</div>
 </div>
-
 <div class="clear">&nbsp;</div>
-
-{** 
- * Import fieldset 
- *}
-<form id="preview_import"
-	action="{$current}&token={$token}"
-	method="post"
-	style="display:inline"
-	enctype="multipart/form-data"
-	class="clear">
-	
+<form id="preview_import" action="{$current}&token={$token}" method="post" style="display:inline" enctype="multipart/form-data" class="clear">
 	<fieldset style="float: left; margin: 0pt 20px 0pt 0pt; width: 70%;">
 		<legend><img src="../img/admin/import.gif" />{l s='Import   '}</legend>
-
 			<label class="clear">{if count($files_to_import) > 1}{l s='Your CSV file (%d files):' sprintf=count($files_to_import)}{else}{l s='Your CSV file (%d file):' sprintf=count($files_to_import)}{/if}</label>
 			<div class="margin-form">
 				{if count($files_to_import)}
 					<select name="csv">
 						{foreach $files_to_import AS $filename}
-							<option value="{$filename}">{$filename}</option>
+							<option value="{$filename}"{if $csv_selected == $filename} selected="selected"{/if}>{$filename}</option>
 						{/foreach}
 					</select>
 				{/if}
@@ -146,13 +87,12 @@
 			<div class="margin-form">
 				<select name="entity" id="entity">
 					{foreach $entities AS $entity => $i}
-						<option value="{$i}" {if $entity == $i}selected="selected"{/if}>
+						<option value="{$i}"{if $entity_selected == $i} selected="selected"{/if}>
 							{$entity}
 						</option>
 					{/foreach}
 				</select>
 			</div>
-				
 			<label class="clear">{l s='Language of the file'}</label>
 			<div class="margin-form">
 				<select name="iso_lang">
@@ -180,14 +120,18 @@
 			<div class="margin-form">
 				<input name="truncate" id="truncate" type="checkbox"/>
 			</div>
-				<label for="match_ref" class="clear" style="display: none">{l s='Use product reference as key?'}</label>
+			<label for="regenerate" class="clear">{l s='No thumbnails regeneration'}</label>
 			<div class="margin-form">
-				<input name="match_ref" id="match_ref" type="checkbox" style="margin-top: 6px; display:none"/>
+				<input name="regenerate" id="regenerate" type="checkbox" />
 			</div>
 			<label for="forceIDs" class="clear">{l s='Force all ID\'s during import?'} </label>
 			<div class="margin-form">
 				<input name="forceIDs" id="forceIDs" type="checkbox"/> {l s='If you don\'t use this option, all ID\'s will be auto-incremented.'}
 			</div>
+			<label for="match_ref" class="clear" style="display: none">{l s='Use product reference as key?'}</label>
+			<div class="margin-form">
+				<input name="match_ref" id="match_ref" type="checkbox" style="margin-top: 6px; display:none"/>
+			</div>
 			<div class="space margin-form">
 				<input type="submit" name="submitImportFile" value="{l s='Next step'}" class="button" {if empty($files_to_import)}disabled{/if}/>
 				{if empty($files_to_import)}<span style="color:red;">{l s='You must upload a file in order to proceed to the next step'}</span>{/if}
@@ -210,13 +154,10 @@
 		{/if}
 	</fieldset>
 </form>
-
 <fieldset style="display:block;">
-
 	<legend>
 		<img src="../img/admin/import.gif" />{l s='Available fields'}
 	</legend>
-
 	<div id="availableFields">
 		{$available_fields}
 	</div>
@@ -224,74 +165,88 @@
 	<div class="clear">
 		<br /><br />{l s='* Required field'}
 	</div>
-
 </fieldset>
-		
 <div class="clear">&nbsp;</div>
-
 <script type="text/javascript">
-	$("select#entity").change( function() {
-
-		if ($("#entity > option:selected").val() == 7 || $("#entity > option:selected").val() == 8)
-		{
-			$("label[for=truncate],#truncate").hide();
-		}
-		else
-			$("label[for=truncate],#truncate").show();
-
-
-		if ($("#entity > option:selected").val() == 8)
-		{
-			$(".import_supply_orders_details").show();
-			$('input[name=multiple_value_separator]').val('|');
-		}
-		else
-		{
-			$(".import_supply_orders_details").hide();
-			$('input[name=multiple_value_separator]').val(',');
-		}
-		
-		
-		if ($("#entity > option:selected").val() == 1)
-		{
-			$("label[for=match_ref],#match_ref").show();
-		}
-		else
-			$("label[for=match_ref],#match_ref").hide();
-
-		if ($("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 0)
-		{
-			$(".import_products_categories").show();
-		}
-		else
-			$(".import_products_categories").hide();
-
-		if ($("#entity > option:selected").val() == 0 || $("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 3 || $("#entity > option:selected").val() == 5 || $("#entity > option:selected").val() == 6)
-			$("label[for=forceIDs],#forceIDs").show();
-		else
-			$("label[for=forceIDs],#forceIDs").hide();
-
-		$("#entitie").html($("#entity > option:selected").text().toLowerCase());
-		$.ajax({
-			url: 'ajax.php',
-			data: {
-				getAvailableFields:1,
-				entity: $("#entity").val()
-			},
-			dataType: 'json',
-			success: function(j) {
-				var fields = "";
-				$("#availableFields").empty();
-				
-				for (var i = 0; i < j.length; i++)
-					fields += j[i].field;
-
-				$("#availableFields").html(fields);
-				activeClueTip();
-			},
-			error: function(j) {		
-			}			
+	$(document).ready(function(){
+		var truncateAuthorized = {$truncateAuthorized|intval};
+		activeClueTip();
+		$("a#upload_file_import_link").fancybox({
+				'titleShow' : false,
+				'transitionIn' : 'elastic',
+				'transitionOut' : 'elastic'
 		});

+		$('#preview_import').submit(function(e){
+			if ($('#truncate').get(0).checked)
+				if (truncateAuthorized)
+				{
+					if (!confirm('{l s='Are you sure that you would like to delete this' js=1}' + ' ' + $.trim($('#entity > option:selected').text().toLowerCase()) + '?'))
+						e.preventDefault();
+				}
+				else
+				{
+					jAlert('{l s='You do not have permission to delete here. When the multistore is enabled, only a SuperAdmin can delete all items before an import.' js=1}');
+					return false;
+				}
+		});
+
+		$("select#entity").change(function(){
+			if ($("#entity > option:selected").val() == 7 || $("#entity > option:selected").val() == 8)
+				$("label[for=truncate],#truncate").hide();
+			else
+				$("label[for=truncate],#truncate").show();
+	
+			if ($("#entity > option:selected").val() == 8)
+			{
+				$(".import_supply_orders_details").show();
+				$('input[name=multiple_value_separator]').val('|');
+			}
+			else
+			{
+				$(".import_supply_orders_details").hide();
+				$('input[name=multiple_value_separator]').val(',');
+			}
+			if ($("#entity > option:selected").val() == 1)
+				$("label[for=match_ref], #match_ref, label[for=regenerate], #regenerate").show();
+			else
+				$("label[for=match_ref], #match_ref, label[for=regenerate], #regenerate").hide();
+			if ($("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 0)
+				$(".import_products_categories, label[for=regenerate], #regenerate").show();
+			else
+				$(".import_products_categories, label[for=regenerate], #regenerate").hide();
+			if ($("#entity > option:selected").val() == 0 || $("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 3 || $("#entity > option:selected").val() == 5 || $("#entity > option:selected").val() == 6)
+				$("label[for=forceIDs], #forceIDs").show();
+			else
+				$("label[for=forceIDs], #forceIDs").hide();
+			$("#entitie").html($("#entity > option:selected").text().toLowerCase());
+			$.ajax({
+				url: 'ajax.php',
+				data: {
+					getAvailableFields:1,
+					entity: $("#entity").val()
+				},
+				dataType: 'json',
+				success: function(j){
+					var fields = "";
+					$("#availableFields").empty();
+					
+					for (var i = 0; i < j.length; i++)
+						fields += j[i].field;
+	
+					$("#availableFields").html(fields);
+					activeClueTip();
+				},
+				error: function(j){}			
+			});
+		});
+		$("select#entity").trigger('change');
+		function activeClueTip()
+		{
+			$('.info_import').cluetip({
+				splitTitle: '|',
+			    showTitle: false
+		 	});
+		};	
 	});
-</script>
+</script>
@@ -22,20 +22,52 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-
 {extends file="helpers/view/view.tpl"}
-
 {block name="override_tpl"}
 	<script type="text/javascript">
-		var errorEmpty = "{l s='Please name your matching configuration to save.'}"
+		var errorEmpty = '{l s='Please name your matching configuration to save.' js='1'}';
 		var token = '{$token}';
+		var current = 0;
+		function showTable(nb)
+		{
+			$('#btn_left').disabled = null;
+			$('#btn_right').disabled = null;
+			if (nb <= 0)
+			{
+				nb = 0;
+				$('#btn_left').disabled = 'true';
+			}
+			if (nb >= {$nb_table} - 1)
+			{
+				nb = {$nb_table} - 1;
+				$('#btn_right').disabled = 'true';
+			}
+			$('#table' + current).hide();
+			current = nb;
+			$('#table' + current).show();
+		}
+		$(document).ready(function(){
+			var btn_save_import = $('span[class~="process-icon-save-import"]').parent();
+			var btn_submit_import = $('#import');
+			if (btn_save_import.length > 0 && btn_submit_import.length > 0)
+			{
+				btn_submit_import.hide();
+				btn_save_import.find('span').removeClass('process-icon-save-import');
+				btn_save_import.find('span').addClass('process-icon-save');
+				btn_save_import.click(function(){
+					btn_submit_import.before('<input type="hidden" name="' + btn_submit_import.attr("name") + '" value="1" />');
+					$('#import_form').submit();
+				});
+			}
+			showTable(current);
+		});
 	</script>
 	<div id="container-customer">
 	<h2>{l s='View your data'}</h2>
 	<div>
-		<b>{l s='Save and load your configuration for importing files'} : </b><br><br>
-		<input type="text" name="newImportMatchs" id="newImportMatchs">
-		<a id="saveImportMatchs" class="button" href="#">{l s='Save'}</a><br><br>
+		<b>{l s='Save and load your configuration for importing files'} : </b><br/><br/>
+		<input type="text" name="newImportMatchs" id="newImportMatchs" />
+		<a id="saveImportMatchs" class="button" href="#">{l s='Save'}</a><br /><br />
 		<div id="selectDivImportMatchs" {if !$import_matchs}style="display:none"{/if}>
 			<select id="valueImportMatchs">
 				{foreach $import_matchs as $match}
@@ -46,21 +78,18 @@
 			<a class="button" id="deleteImportMatchs" href="#">{l s='Delete'}</a>
 		</div>
 	</div>
-
 	<h3>{l s='Please set the value type of each column'}</h3>
-
 	<div id="error_duplicate_type" class="warning warn" style="display:none;">
 		<h3>{l s='Columns cannot have the same value type'}</h3>
 	</div>
-
 	<div id="required_column" class="warning warn" style="display:none;">
 		<h3>{l s='Column'} <span id="missing_column">&nbsp;</span> {l s='must be set'}</h3>
 	</div>
-
 	<form action="{$current}&token={$token}" method="post" id="import_form" name="import_form">
-		{l s='Skip'} <input type="text" size="2" name="skip" value="0" /> {l s='lines'}
+		{l s='Skip'} <input type="text" size="2" name="skip" value="1" /> {l s='lines'}
 		<input type="hidden" name="csv" value="{$fields_value.csv}" />
 		<input type="hidden" name="convert" value="{$fields_value.convert}" />
+		<input type="hidden" name="regenerate" value="{$fields_value.regenerate}" />
 		<input type="hidden" name="entity" value="{$fields_value.entity}" />
 		<input type="hidden" name="iso_lang" value="{$fields_value.iso_lang}" />
 		{if $fields_value.truncate}
@@ -72,49 +101,8 @@
 		{if $fields_value.match_ref}
 			<input type="hidden" name="match_ref" value="1" />
 		{/if}
-		<input type="hidden" name="separator" value="{$fields_value.separator}">
-		<input type="hidden" name="multiple_value_separator" value="{$fields_value.multiple_value_separator}">
-		<script type="text/javascript">
-			var current = 0;
-
-			function showTable(nb)
-			{
-				getE('btn_left').disabled = null;
-				getE('btn_right').disabled = null;
-				if (nb <= 0)
-				{
-					nb = 0;
-					getE('btn_left').disabled = 'true';
-				}
-				if (nb >= {$nb_table} - 1)
-				{
-					nb = {$nb_table} - 1;
-					getE('btn_right').disabled = 'true';
-				}
-				toggle(getE('table'+current), false);
-				current = nb;
-				toggle(getE('table'+current), true);
-			}
-
-			$(function() {
-				var btn_save_import = $('span[class~="process-icon-save-import"]').parent();
-				var btn_submit_import = $('#import');
-
-				if (btn_save_import.length > 0 && btn_submit_import.length > 0)
-				{
-					btn_submit_import.hide();
-					btn_save_import.find('span').removeClass('process-icon-save-import');
-					btn_save_import.find('span').addClass('process-icon-save');
-					btn_save_import.click(function() {
-						btn_submit_import.before('<input type="hidden" name="'+btn_submit_import.attr("name")+'" value="1" />');
-
-						$('#import_form').submit();
-					});
-				}
-			});
-
-		</script>
-
+		<input type="hidden" name="separator" value="{$fields_value.separator}" />
+		<input type="hidden" name="multiple_value_separator" value="{$fields_value.multiple_value_separator}" />
 		<table>
 			<tr>
 				<td colspan="3" align="center">
@@ -123,7 +111,7 @@
 			</tr>
 			<tr>
 				<td valign="top" align="center">
-					<input id="btn_left" value="{l s='<<'}" type="button" class="button" onclick="showTable(current - 1)" />
+					<input id="btn_left" value="{l s='<<'}" type="button" class="button" onclick="showTable(current - 1);" />
 				</td>
 				<td align="left">
 					{section name=nb_i start=0 loop=$nb_table step=1}
@@ -132,12 +120,10 @@
 					{/section}
 				</td>
 				<td valign="top" align="center">
-					<input id="btn_right" value="{l s='>>'}" type="button" class="button" onclick="showTable(current + 1)" />
+					<input id="btn_right" value="{l s='>>'}" type="button" class="button" onclick="showTable(current + 1);" />
 				</td>
 			</tr>
 		</table>
-		<script type="text/javascript">showTable(current);</script>
 	</form>
 	</div>
-{/block}
-
+{/block}
@@ -24,9 +24,9 @@
 *}

 <div class="width4">
-	{$localization_form}
+	{if isset($localization_form)}{$localization_form}{/if}
 </div>
 <br />
 <div class="width4">
-	{$localization_options}
+	{if isset($localization_options)}{$localization_options}{/if}
 </div>
@@ -49,14 +49,14 @@
 						<form action="#" id="login_form" method="post">
 							<div class="field">
 								<label for="email">{l s='Email address:'}</label>
-								<input type="text" id="email" name="email" class="input email_field" value="{if isset($email)}{$email|escape:'htmlall':'UTF-8'}{/if}" />
+								<input type="text" id="email" name="email" class="input email_field" tabindex="1" value="{if isset($email)}{$email|escape:'htmlall':'UTF-8'}{/if}" />
 							</div>					
 							<div class="field">
 								<label for="passwd">{l s='Password:'}</label>
-								<input id="passwd" type="password" name="passwd" class="input password_field" value="{if isset($password)}{$password}{/if}"/>
+								<input id="passwd" type="password" name="passwd" class="input password_field" tabindex="2" value="{if isset($password)}{$password}{/if}"/>
 							</div>					
 							<div class="field">
-								<input type="submit" name="submitLogin" value="{l s='Log in'}" class="button fl margin-right-5" />					
+								<input type="submit" name="submitLogin" value="{l s='Log in'}" tabindex="3" class="button fl margin-right-5" />					
 								<p class="fl no-margin hide ajax-loader">
 									<img src="../img/loader.gif" alt="" />
 								</p>					
@@ -77,7 +77,7 @@
 							</dl>
 						</div>
 						<p class="desc">{if isset($module->description) && $module->description ne ''}{l s='Description'} : {$module->description}{else}&nbsp;{/if}</p>
-						{if isset($module->message) && $module->type !== 'addonsNative' && $module->type != 'addonsMustHave'}<div class="conf">{$module->message}</div>{/if}
+						{if isset($module->message) && (!isset($module->type) || ($module->type != 'addonsMustHave' || $module->type !== 'addonsNative'))}<div class="conf">{$module->message}</div>{/if}
 						<div class="row-actions-module">
 							{if !isset($module->not_on_disk)}
 								{$module->optionsHtml}
@@ -26,7 +26,7 @@
 {include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
 <div class="leadin">{block name="leadin"}{/block}</div>

-<form action="{$url_submit}" id={$table}_form method="post">
+<form action="{$url_submit}" id="{$table}_form" method="post">
 	{if $display_key}
 		<input type="hidden" name="show_modules" value="{$display_key}" />
 	{/if}
@@ -49,38 +49,10 @@
 			</select><sup> *</sup>
 		</div>
 	
-		<script type="text/javascript">
-			//<![CDATA
-			function position_exception_add(shopID)
-			{
-				var listValue = $('#em_list_'+shopID).val();
-				var inputValue = $('#em_text_'+shopID).val();
-				var r = new RegExp('(^|,) *'+listValue+' *(,|$)');
-				if (!r.test(inputValue))
-					$('#em_text_'+shopID).val(inputValue + ((inputValue.trim()) ? ', ' : '') + listValue);
-			}
-		
-			function position_exception_remove(shopID)
-			{
-				var listValue = $('#em_list_'+shopID).val();
-				var inputValue = $('#em_text_'+shopID).val();
-				var r = new RegExp('(^|,) *'+listValue+' *(,|$)');
-				if (r.test(inputValue))
-				{
-					var rep = '';
-					if (new RegExp(', *'+listValue+' *,').test(inputValue))
-						$('#em_text_'+shopID).val(inputValue.replace(r, ','));
-					else if (new RegExp(listValue+' *,').test(inputValue))
-						$('#em_text_'+shopID).val(inputValue.replace(r, ''));
-					else
-						$('#em_text_'+shopID).val(inputValue.replace(r, ''));
-				}
-			}
-			//]]>
-		</script>
-	
 		<label>{l s='Exceptions'} :</label>
 		<div class="margin-form">
+			{l s='Please specify the files for which you do not want the module to be displayed.'}<br />
+			{l s='Please input each filename, separated by a comma.'}<br />
 			{if !$except_diff}
 				{$exception_list}
 			{else}
@@ -88,9 +60,6 @@
 					{$value}
 				{/foreach}
 			{/if}
-			{l s='Please specify the files for which you do not want the module to be displayed.'}.<br />
-			{l s='Please input each filename, separated by a comma.'}.
-			<br /><br />
 		</div>
 	
 		<div class="margin-form">
@@ -102,4 +71,40 @@
 		</div>
 		<div class="small"><sup>*</sup> {l s='Required field'}</div>
 	</fieldset>
-</form>
+</form>
+<script type="text/javascript">
+	//<![CDATA
+	function position_exception_textchange()
+	{
+		// TODO : Add & Remove automatically the "custom pages" in the "em_list_x"
+		var obj = $(this);
+		var shopID = obj.attr('id').replace(/\D/g, '');
+		var list = obj.parent().find('#em_list_' + shopID);
+		var values = obj.val().split(',');
+		var len = values.length;
+		
+		list.find('option').prop('selected', false);
+		for (var i = 0; i < len; i++)
+			list.find('option[value="' + $.trim(values[i]) + '"]').prop('selected', true);
+	}
+
+	function position_exception_listchange()
+	{
+		var obj = $(this);
+		var shopID = obj.attr('id').replace(/\D/g, '');
+		var str = obj.val().join(', ');
+		
+		obj.parent().find('#em_text_' + shopID).val(str);
+	}
+	
+	$(document).ready(function(){
+		$('form[id="hook_module_form"] input[id^="em_text_"]').each(function(){
+			$(this).change(position_exception_textchange).change();
+		});
+
+		$('form[id="hook_module_form"] select[id^="em_list_"]').each(function(){
+			$(this).change(position_exception_listchange);
+		});
+	});
+	//]]>
+</script>
@@ -45,6 +45,7 @@
 			{/if}
 		</td>
 		<td align="center" class="productQuantity">{$product['customizationQuantityTotal']}</td>
+		{if $display_warehouse}<td style="" align="center">&nbsp;</td>{/if}
 		{if ($order->hasBeenPaid())}<td align="center" class="productQuantity">{$product['customizationQuantityRefunded']}</td>{/if}
 		{if ($order->hasBeenDelivered() || $order->hasProductReturned())}<td align="center" class="productQuantity">{$product['customizationQuantityReturned']}</td>{/if}
 		{if $stock_management}<td align="center" class=""> - </td>{/if}
@@ -103,6 +104,7 @@
 					</span>
 					{/if}
 				</td>
+				{if $display_warehouse}<td style="" align="center">&nbsp;</td>{/if}
 				{if ($order->hasBeenPaid())}<td align="center">{$customization['quantity_refunded']}</td>{/if}
 				{if ($order->hasBeenDelivered())}<td align="center">{$customization['quantity_returned']}</td>{/if}
 				<td align="center">
@@ -68,9 +68,9 @@
 			{/if}
 			{if get_class($document) eq 'OrderInvoice'}
 				{if isset($document->is_delivery)}
-					#{Configuration::get('PS_DELIVERY_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->delivery_number}
+					#{Configuration::get('PS_DELIVERY_PREFIX', $current_id_lang, null, $order->id_shop)}{'%06d'|sprintf:$document->delivery_number}
 				{else}
-					{$document->getInvoiceNumberFormatted($current_id_lang)}
+					{$document->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)}
 				{/if}
 			{elseif get_class($document) eq 'OrderSlip'}
 				#{Configuration::get('PS_CREDIT_SLIP_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->id}
@@ -40,6 +40,7 @@
 	</td>
 	<td style="display:none;" align="center" class="productQuantity"><input type="text" name="add_product[product_quantity]" id="add_product_product_quantity" value="1" size="3" disabled="disabled" /></td>
 	{if ($order->hasBeenPaid())}<td style="display:none;" align="center" class="productQuantity">&nbsp;</td>{/if}
+	{if $display_warehouse}<td style="" align="center">&nbsp;</td>{/if}
 	{if ($order->hasBeenDelivered())}<td style="display:none;" align="center" class="productQuantity">&nbsp;</td>{/if}
 	<td style="display:none;" align="center" class="productQuantity" id="add_product_product_stock">0</td>
 	<td style="display:none;" align="center" id="add_product_product_total">{displayPrice price=0 currency=$currency->id}</td>
@@ -56,6 +56,7 @@
 		</span>
 		{/if}
 	</td>
+	{if $display_warehouse}<td>{$product.warehouse_name|escape:'htmlall':'UTF-8'}</td>{/if}
 	{if ($order->hasBeenPaid())}
 		<td align="center" class="productQuantity">
 			{$product['product_quantity_refunded']}
@@ -33,8 +33,8 @@
 	var currencies = new Array();
 	var id_currency = '';
 	var id_lang = '';
-	var txt_show_carts = '{l s='Show carts and orders for this customer.' js='1'}';
-	var txt_hide_carts = '{l s='Hide carts and orders for this customer.' js='1'}';
+	var txt_show_carts = '{l s='Show carts and orders for this customer.' js=1}';
+	var txt_hide_carts = '{l s='Hide carts and orders for this customer.' js=1}';
 	var defaults_order_state = new Array();
 	var customization_errors = false;
 	var pic_dir = '{$pic_dir}';
@@ -117,7 +117,7 @@
 							$('#vouchers_err').hide();
 						var mytab = new Array();
 						for (var i = 0; i < data.vouchers.length; i++)
-							mytab[mytab.length] = { data: data.vouchers[i], value: data.vouchers[i].name+' - '+data.vouchers[i].description };
+							mytab[mytab.length] = { data: data.vouchers[i], value: data.vouchers[i].name + (data.vouchers[i].code.length > 0 ? ' - ' + data.vouchers[i].code : '')};
 						return mytab;
 					},
 					extraParams: {
@@ -694,17 +694,15 @@
 	function updateCartVouchers(vouchers)
 	{
 		var vouchers_html = '';
-		if (vouchers.length > 0)
-		{
-			$.each(vouchers, function() {
+		if (typeof(vouchers) == 'object')
+			$.each(vouchers, function(){
 				vouchers_html += '<tr><td>'+this.name+'</td><td>'+this.description+'</td><td>'+this.value_real+'</td><td><a href="#" class="delete_discount" rel="'+this.id_discount+'"><img src="../img/admin/delete.gif" /></a></td></tr>';
 			});
-			$('#voucher_list').show();
-		}
-		else
+		$('#voucher_list tbody').html($.trim(vouchers_html));
+		if ($('#voucher_list tbody').html().length == 0)
 			$('#voucher_list').hide();
-
-		$('#voucher_list tbody').html(vouchers_html);
+		else
+			$('#voucher_list').show();
 	}

 	function updateCartPaymentList(payment_list)
@@ -153,7 +153,7 @@
 			<br />
 			<fieldset>
 				<legend><img src="../img/admin/tab-customers.gif" /> {l s='Customer information'}</legend>
-				<span style="font-weight: bold; font-size: 14px;"><a href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={getAdminToken tab='AdminCustomers'}"> {$customer->firstname} {$customer->lastname}</a></span> ({l s='#'}{$customer->id})<br />
+				<span style="font-weight: bold; font-size: 14px;"><a href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={getAdminToken tab='AdminCustomers'}"> {$gender->name|escape:'htmlall':'UTF-8'} {$customer->firstname} {$customer->lastname}</a></span> ({l s='#'}{$customer->id})<br />
 				(<a href="mailto:{$customer->email}">{$customer->email}</a>)<br /><br />
 				{if ($customer->isGuest())}
 					{l s='This order has been placed by a guest.'}
@@ -170,9 +170,9 @@
 					{l s='Account registered:'} <b>{dateFormat date=$customer->date_add full=true}</b><br />
 					{l s='Valid orders placed:'} <b>{$customerStats['nb_orders']}</b><br />
 					{l s='Total spent since registration:'} <b>{displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_orders'], $currency), 2) currency=$currency->id}</b><br />
-			</fieldset>
 				{/if}
 			{/if}
+			</fieldset>

 			<!-- Sources block -->
 			{if (sizeof($sources))}
@@ -325,7 +325,7 @@
 								<td>{displayPrice price=$payment->amount currency=$payment->id_currency}</td>
 								<td>
 								{if $invoice = $payment->getOrderInvoice($order->id)}
-									{$invoice->getInvoiceNumberFormatted($current_id_lang)}
+									{$invoice->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)}
 								{else}
 									{l s='No invoice'}
 								{/if}
@@ -404,7 +404,7 @@
 								<td>
 									<select name="payment_invoice" id="payment_invoice">
 									{foreach from=$invoices_collection item=invoice}
-										<option value="{$invoice->id}" selected="selected">{$invoice->getInvoiceNumberFormatted($current_id_lang)}</option>
+										<option value="{$invoice->id}" selected="selected">{$invoice->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)}</option>
 									{/foreach}
 									</select>
 								</td>
@@ -592,6 +592,7 @@
 						<th>{l s='Product'}</th>
 						<th style="width: 15%; text-align: center">{l s='Unit Price'} <sup>*</sup></th>
 						<th style="width: 4%; text-align: center">{l s='Qty'}</th>
+						{if $display_warehouse}<th style="text-align: center">{l s='Warehouse'}</th>{/if}
 						{if ($order->hasBeenPaid())}<th style="width: 3%; text-align: center">{l s='Refunded'}</th>{/if}
 						{if ($order->hasBeenDelivered() || $order->hasProductReturned())}<th style="width: 3%; text-align: center">{l s='Returned'}</th>{/if}
 						{if $stock_management}<th style="width: 10%; text-align: center">{l s='Available quantity'}</th>{/if}
@@ -31,6 +31,14 @@
 		{if isset($modules_list)}
 			{$modules_list}
 		{/if}
+		<div class="space info">
+			{l s='This is where you decide what payment modules are available for different variations like your customers\' currency, group, and country.'}
+			<br />
+			{l s='A check mark indicates you want the payment module available.'}
+			{l s='If it is not checked then this means that the Payment module is disabled.'}
+			<br />
+			{l s='Please make sure to click Save for each section.'}
+		</div>
 		{if $display_restrictions}
 			<br /><h2 class="space">{l s='Payment module restrictions'}</h2>
 			{foreach $lists as $list}
@@ -34,10 +34,10 @@
 					{if $module->active}
 						<th>
 							{if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
-								<input type="hidden" id="checkedBox_{$list['name_id']}_{$module->name}" value="checked">
+								<input type="hidden" id="checkedBox_{$list['name_id']}_{$module->name}" value="checked"/>
 								<a href="javascript:checkPaymentBoxes('{$list['name_id']}', '{$module->name}')" style="text-decoration:none;">
 							{/if}
-							&nbsp;<img src="{$ps_base_uri}modules/{$module->name}/logo.gif" alt="{$module->name}" title="{$module->displayName}" />
+							&nbsp;<img src="{$ps_base_uri}modules/{$module->name}/logo.gif" alt="{$module->name}" title="{$module->displayName}"/>
 							{if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
 								</a>
 							{/if}
@@ -64,11 +64,9 @@
 								{$type = 'checkbox'}
 							{/if}
 							{if $type != 'null'}
-								<input type="checkbox" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}"
-									{if $item['check_list'][$key_module] == 'checked'}checked="checked"{/if} 
-								/>
+								<input type="{$type}" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}" {if $item['check_list'][$key_module] == 'checked'}checked="checked"{/if}/>
 							{else}
-								--
+                                <input type="hidden" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}"/>--
 							{/if}
 						</td>
 					{/if}
@@ -96,4 +94,4 @@
 		</table>
 		<div><input type="submit" class="button space" name="submitModule{$list['name_id']}" value="{l s='Save restrictions'}" /></div>
 	</fieldset>
-</form>
+</form>
@@ -40,6 +40,9 @@
 		</div>
 	{/if}
 	{$smarty.block.parent}
+	{if $input.type == 'radio' && $input.name == 'smarty_cache'}
+			<a href="{$current}&token={$token}&empty_smarty_cache=1" class="clear button" href="">{l s='Clear Smarty cache & Autoload cache'}</a>
+	{/if}		
 {/block}

 {block name="description"}
@@ -186,7 +189,7 @@
 			return false;
 		});

-		$('input[name="smarty_force_compile"], input[name="smarty_cache"], input[name="smarty_console"]').change(function(){
+		$('input[name="smarty_force_compile"], input[name="smarty_cache"], input[name="smarty_console"], input[name="smarty_console_key"]').change(function(){
 			$('#smarty_up').val(1);
 		});

@@ -78,7 +78,7 @@
 		<tr id="image_id">
 			<td style="padding: 4px;">
 				<a href="{$smarty.const._THEME_PROD_DIR_}image_path.jpg" class="fancybox">
-					<img src="{$smarty.const._THEME_PROD_DIR_}en-default-small_default.jpg" alt="image_id" title="image_id" />
+					<img src="{$smarty.const._THEME_PROD_DIR_}{$iso_lang}-default-small_default.jpg" alt="image_id" title="image_id" />
 				</a>
 			</td>
 			<td id="td_image_id" class="pointer dragHandle center positionImage">
@@ -313,12 +313,13 @@
 			{
 				line = $("#lineType").html();
 				line = line.replace(/image_id/g, id);
-			line = line.replace(/en-default/g, path);
-			line = line.replace(/image_path/g, path);
+				line = line.replace(/[a-z]{2}-default/g, path);
+				line = line.replace(/image_path/g, path);
 				line = line.replace(/image_position/g, position);
 				line = line.replace(/blank/g, cover);
 				line = line.replace(/<tbody>/gi, "");
 				line = line.replace(/<\/tbody>/gi, "");
+
 				if (shops != false)
 				{
 					$.each(shops, function(key, value){
@@ -326,8 +327,10 @@
 							line = line.replace('id="' + key + '' + id + '"','id="' + key + '' + id + '" checked=checked');
 					});
 				}
+
 				$("#imageList").append(line);
 			}
+
 			$('.fancybox').fancybox();
 		});
 		{/literal}
@@ -166,7 +166,7 @@
 	</tr>
 	<tr class="redirect_product_options" style="display:none">
 		<td class="col-left">
-			{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
+			{include file="controllers/products/multishop/checkbox.tpl" field="redirect_type" type="radio" onclick=""}
 			<label class="text">{l s='Redirect:'}</label>
 		</td>
 		<td style="padding-bottom:5px;">
@@ -184,7 +184,7 @@
 	</tr>
 	<tr class="redirect_product_options redirect_product_options_product_choise" style="display:none">
 		<td class="col-left">
-			{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
+			{include file="controllers/products/multishop/checkbox.tpl" field="id_product_redirected" type="radio" onclick=""}
 			<label class="text">{l s='Related product:'}</label>
 		</td>
 		<td style="padding-bottom:5px;">
@@ -29,7 +29,7 @@
 	<input size="30" type="text" id="{$input_name}_{$language.id_lang}" 
 	name="{$input_name}_{$language.id_lang}"
 		value="{$input_value[$language.id_lang]|htmlentitiesUTF8|default:''}"
-		onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();"/>
+		onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();" onblur="updateLinkRewrite();"/>
 </div>
 {/foreach}
 </div>
@@ -24,8 +24,8 @@
 *}

 <script type="text/javascript">
-	var msg_select_one = "{l s="Please select at least one product." js=1}";
-	var msg_set_quantity = "{l s="Please set a quantity to add a product." js=1}";
+	var msg_select_one = "{l s='Please select at least one product.' js=1}";
+	var msg_set_quantity = "{l s='Please set a quantity to add a product.' js=1}";
 </script>
 <input type="hidden" name="submitted_tabs[]" value="Pack" />
 <h4>{l s='Pack'}</h4>
@@ -178,7 +178,7 @@ $(document).ready(function () {
 	</tr>
 	<tr {if !$ps_use_ecotax} style="display:none;"{/if}>
 		<td class="col-left">
-			{include file="controllers/products/multishop/checkbox.tpl" field="ecot" type="default"}
+			{include file="controllers/products/multishop/checkbox.tpl" field="ecotax" type="default"}
 			<label>{l s='Eco-tax (tax incl.):'}</label>
 		</td>
 		<td>
@@ -71,7 +71,7 @@
 			<label>{l s='Carriers:'}</label>
 		</td>
 		<td class="padding-bottom:5px;">
-			<select name="carriers[]" id="carriers_restriction" multiple="multiple" size="4" style="height:100px;width:200px;">
+			<select name="carriers[]" id="carriers_restriction" multiple="multiple" size="4" style="height:100px;width:300px;">
 				{foreach $carrier_list as $carrier}
 					<option value="{$carrier.id_reference}" {if isset($carrier.selected) && $carrier.selected}selected="selected"{/if}>{$carrier.name}</option>
 				{/foreach}
@@ -88,4 +88,4 @@
 		$('#carriers_restriction option').each(function () { $(this).removeAttr('selected')});
 		return false;
 	}
-</script>
+</script>
@@ -45,7 +45,7 @@
 						{l s='The field `request_uri` is the URL from which the customers come to your website.'}<br />
 						{l s='For example, if the visitor accesses a product page, the URL will be'} "{$uri}music-ipods/1-ipod-nano.html".<br />
 						{l s='This is helpful because you can add tags or tokens in the links pointing to your website.'}
-						{l s='For example, you can post a link "%dindex.php?prestashop" in the forum and get statistics by entering "%prestashop" in the field `request_uri`. '}
+						{l s='For example, you can post a link "%1$sindex.php?prestashop" in the forum and get statistics by entering "%%prestashop" in the field `request_uri`. ' sprintf=[$uri]}
 						{l s='This method is more reliable than the `http_referer`, but there is one disadvantage. If a search engine references a page with your link, then it will be displayed in the search results and you will  not only have visitors from the forum, but also those from the search engine.'}
 					</li>
 					<br />
@@ -90,7 +90,7 @@
 			var table = $('#selectTables select').val();

 			if (!table)
-				jAlert("{l s='Please choose a table.' js='1'}");
+				jAlert("{l s='Please choose a table.' js=1}");
 			else
 				AddRequestSql(table);
 		});
@@ -24,7 +24,7 @@
 *}
 <a href="{$href}" class="delete"
 	{if in_array($id_shop, $shops_having_dependencies)}
-		onclick="jAlert('{l s='You cannot delete this shop\'s (customer and/or order dependency)' js='1'}'); return false;"
+		onclick="jAlert('{l s='You cannot delete this shop\'s (customer and/or order dependency)' js=1}'); return false;"
 	{elseif isset($confirm)}
 		onclick="if (confirm('{$confirm}')){ return true; } else { event.stopPropagation(); event.preventDefault();};"
 	{/if} title="{$action}">
@@ -161,6 +161,13 @@ function add_condition(id_condition_group, type, value)
 function delete_condition(condition)
 {
 	delete conditions[condition];
+	
+	to_delete = $('#'+condition).prev();
+	if ($(to_delete).children().hasClass('btn_delete_condition'))
+		$(to_delete).remove();
+	else
+		$('#'+condition).next().remove();
+
 	$('#'+condition).remove();
 	return false;
 }
@@ -178,7 +185,7 @@ function new_condition_group()
 function appendConditionToGroup(html)
 {
 	if ($('#condition_group_'+current_id_condition_group+' table tbody tr').length > 0)
-		$('#condition_group_'+current_id_condition_group+' table tbody').append('<tr><td align="center" colspan="3"><b>{l s='AND' js=1}</b></td></tr>');
+		$('#condition_group_'+current_id_condition_group+' table tbody').append('<tr><td align="center" class="btn_delete_condition" colspan="3"><b>{l s='AND' js=1}</b></td></tr>');
 	$('#condition_group_'+current_id_condition_group+' table tbody').append(html);
 }

@@ -284,7 +291,7 @@ $(document).ready(function() {
 				$('#id_attribute_group option[value="{$condition.id_attribute_group}"]').attr('selected', true);
 				$('#id_attribute_{$condition.id_attribute_group} option[value="{$condition.value}"]').attr('selected', true);
 			{elseif $condition.type == 'feature'}
-				$('#id_feature[value="{$condition.id_feature}"]').attr('selected', true);
+				$('#id_feature option[value="{$condition.id_feature}"]').attr('selected', true);
 				$('#id_feature_{$condition.id_feature} option[value="{$condition.value}"]').attr('selected', true);
 			{else}
 				$('#id_{$condition.type} option[value="{$condition.value}"]').attr('selected', true);
@@ -25,7 +25,7 @@

 <div id="statsContainer">
 	<div id="calendar">
-				<form action="{$current}&token={$token}{if $action && $table}&{$action|escape}{$table|escape}{/if}{if $identifier && $id}&{$identifier|escape}={$id|escape}{/if}" method="post" id="calendar_form" name="calendar_form">
+				<form action="{$current}&token={$token}{if $action && $table}&{$action|escape}{$table|escape}{/if}{if $identifier && $id}&{$identifier|escape}={$id|escape}{/if}{if isset($smarty.get.module)}&module={$smarty.get.module|escape}{/if}{if isset($smarty.get.id_product)}&id_product={$smarty.get.id_product|escape}{/if}" method="post" id="calendar_form" name="calendar_form">
 					<input type="submit" name="submitDateDay" class="button submitDateDay" value="{$translations.Day}">
 					<input type="submit" name="submitDateMonth" class="button submitDateMonth" value="{$translations.Month}">
 					<input type="submit" name="submitDateYear" class="button submitDateYear" value="{$translations.Year}">
@@ -51,4 +51,4 @@
 							});
 					});
 				</script>
-	</div>
+	</div>
@@ -30,9 +30,9 @@
    function ajaxStoreStates(id_state_selected)
 {
    $.ajax({
-	url: "ajax.php",
+	url: "index.php",
 	cache: false,
-	data: "ajaxStates=1&id_country="+$('#PS_SHOP_COUNTRY_ID').val() + "&id_state=" + $('#PS_SHOP_STATE_ID').val(),
+	data: "ajax=1&tab=AdminStates&token={getAdminToken tab='AdminStates'}&action=states&id_country="+$('#PS_SHOP_COUNTRY_ID').val() + "&id_state=" + $('#PS_SHOP_STATE_ID').val(),
 	success: function(html)
 	{
 	    if (html == 'false')
@@ -138,7 +138,7 @@
 			// check if it's possible to add the product
 			if (product_infos == null || $('#cur_product_name').val() == '')
 			{
-				jAlert('{l s='Please select at least one product.' js='1'}');
+				jAlert('{l s='Please select at least one product.' js=1}');
 				return false;
 			}

@@ -60,9 +60,9 @@
 			$("#states-label").hide();
 		} else {
 			$.ajax({
-				url: "ajax.php",
+				url: "index.php",
 				cache: false,
-				data: "ajaxStates=1&id_country="+id_country+"&id_state="+id_state+"&empty_value={l s='All'}",
+				data: "ajax=1&tab=AdminStates&token={getAdminToken tab='AdminStates'}&action=states&id_country="+id_country+"&id_state="+id_state+"&empty_value={l s='All'}",
 				success: function(html){
 					if (html == "false")
 					{
@@ -88,10 +88,10 @@
 	{
 		$.ajax({
 			type: 'POST',
-			url: 'ajax.php',
+			url: 'index.php',
 			async: true,
 			dataType: 'json',
-			data: 'ajaxStates=1&ajaxUpdateTaxRule=1&id_tax_rule='+id_tax_rule,
+			data: 'ajax=1&tab=AdminTaxRulesGroup&token={getAdminToken tab='AdminTaxRulesGroup'}&ajaxStates=1&action=updateTaxRule&id_tax_rule='+id_tax_rule,
 			success: function(data){
 				$('#tax_rule_form').show();
 				$('#id_tax_rule').val(data.id);
@@ -33,22 +33,22 @@
 {/if}

 <form method="post" action="{$currentIndex}&{$identifier}&token={$token}&id_tax_rules_group={$id_tax_rules_group}&updatetax_rules_group#{$table}" class="form">
-	<input type="hidden" id="submitFilter{$table}" name="submitFilter{$table}" value="0"/>
+	<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
 	<table class="table_grid">
 		<tr>
 			<td style="vertical-align: bottom;">
 				<span style="float: left;">
 					{if $page > 1}
-						<input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$table}').value=1"/>&nbsp;
-						<input type="image" src="../img/admin/list-prev.gif" onclick="getE('submitFilter{$table}').value={$page - 1}"/>
+						<input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$list_id}').value=1"/>&nbsp;
+						<input type="image" src="../img/admin/list-prev.gif" onclick="getE('submitFilter{$list_id}').value={$page - 1}"/>
 					{/if}
 					{l s='Page'} <b>{$page}</b> / {$total_pages}
 					{if $page < $total_pages}
-						<input type="image" src="../img/admin/list-next.gif" onclick="getE('submitFilter{$table}').value={$page + 1};"/>&nbsp;
-						<input type="image" src="../img/admin/list-next2.gif" onclick="getE('submitFilter{$table}').value={$total_pages}"/>
+						<input type="image" src="../img/admin/list-next.gif" onclick="getE('submitFilter{$list_id}').value={$page + 1};"/>&nbsp;
+						<input type="image" src="../img/admin/list-next2.gif" onclick="getE('submitFilter{$list_id}').value={$total_pages}"/>
 					{/if}
 					| {l s='Display'}
-					<select name="pagination" onchange="submit()">
+					<select name="{$list_id}_pagination" onchange="submit()">
 						{* Choose number of results per page *}
 						{foreach $pagination AS $value}
 							<option value="{$value|intval}"{if $selected_pagination == $value} selected="selected" {elseif $selected_pagination == NULL && $value == $pagination[1]} selected="selected2"{/if}>{$value|intval}</option>
@@ -57,7 +57,7 @@
 					/ {$list_total} {l s='result(s)'}
 				</span>
 				<span style="float: right;">
-					<input type="submit" name="submitReset{$table}" value="{l s='Reset'}" class="button" />
+					<input type="submit" name="submitReset{$list_id}" value="{l s='Reset'}" class="button" />
 				</span>
 				<span class="clear"></span>
 			</td>
@@ -66,7 +66,7 @@
 			<td>
 				<table
 				{if $table_id} id={$table_id}{/if}
-				class="table {if $table_dnd}tableDnD{/if} {$table}"
+				class="table {if $table_dnd}tableDnD{/if} {$list_id}"
 				cellpadding="0" cellspacing="0"
 				style="width: 100%; margin-bottom:10px;"
 				>
@@ -84,7 +84,7 @@
 						<tr class="nodrag nodrop">
 							<th class="center">
 								{if $has_bulk_actions}
-									<input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, '{$table}Box[]', this.checked)" />
+									<input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, '{$list_id}Box[]', this.checked)" />
 								{/if}
 							</th>
 							{foreach $fields_display AS $key => $params}
@@ -35,11 +35,12 @@
 				</div>
 				<div class="footerRight">
 					{if $iso_is_fr}
-						<span>Questions / Renseignements / Formations :</span> <strong>+33 (0)1.40.18.30.04</strong> de 09h &agrave; 18h
+						<span>Questions / Renseignements / Formations :</span> <strong>+33 (0)1.40.18.30.04</strong>
 					{/if}
-					|&nbsp;<a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">{l s='Contact'}</a>
-					|&nbsp;<a href="http://forge.prestashop.com" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
-					|&nbsp;<a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">{l s='Forum'}</a>	
+					|&nbsp;<a href="http://www.prestashop.com/en/contact-us?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Contact'}</a>
+					|&nbsp;<a href="http://forge.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
+					|&nbsp;<a href="http://www.prestashop.com/forums/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Forum'}</a>
+					|&nbsp;<a href="http://addons.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Addons'}</a>
 				</div>
 			</div>
 		</div>
@@ -30,7 +30,7 @@

 {if isset($fields.title)}<h2>{$fields.title}</h2>{/if}
 {block name="defaultForm"}
-<form id="{if isset($fields.form.form.id_form)}{$fields.form.form.id_form|escape:'htmlall':'UTF-8'}{else}{$table}_form{/if}" class="defaultForm {$name_controller}" action="{$current}&{if !empty($submit_action)}{$submit_action}=1{/if}&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
+<form id="{if isset($fields.form.form.id_form)}{$fields.form.form.id_form|escape:'htmlall':'UTF-8'}{else}{if $table == null}configuration_form{else}{$table}_form{/if}{/if}" class="defaultForm {$name_controller}" action="{$current}&{if !empty($submit_action)}{$submit_action}=1{/if}&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
 	{if $form_id}
 		<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
 	{/if}
@@ -234,17 +234,29 @@
 									{/foreach}
 								{elseif $input.type == 'file'}
 									{if isset($input.display_image) && $input.display_image}
-										{if isset($fields_value.image) && $fields_value.image}
+										{if isset($fields_value[$input.name].image) && $fields_value[$input.name].image}
 											<div id="image">
-												{$fields_value.image}
-												<p align="center">{l s='File size'} {$fields_value.size}kb</p>
+												{$fields_value[$input.name].image}
+												<p align="center">{l s='File size'} {$fields_value[$input.name].size}kb</p>
 												<a href="{$current}&{$identifier}={$form_id}&token={$token}&deleteImage=1">
 													<img src="../img/admin/delete.gif" alt="{l s='Delete'}" /> {l s='Delete'}
 												</a>
 											</div><br />
 										{/if}
 									{/if}
-									<input type="file" name="{$input.name}" {if isset($input.id)}id="{$input.id}"{/if} />
+									
+									{if isset($input.lang) AND $input.lang}
+										<div class="translatable">
+											{foreach $languages as $language}
+												<div class="lang_{$language.id_lang}" id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
+													<input type="file" name="{$input.name}_{$language.id_lang}" {if isset($input.id)}id="{$input.id}_{$language.id_lang}"{/if} />
+									
+												</div>
+											{/foreach}
+										</div>
+									{else}
+										<input type="file" name="{$input.name}" {if isset($input.id)}id="{$input.id}"{/if} />
+									{/if}
 									{if !empty($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
 								{elseif $input.type == 'password'}
 									<input type="password"
@@ -302,7 +314,6 @@
 										{if isset($input.class)}class="{$input.class}"
 										{else}class="color mColorPickerInput"{/if}
 										name="{$input.name}"
-										class="{if isset($input.class)}{$input.class}{/if}"
 										value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
 								{elseif $input.type == 'date'}
 									<input type="text"
@@ -343,13 +354,13 @@
 							{/if}
 						{/if}
 					{/foreach}
-					{hook h='displayAdminForm'}
+					{hook h='displayAdminForm' fieldset=$f}
 					{if isset($name_controller)}
 						{capture name=hookName assign=hookName}display{$name_controller|ucfirst}Form{/capture}
-						{hook h=$hookName}
+						{hook h=$hookName fieldset=$f}
 					{elseif isset($smarty.get.controller)}
 						{capture name=hookName assign=hookName}display{$smarty.get.controller|ucfirst|htmlentities}Form{/capture}
-						{hook h=$hookName}
+						{hook h=$hookName fieldset=$f}
 					{/if}
 				{elseif $key == 'submit'}
 					<div class="margin-form">
@@ -421,7 +432,8 @@
 			};
 		{/foreach}
 		// we need allowEmployeeFormLang var in ajax request
-		allowEmployeeFormLang = {$allowEmployeeFormLang};
+		allowEmployeeFormLang = {$allowEmployeeFormLang|intval};
+		employee_token = '{getAdminToken tab='AdminEmployees'}';
 		displayFlags(languages, id_language, allowEmployeeFormLang);

 		$(document).ready(function() {
@@ -443,6 +455,7 @@
 				});

 		});
+	state_token = '{getAdminToken tab='AdminStates'}';
 	{block name="script"}{/block}
 	</script>
 {/if}
@@ -59,7 +59,7 @@
 			{block name="td_content"}
 				{if isset($params.prefix)}{$params.prefix}{/if}
 				{if isset($params.color) && isset($tr[$params.color])}
-					<span class="color_field" style="background-color:{$tr.color};color:{if Tools::getBrightness($tr.color) < 128}white{else}#383838{/if}">
+					<span class="color_field" style="background-color:{$tr[$params.color]};color:{if Tools::getBrightness($tr[$params.color]) < 128}white{else}#383838{/if}">
 				{/if}
 				{if isset($tr.$key)}
 					{if isset($params.active)}
@@ -27,8 +27,8 @@

 	<script type="text/javascript">
 		$(document).ready(function() {
-			$('table.{$table} .filter').keypress(function(event){
-				formSubmit(event, 'submitFilterButton{$table}')
+			$('table.{$list_id} .filter').keypress(function(event){
+				formSubmit(event, 'submitFilterButton{$list_id}')
 			})
 		});
 	</script>
@@ -37,7 +37,7 @@
 		<script type="text/javascript" src="../js/jquery/plugins/jquery.tablednd.js"></script>
 		<script type="text/javascript">
 			var token = '{$token}';
-			var come_from = '{$table}';
+			var come_from = '{$list_id}';
 			var alternate = {if $order_way == 'DESC'}'1'{else}'0'{/if};
 		</script>
 		<script type="text/javascript" src="../js/admin-dnd.js"></script>
@@ -45,8 +45,8 @@

 	<script type="text/javascript">
 		$(function() {
-			if ($("table.{$table} .datepicker").length > 0)
-				$("table.{$table} .datepicker").datepicker({
+			if ($("table.{$list_id} .datepicker").length > 0)
+				$("table.{$list_id} .datepicker").datepicker({
 					prevText: '',
 					nextText: '',
 					dateFormat: 'yy-mm-dd'
@@ -83,7 +83,7 @@

 	{block name="override_form_extra"}{/block}

-	<input type="hidden" id="submitFilter{$table}" name="submitFilter{$table}" value="0"/>
+	<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
 {/if}
 	<table class="table_grid" name="list_table">
 		{if !$simple_header}
@@ -91,16 +91,16 @@
 				<td style="vertical-align: bottom;">
 					<span style="float: left;">
 						{if $page > 1}
-							<input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$table}').value=1"/>&nbsp;
-							<input type="image" src="../img/admin/list-prev.gif" onclick="getE('submitFilter{$table}').value={$page - 1}"/>
+							<input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$list_id}').value=1"/>&nbsp;
+							<input type="image" src="../img/admin/list-prev.gif" onclick="getE('submitFilter{$list_id}').value={$page - 1}"/>
 						{/if}
 						{l s='Page'} <b>{$page}</b> / {$total_pages}
 						{if $page < $total_pages}
-							<input type="image" src="../img/admin/list-next.gif" onclick="getE('submitFilter{$table}').value={$page + 1}"/>&nbsp;
-							<input type="image" src="../img/admin/list-next2.gif" onclick="getE('submitFilter{$table}').value={$total_pages}"/>
+							<input type="image" src="../img/admin/list-next.gif" onclick="getE('submitFilter{$list_id}').value={$page + 1}"/>&nbsp;
+							<input type="image" src="../img/admin/list-next2.gif" onclick="getE('submitFilter{$list_id}').value={$total_pages}"/>
 						{/if}
 						| {l s='Display'}
-						<select name="pagination" onchange="submit()">
+						<select name="{$list_id}_pagination" onchange="submit()">
 							{* Choose number of results per page *}
 							{foreach $pagination AS $value}
 								<option value="{$value|intval}"{if $selected_pagination == $value} selected="selected" {elseif $selected_pagination == NULL && $value == $pagination[1]} selected="selected2"{/if}>{$value|intval}</option>
@@ -109,8 +109,8 @@
 						/ {$list_total} {l s='result(s)'}
 					</span>
 					<span style="float: right;">
-						<input type="submit" name="submitReset{$table}" value="{l s='Reset'}" class="button" />
-						<input type="submit" id="submitFilterButton{$table}" name="submitFilter" value="{l s='Filter'}" class="button" />
+						<input type="submit" id="submitFilterButton{$list_id}" name="submitFilter" value="{l s='Filter'}" class="button" />					
+						<input type="submit" name="submitReset{$list_id}" value="{l s='Reset'}" class="button" />
 					</span>
 					<span class="clear"></span>
 				</td>
@@ -120,7 +120,7 @@
 			<td{if $simple_header} style="border:none;"{/if}>
 				<table
 				{if $table_id} id={$table_id}{/if}
-				class="table {if $table_dnd}tableDnD{/if} {$table}"
+				class="table {if $table_dnd}tableDnD{/if} {$list_id}"
 				cellpadding="0" cellspacing="0"
 				style="width: 100%; margin-bottom:10px;">
 					<col width="10px" />
@@ -137,7 +137,7 @@
 						<tr class="nodrag nodrop" style="height: 40px">
 							<th class="center">
 								{if $has_bulk_actions}
-									<input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, '{$table}Box[]', this.checked)" />
+									<input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, '{$list_id}Box[]', this.checked)" />
 								{/if}
 							</th>
 							{foreach $fields_display AS $key => $params}
@@ -148,9 +148,9 @@
 									</span>
 									{if (!isset($params.orderby) || $params.orderby) && !$simple_header}
 										<br />
-										<a href="{$currentIndex}&{$table}Orderby={$key|urlencode}&{$table}Orderway=desc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
+										<a href="{$currentIndex}&{$list_id}Orderby={$key|urlencode}&{$list_id}Orderway=desc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
 										<img border="0" src="../img/admin/down{if isset($order_by) && ($key == $order_by) && ($order_way == 'DESC')}_d{/if}.gif" /></a>
-										<a href="{$currentIndex}&{$table}Orderby={$key|urlencode}&{$table}Orderway=asc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
+										<a href="{$currentIndex}&{$list_id}Orderby={$key|urlencode}&{$list_id}Orderway=asc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
 										<img border="0" src="../img/admin/up{if isset($order_by) && ($key == $order_by) && ($order_way == 'ASC')}_d{/if}.gif" /></a>
 									{elseif !$simple_header}
 										<br />&nbsp;
@@ -186,7 +186,7 @@
 										--
 									{else}
 										{if $params.type == 'bool'}
-											<select onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}Filter_{$key}">
+											<select onchange="$('#submitFilterButton{$list_id}').focus();$('#submitFilterButton{$list_id}').click();" name="{$list_id}Filter_{$key}">
 												<option value="">--</option>
 												<option value="1" {if $params.value == 1} selected="selected" {/if}>{l s='Yes'}</option>
 												<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
@@ -196,7 +196,7 @@
 											{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}>
+												<select onchange="$('#submitFilterButton{$list_id}').focus();$('#submitFilterButton{$list_id}').click();" name="{$list_id}Filter_{$params.filter_key}" {if isset($params.width)} style="width:{$params.width}px"{/if}>
 													<option value="" {if $params.value == ''} selected="selected" {/if}>--</option>
 													{if isset($params.list) && is_array($params.list)}
 														{foreach $params.list AS $option_value => $option_display}
@@ -206,7 +206,7 @@
 												</select>
 											{/if}
 										{else}
-											<input type="text" class="filter" name="{$table}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'htmlall':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{else}style="width:95%"{/if} />
+											<input type="text" class="filter" name="{$list_id}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'htmlall':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{else}style="width:95%"{/if} />
 										{/if}
 									{/if}
 								</td>
@@ -34,7 +34,7 @@

 {block name="defaultOptions"}
 <form action="{$current}&token={$token}"
-	id="{$table}_form"
+	id="{if $table == null}configuration_form{else}{$table}_form{/if}"
 	{if isset($categoryData['name'])} name={$categoryData['name']}{/if}
 	{if isset($categoryData['id'])} id={$categoryData['id']} {/if}
 	method="post"
@@ -35,7 +35,7 @@
 		</span>
 		
 		{if count($errors) == 1}
-			{$errors[0]}
+			{reset($errors)}
 		{else}
 			{l s='%d errors' sprintf=$errors|count}
 			<br/>
@@ -36,9 +36,9 @@
 						{if $k == 'modules-list'}
 							<div id="modules_list_container" style="display:none">
 							<div style="float:right;margin:5px">
-								<a href="#" onclick="$('#modules_list_container').slideUp();return false;"><img alt="X" src="../img/admin/close.png"></a>
+								<a href="#" onclick="$('#modules_list_container').slideUp();return false;"><img alt="X" src="../img/admin/close.png" /></a>
 							</div>
-							<div id="modules_list_loader"><img src="../img/loader.gif" alt="" border="0"></div>
+							<div id="modules_list_loader"><img src="../img/loader.gif" alt="" border="0" /></div>
 							<div id="modules_list_container_tab" style="display:none;"></div>
 							</div>
 						{/if}
@@ -313,11 +313,10 @@ class AddressCore extends ObjectModel
 	{
 		$key = 'address_exists_'.(int)$id_address;
 		if (!Cache::isStored($key))
-				Cache::store(
-					$key, Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
-							SELECT `id_address`
-							FROM '._DB_PREFIX_.'address a
-							WHERE a.`id_address` = '.(int)$id_address));
+		{
+			$id_address = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT `id_address` FROM '._DB_PREFIX_.'address a WHERE a.`id_address` = '.(int)$id_address);
+			Cache::store($key, (bool)$id_address);
+		}
 		return Cache::retrieve($key);
 	}

@@ -1303,7 +1303,7 @@ abstract class AdminTabCore
 		}

 		$asso = Shop::getAssoTable($this->table);
-		if ($asso !== false && $assos['type'] == 'shop')
+		if ($asso !== false && $asso['type'] == 'shop')
 		{
 			$filterKey = $asso['type'];
 			$idenfierShop = Shop::getContextListShopID();
@@ -142,12 +142,15 @@ class AttributeGroupCore extends ObjectModel
 			if (!AttributeGroup::cleanDeadCombinations())
 				return false;
 		 	/* Also delete related attributes */
-			if (Db::getInstance()->execute('
+			if (count($to_remove))
+				if (!Db::getInstance()->execute('
 				DELETE FROM `'._DB_PREFIX_.'attribute_lang`
-				WHERE `id_attribute`
-					IN (SELECT id_attribute FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)$this->id.')') === false ||
-					Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)$this->id) === false)
-				return false;
+				WHERE `id_attribute`	IN ('.implode(',', $to_remove).')') ||
+				!Db::getInstance()->execute('
+				DELETE FROM `'._DB_PREFIX_.'attribute_shop`
+				WHERE `id_attribute`	IN ('.implode(',', $to_remove).')') ||
+				!Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)$this->id))
+					return false;
 			$this->cleanPositions();
 		}
 		$return = parent::delete();
@@ -54,6 +54,8 @@ class Autoload
 		$this->root_dir = dirname(dirname(__FILE__)).'/';
 		if (file_exists($this->root_dir.Autoload::INDEX_FILE))
 			$this->index = include($this->root_dir.Autoload::INDEX_FILE);
+		else
+			$this->generateIndex();
 	}

 	/**
@@ -80,9 +82,8 @@ class Autoload
 		if (strpos(strtolower($classname), 'smarty_') === 0)
 			return;

-		// regenerate the class index if the requested class is not found in the index or if the requested file doesn't exists
-		if (!isset($this->index[$classname])
-			|| ($this->index[$classname] && !is_file($this->root_dir.$this->index[$classname]))
+		// regenerate the class index if the requested file doesn't exists
+		if ((isset($this->index[$classname]) && $this->index[$classname] && !is_file($this->root_dir.$this->index[$classname]))
 			|| (isset($this->index[$classname.'Core']) && $this->index[$classname.'Core'] && !is_file($this->root_dir.$this->index[$classname.'Core'])))
 			$this->generateIndex();

@@ -138,18 +139,14 @@ class Autoload
 		{
 			$filename_tmp = tempnam(dirname($filename), basename($filename.'.'));
 			if($filename_tmp !== FALSE and file_put_contents($filename_tmp, $content, LOCK_EX) !== FALSE)
-            {
-				rename($filename_tmp, $filename);
-                @chmod($filename, 0664);
+			{
+				@rename($filename_tmp, $filename);
+				@chmod($filename, 0666);
 			}
-            else
-            {
-				// $filename_tmp couldn't be written. $filename should be there anyway (even if outdated),
-				// no need to die.
+			else
+				// $filename_tmp couldn't be written. $filename should be there anyway (even if outdated), no need to die.
 				error_log('Cannot write temporary file '.$filename_tmp);
-			}
 		}
-
 		$this->index = $classes;
 	}

@@ -192,4 +189,3 @@ class Autoload
 		return isset($this->index[$classname]) ? $this->index[$classname] : null;
 	}
 }
-
@@ -53,7 +53,7 @@ class CMSCore extends ObjectModel
 			'meta_keywords' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 255),
 			'meta_title' =>			array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 128),
 			'link_rewrite' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isLinkRewrite', 'required' => true, 'size' => 128),
-			'content' => 			array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isString', 'size' => 3999999999999),
+			'content' => 			array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml', 'size' => 3999999999999),
 		),
 	);

@@ -165,7 +165,7 @@ class CarrierCore extends ObjectModel
 	public function __construct($id = null, $id_lang = null)
 	{
 		parent::__construct($id, $id_lang);
-		
+
 		/**
 		 * keep retrocompatibility SHIPPING_METHOD_DEFAULT
 		 * @deprecated 1.5.5
@@ -462,7 +462,7 @@ class CarrierCore extends ObjectModel

 		return $carriers;
 	}
-	
+
 	public static function getIdTaxRulesGroupMostUsed()
 	{
 		return Db::getInstance()->getValue('
@@ -753,7 +753,7 @@ class CarrierCore extends ObjectModel
 	 * @param array $priceList Prices list in multiple arrays (changed to array since 1.5.0)
 	 * @return boolean Insertion result
 	 */
-	public function addDeliveryPrice($price_list)
+	public function addDeliveryPrice($price_list, $delete = false)
 	{
 		if (!$price_list)
 			return false;
@@ -772,6 +772,17 @@ class CarrierCore extends ObjectModel
 			if (!isset($values['id_shop_group']))
 				$values['id_shop_group'] = (Shop::getContext() != Shop::CONTEXT_ALL) ? Shop::getContextShopGroupID() : null;

+			if ($delete)
+				Db::getInstance()->execute('
+					DELETE FROM `'._DB_PREFIX_.'delivery` 
+					WHERE '.(is_null($values['id_shop']) ? 'ISNULL(`id_shop`) ' : 'id_shop = '.(int)$values['id_shop']).' 
+					AND '.(is_null($values['id_shop_group']) ? 'ISNULL(`id_shop`) ' : 'id_shop_group='.(int)$values['id_shop_group']).'
+					AND id_carrier='.(int)$values['id_carrier'].
+					($values['id_range_price'] !== null ? ' AND id_range_price='.(int)$values['id_range_price'] : ' AND (ISNULL(`id_range_price`) OR `id_range_price` = 0)').
+					($values['id_range_weight'] !== null ? ' AND id_range_weight='.(int)$values['id_range_weight'] : ' AND (ISNULL(`id_range_weight`) OR `id_range_weight` = 0)').'
+					AND id_zone='.(int)$values['id_zone']
+				);
+
 			$sql .= '(';
 			foreach ($values as $v)
 			{
@@ -875,8 +886,7 @@ class CarrierCore extends ObjectModel
 												(SELECT '.(int)$this->id.', `id_tax_rules_group`, `id_shop`
 													FROM `'._DB_PREFIX_.'carrier_tax_rules_group_shop`
 													WHERE `id_carrier`='.(int)$old_id.')');
-		// Update warehouse_carriers
-		Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'warehouse_carrier SET id_carrier='.(int)$this->id.' WHERE id_carrier='.(int)$old_id);
+
 	}

 	/**
@@ -1276,5 +1286,17 @@ class CarrierCore extends ObjectModel
 		
 		return true;
 	}
-}
+	
+	public function setGroups($groups, $delete = true)
+	{
+		if ($delete)
+			Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'carrier_group WHERE id_carrier = '.(int)$this->id);
+		if (!is_array($groups) || !count($groups))
+			return true;
+		$sql = 'INSERT INTO '._DB_PREFIX_.'carrier_group (id_carrier, id_group) VALUES ';
+		foreach ($groups as $id_group)
+				$sql .= '('.(int)$this->id.', '.(int)$id_group.'),';

+		return Db::getInstance()->execute(rtrim($sql, ','));
+	}
+}
@@ -134,6 +134,7 @@ class CartCore extends ObjectModel
 			'cart_rows' => array('resource' => 'cart_row', 'virtual_entity' => true, 'fields' => array(
 				'id_product' => array('required' => true, 'xlink_resource' => 'products'),
 				'id_product_attribute' => array('required' => true, 'xlink_resource' => 'combinations'),
+				'id_address_delivery' => array('required' => true, 'xlink_resource' => 'addresses'),
 				'quantity' => array('required' => true),
 				)
 			),
@@ -209,7 +210,7 @@ class CartCore extends ObjectModel
 		if (!isset($this->id_address_invoice) || $this->id_address_invoice == $id_address)
 		{
 			$to_update = true;
-			$this->context->cart->id_address_invoice = $id_address_new;
+			$this->id_address_invoice = $id_address_new;
 		}
 		if (!isset($this->id_address_delivery) || $this->id_address_delivery == $id_address)
 		{
@@ -761,9 +762,13 @@ class CartCore extends ObjectModel
 	{
 		// You can't add a cart rule that does not exist
 		$cartRule = new CartRule($id_cart_rule, Context::getContext()->language->id);
+
 		if (!Validate::isLoadedObject($cartRule))
 			return false;
 		
+		if (Db::getInstance()->getValue('SELECT id_cart_rule FROM '._DB_PREFIX_.'cart_cart_rule WHERE id_cart_rule = '.(int)$id_cart_rule.' AND id_cart = '.(int)$this->id))
+			return false;
+			
 		// Add the cart rule to the cart
 		if (!Db::getInstance()->insert('cart_cart_rule', array(
 			'id_cart_rule' => (int)$id_cart_rule,
@@ -2543,6 +2548,7 @@ class CartCore extends ObjectModel
 		if (empty($id_carrier) && $this->isCarrierInRange((int)Configuration::get('PS_CARRIER_DEFAULT'), (int)$id_zone))
 			$id_carrier = (int)Configuration::get('PS_CARRIER_DEFAULT');

+		$total_package_without_shipping_tax_inc = $this->getOrderTotal(true, Cart::BOTH_WITHOUT_SHIPPING, $product_list);
 		if (empty($id_carrier))
 		{
 			if ((int)$this->id_customer)
@@ -2577,7 +2583,7 @@ class CartCore extends ObjectModel
 				{
 					$check_delivery_price_by_weight = Carrier::checkDeliveryPriceByWeight($row['id_carrier'], $this->getTotalWeight(), (int)$id_zone);

-					$total_order = $this->getOrderTotal(true, Cart::BOTH_WITHOUT_SHIPPING, $product_list);
+					$total_order = $total_package_without_shipping_tax_inc;
 					$check_delivery_price_by_price = Carrier::checkDeliveryPriceByPrice($row['id_carrier'], $total_order, (int)$id_zone, (int)$this->id_currency);

 					// Get only carriers that have a range compatible with cart
@@ -2680,26 +2686,8 @@ class CartCore extends ObjectModel
 					$id_zone = (int)$default_country->id_zone;
 			}

-			$check_delivery_price_by_weight = Carrier::checkDeliveryPriceByWeight((int)$carrier->id, $this->getTotalWeight(), (int)$id_zone);
-
-			// Code Review V&V TO FINISH
-			$check_delivery_price_by_price = Carrier::checkDeliveryPriceByPrice(
-				$carrier->id,
-				$this->getOrderTotal(
-					true,
-					Cart::BOTH_WITHOUT_SHIPPING,
-					$product_list
-				),
-				$id_zone,
-				(int)$this->id_currency
-			);
-
-			if ((
-					$carrier->getShippingMethod() == Carrier::SHIPPING_METHOD_WEIGHT
-					&& !$check_delivery_price_by_weight
-				) || (
-					$carrier->getShippingMethod() == Carrier::SHIPPING_METHOD_PRICE
-					&& !$check_delivery_price_by_price
+			if (($carrier->getShippingMethod() == Carrier::SHIPPING_METHOD_WEIGHT && !Carrier::checkDeliveryPriceByWeight($carrier->id, $this->getTotalWeight(), (int)$id_zone))
+			|| ($carrier->getShippingMethod() == Carrier::SHIPPING_METHOD_PRICE && !Carrier::checkDeliveryPriceByPrice($carrier->id, $total_package_without_shipping_tax_inc, $id_zone, (int)$this->id_currency)
 			))
 				$shipping_cost += 0;
 			else
@@ -2846,7 +2834,10 @@ class CartCore extends ObjectModel
 		$formatted_addresses['delivery'] = AddressFormat::getFormattedLayoutData($delivery);		
 		$formatted_addresses['invoice'] = AddressFormat::getFormattedLayoutData($invoice);

-		$total_tax = $this->getOrderTotal() - $this->getOrderTotal(false);
+		$base_total_tax_inc = $this->getOrderTotal(true);
+		$base_total_tax_exc = $this->getOrderTotal(false);
+		
+		$total_tax = $base_total_tax_inc - $base_total_tax_exc;

 		if ($total_tax < 0)
 			$total_tax = 0;
@@ -2944,9 +2935,9 @@ class CartCore extends ObjectModel
 			'total_shipping_tax_exc' => $total_shipping_tax_exc,
 			'total_products_wt' => $total_products_wt,
 			'total_products' => $total_products,
-			'total_price' => $this->getOrderTotal(),
+			'total_price' => $base_total_tax_inc,
 			'total_tax' => $total_tax,
-			'total_price_without_tax' => $this->getOrderTotal(false),
+			'total_price_without_tax' => $base_total_tax_exc,
 			'is_multi_address_delivery' => $this->isMultiAddressDelivery() || ((int)Tools::getValue('multi-shipping') == 1),
 			'free_ship' => $total_shipping ? 0 : 1,
 			'carrier' => new Carrier($this->id_carrier, $id_lang),
@@ -3044,8 +3035,10 @@ class CartCore extends ObjectModel
 	public function addTextFieldToProduct($id_product, $index, $type, $text_value)
 	{
 		$text_value = str_replace(array("\n", "\r"), '', nl2br($text_value));
-		$text_value = str_replace('\\', '\\\\', $text_value);
-		$text_value = str_replace('\'', '\\\'', $text_value);
+		if (!_PS_MAGIC_QUOTES_GPC_){
+			$text_value = str_replace('\\', '\\\\', $text_value);
+			$text_value = str_replace('\'', '\\\'', $text_value);
+		}
 		return $this->_addCustomization($id_product, 0, $index, $type, $text_value, 0);
 	}

@@ -3221,25 +3214,24 @@ class CartCore extends ObjectModel

 	public function getWsCartRows()
 	{
-		$query = '
+		return Db::getInstance()->executeS('
 			SELECT id_product, id_product_attribute, quantity
 			FROM `'._DB_PREFIX_.'cart_product`
-			WHERE id_cart = '.(int)$this->id.'
-				AND id_shop = '.(int)Context::getContext()->shop->id;
-
-		$result = Db::getInstance()->executeS($query);
-		return $result;
+			WHERE id_cart = '.(int)$this->id.' AND id_shop = '.(int)Context::getContext()->shop->id
+		);
 	}

 	public function setWsCartRows($values)
 	{
 		if ($this->deleteAssociations())
 		{
-			$query = 'INSERT INTO `'._DB_PREFIX_.'cart_product`(`id_cart`, `id_product`, `id_product_attribute`, `quantity`, `date_add`, `id_shop`) VALUES ';
+			$query = 'INSERT INTO `'._DB_PREFIX_.'cart_product`(`id_cart`, `id_product`, `id_product_attribute`, `id_address_delivery`, `quantity`, `date_add`, `id_shop`) VALUES ';

 			foreach ($values as $value)
 				$query .= '('.(int)$this->id.', '.(int)$value['id_product'].', '.
-					(isset($value['id_product_attribute']) ? (int)$value['id_product_attribute'] : 'NULL').', '.(int)$value['quantity'].', NOW(), '.(int)Context::getContext()->shop->id.'),';
+					(isset($value['id_product_attribute']) ? (int)$value['id_product_attribute'] : 'NULL').', '.
+					(isset($value['id_address_delivery']) ? (int)$value['id_address_delivery'] : 0).', '.
+					(int)$value['quantity'].', NOW(), '.(int)Context::getContext()->shop->id.'),';

 			Db::getInstance()->execute(rtrim($query, ','));
 		}
@@ -3424,62 +3416,68 @@ class CartCore extends ObjectModel
 	 */
 	public function setNoMultishipping()
 	{
-		// Upgrading quantities
-		$sql = 'SELECT sum(`quantity`) as quantity, id_product, id_product_attribute, count(*) as count
-				FROM `'._DB_PREFIX_.'cart_product`
-				WHERE `id_cart` = '.(int)$this->id.'
-					AND `id_shop` = '.(int)$this->id_shop.'
-				GROUP BY id_product, id_product_attribute
-				HAVING count > 1';
-
-		foreach (Db::getInstance()->executeS($sql) as $product)
+		$emptyCache = $result = false;
+		if (Configuration::get('PS_ALLOW_MULTISHIPPING'))
 		{
-			$sql = 'UPDATE `'._DB_PREFIX_.'cart_product`
-				SET `quantity` = '.$product['quantity'].'
-				WHERE  `id_cart` = '.(int)$this->id.'
-					AND `id_shop` = '.(int)$this->id_shop.'
-					AND id_product = '.$product['id_product'].'
-					AND id_product_attribute = '.$product['id_product_attribute'];
-				Db::getInstance()->execute($sql);
+			// Upgrading quantities
+			$sql = 'SELECT sum(`quantity`) as quantity, id_product, id_product_attribute, count(*) as count
+					FROM `'._DB_PREFIX_.'cart_product`
+					WHERE `id_cart` = '.(int)$this->id.'
+						AND `id_shop` = '.(int)$this->id_shop.'
+					GROUP BY id_product, id_product_attribute
+					HAVING count > 1';
+
+			foreach (Db::getInstance()->executeS($sql) as $product)
+			{
+				$sql = 'UPDATE `'._DB_PREFIX_.'cart_product`
+					SET `quantity` = '.$product['quantity'].'
+					WHERE  `id_cart` = '.(int)$this->id.'
+						AND `id_shop` = '.(int)$this->id_shop.'
+						AND id_product = '.$product['id_product'].'
+						AND id_product_attribute = '.$product['id_product_attribute'];
+				$result = Db::getInstance()->execute($sql);
+				if ($result)
+					$emptyCache = true;
+			}
+
+			// Merging multiple lines
+			$sql = 'DELETE cp1
+				FROM `'._DB_PREFIX_.'cart_product` cp1
+					INNER JOIN `'._DB_PREFIX_.'cart_product` cp2
+					ON (
+						(cp1.id_cart = cp2.id_cart)
+						AND (cp1.id_product = cp2.id_product)
+						AND (cp1.id_product_attribute = cp2.id_product_attribute)
+						AND (cp1.id_address_delivery <> cp2.id_address_delivery)
+						AND (cp1.date_add > cp2.date_add)
+					)';
+					Db::getInstance()->execute($sql);
 		}
-
-		// Merging multiple lines
-		$sql = 'DELETE cp1
-			FROM `'._DB_PREFIX_.'cart_product` cp1
-				INNER JOIN `'._DB_PREFIX_.'cart_product` cp2
-				ON (
-					(cp1.id_cart = cp2.id_cart)
-					AND (cp1.id_product = cp2.id_product)
-					AND (cp1.id_product_attribute = cp2.id_product_attribute)
-					AND (cp1.id_address_delivery <> cp2.id_address_delivery)
-					AND (cp1.date_add > cp2.date_add)
-				)';
-				Db::getInstance()->execute($sql);
-
-		// Upgrading address delivery
+		
+		// Update delivery address for each product line
 		$sql = 'UPDATE `'._DB_PREFIX_.'cart_product`
-			SET `id_address_delivery` =
-			(
-				SELECT `id_address_delivery`
-				FROM `'._DB_PREFIX_.'cart`
-				WHERE `id_cart` = '.(int)$this->id.'
-					AND `id_shop` = '.(int)$this->id_shop.'
-			)
-			WHERE `id_cart` = '.(int)$this->id.'
-			'.(Configuration::get('PS_ALLOW_MULTISHIPPING') ? ' AND `id_shop` = '.(int)$this->id_shop : '');
+		SET `id_address_delivery` = (
+			SELECT `id_address_delivery` FROM `'._DB_PREFIX_.'cart`
+			WHERE `id_cart` = '.(int)$this->id.' AND `id_shop` = '.(int)$this->id_shop.'
+		)
+		WHERE `id_cart` = '.(int)$this->id.'
+		'.(Configuration::get('PS_ALLOW_MULTISHIPPING') ? ' AND `id_shop` = '.(int)$this->id_shop : '');
+	
+		$result = Db::getInstance()->execute($sql);
+		if ($result)
+			$emptyCache = true;

-		Db::getInstance()->execute($sql);
-
-		$sql = 'UPDATE `'._DB_PREFIX_.'customization`
-			SET `id_address_delivery` =
-			(
-				SELECT `id_address_delivery`
-				FROM `'._DB_PREFIX_.'cart`
+		if (Customization::isFeatureActive())
+			Db::getInstance()->execute('
+			UPDATE `'._DB_PREFIX_.'customization`
+			SET `id_address_delivery` = (
+				SELECT `id_address_delivery` FROM `'._DB_PREFIX_.'cart`
 				WHERE `id_cart` = '.(int)$this->id.'
 			)
-			WHERE `id_cart` = '.(int)$this->id;
+			WHERE `id_cart` = '.(int)$this->id);

-		Db::getInstance()->execute($sql);
+		if ($emptyCache)	
+			$this->_products = null;
 	}

 	/**
@@ -10,7 +10,7 @@
 * http://opensource.org/licenses/osl-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 502immediately.
+* to license@prestashop.com so we can send you a copy immediately.
 *
 * DISCLAIMER
 *
@@ -464,7 +464,7 @@ class CartRuleCore extends ObjectModel
 		// Check if the products chosen by the customer are usable with the cart rule
 		if ($this->product_restriction)
 		{
-			$r = $this->checkProductRestrictions($context, false, $display_error);
+			$r = $this->checkProductRestrictions($context, false, $display_error, $alreadyInCart);
 			if ($r !== false && $display_error)
 				return $r;
 			elseif (!$r && !$display_error)
@@ -495,36 +495,14 @@ class CartRuleCore extends ObjectModel
 			$cartTotal = $context->cart->getOrderTotal($this->minimum_amount_tax, Cart::ONLY_PRODUCTS);
 			if ($this->minimum_amount_shipping)
 				$cartTotal += $context->cart->getOrderTotal($this->minimum_amount_tax, Cart::ONLY_SHIPPING);
+			$products = $context->cart->getProducts();
+			$cart_rules = $context->cart->getCartRules();

-			// If a product is given for free in this rule and already in the cart, the price is subtracted
-			if ($this->gift_product && $alreadyInCart)
-			{
-				$query = new DbQuery();
-				
-				$query->select('id_product');
-				$query->from('cart_product');
-				$query->where('id_product = '.(int)$this->gift_product);
-				$query->where('id_cart = '.(int)$context->cart->id);
-				
-				if ((int)$this->gift_product_attribute)
-					$query->where('id_product_attribute = '.(int)$this->gift_product_attribute);
-				
-				if (Db::getInstance()->getValue($query))
-				{
-					$ref = false;
-					$product_price = Product::getPriceStatic(
-						$this->gift_product,
-						$this->minimum_amount_tax,
-						$this->gift_product_attribute,
-						null, null, false, true, 1, null,
-						$context->cart->id_customer ? $context->cart->id_customer : null,
-						$context->cart->id,
-						(int)$context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')} ? (int)$context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')} : null,
-						$ref, true, true, $context, true
-					);
-					$cartTotal -= $product_price;
-				}
-			}
+			foreach ($cart_rules as &$cart_rule)
+				if ($cart_rule['gift_product'])
+					foreach ($products as $key => &$product)
+						if (empty($product['gift']) && $product['id_product'] == $cart_rule['gift_product'] && $product['id_product_attribute'] == $cart_rule['gift_product_attribute'])
+							$cartTotal = Tools::ps_round($cartTotal - $product[$this->minimum_amount_tax ? 'price_wt' : 'price'], (int)$context->currency->decimals * _PS_PRICE_DISPLAY_PRECISION_);

 			if ($cartTotal < $minimum_amount)
 				return (!$display_error) ? false : Tools::displayError('You have not reached the minimum amount required to use this voucher');
@@ -545,6 +523,7 @@ class CartRuleCore extends ObjectModel
 					return (!$display_error) ? false : Tools::displayError('This voucher is already in your cart');
 				if ($otherCartRule['gift_product'])
 					--$nb_products;
+
 				if ($this->cart_rule_restriction && $otherCartRule['cart_rule_restriction'] && $otherCartRule['id_cart_rule'] != $this->id)
 				{
 					$combinable = Db::getInstance()->getValue('
@@ -572,7 +551,7 @@ class CartRuleCore extends ObjectModel
 			return true;
 	}

-	protected function checkProductRestrictions(Context $context, $return_products = false, $display_error = true)
+	protected function checkProductRestrictions(Context $context, $return_products = false, $display_error = true, $alreadyInCart = false)
 	{
 		$selectedProducts = array();

@@ -607,6 +586,8 @@ class CartRuleCore extends ObjectModel
 								if (in_array($cartAttribute['id_attribute'], $productRule['values']))
 								{
 									$countMatchingProducts += $cartAttribute['quantity'];
+									if ($alreadyInCart && $this->gift_product == $cartProduct['id_product']&& $this->gift_product_attribute == $cartProduct['id_product_attribute'])
+										--$countMatchingProducts;
 									$matchingProductsList[] = $cartAttribute['id_product'].'-'.$cartAttribute['id_product_attribute'];
 								}
 							if ($countMatchingProducts < $productRuleGroup['quantity'])
@@ -625,6 +606,8 @@ class CartRuleCore extends ObjectModel
 								if (in_array($cartProduct['id_product'], $productRule['values']))
 								{
 									$countMatchingProducts += $cartProduct['quantity'];
+									if ($alreadyInCart && $this->gift_product == $cartProduct['id_product'])
+										--$countMatchingProducts;
 									$matchingProductsList[] = $cartProduct['id_product'].'-0';
 								}
 							if ($countMatchingProducts < $productRuleGroup['quantity'])
@@ -1104,32 +1087,33 @@ class CartRuleCore extends ObjectModel
 			'.($context->customer->id ? 'OR cr.id_customer = '.(int)$context->cart->id_customer : '').'
 		)
 		AND (
-			cr.carrier_restriction = 0
+			cr.`carrier_restriction` = 0
 			'.($context->cart->id_carrier ? 'OR c.id_carrier = '.(int)$context->cart->id_carrier : '').'
 		)
 		AND (
-			cr.shop_restriction = 0
+			cr.`shop_restriction` = 0
 			'.((Shop::isFeatureActive() && $context->shop->id) ? 'OR crs.id_shop = '.(int)$context->shop->id : '').'
 		)
 		AND (
-			cr.group_restriction = 0
+			cr.`group_restriction` = 0
 			'.($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 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
+				SELECT cg.`id_group`
+				FROM `'._DB_PREFIX_.'customer_group` cg
+				INNER 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.'
+				LIMIT 1
 			)' : '').'
 		)
 		AND (
-			cr.reduction_product <= 0
-			OR cr.reduction_product IN (
-				SELECT id_product
-				FROM '._DB_PREFIX_.'cart_product
-				WHERE id_cart = '.(int)$context->cart->id.'
+			cr.`reduction_product` <= 0
+			OR cr.`reduction_product` IN (
+				SELECT `id_product`
+				FROM `'._DB_PREFIX_.'cart_product`
+				WHERE `id_cart` = '.(int)$context->cart->id.'
 			)
 		)
-		AND cr.id_cart_rule NOT IN (SELECT id_cart_rule	FROM '._DB_PREFIX_.'cart_cart_rule WHERE id_cart = '.(int)$context->cart->id.')
+		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';
 		$result = Db::getInstance()->executeS($sql);
 		if ($result)
@@ -1206,7 +1190,7 @@ class CartRuleCore extends ObjectModel
 			SELECT cr.*, crl.*
 			FROM '._DB_PREFIX_.'cart_rule cr
 			LEFT JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)$id_lang.')
-			WHERE code LIKE \'%'.pSQL($name).'%\'
+			WHERE code LIKE \'%'.pSQL($name).'%\' OR name LIKE \'%'.pSQL($name).'%\'
 		');
 	}
 }
@@ -109,7 +109,7 @@ class CategoryCore extends ObjectModel
 			// Lang fields
 			'name' => 				array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isCatalogName', 'required' => true, 'size' => 64),
 			'link_rewrite' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isLinkRewrite', 'required' => true, 'size' => 64),
-			'description' => 		array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isString'),
+			'description' => 		array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml'),
 			'meta_title' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 128),
 			'meta_description' => 	array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 255),
 			'meta_keywords' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 255),
@@ -796,7 +796,7 @@ class CategoryCore extends ObjectModel
 				)).')';

 		$flag = Db::getInstance()->execute('
-			INSERT INTO `'._DB_PREFIX_.'category_product` (`id_product`, `id_category`, `position`)
+			INSERT IGNORE INTO `'._DB_PREFIX_.'category_product` (`id_product`, `id_category`, `position`)
 			VALUES '.implode(',', $row)
 		);
 		return $flag;
@@ -831,20 +831,15 @@ class CategoryCore extends ObjectModel
 		if (!Validate::isUnsignedId($id_category) || !Validate::isUnsignedId($id_lang))
 			return false;

-		if (isset(self::$_links[$id_category.'-'.$id_lang]))
-			return self::$_links[$id_category.'-'.$id_lang];
-
-		$result = Db::getInstance()->getRow('
-			SELECT cl.`link_rewrite`
-			FROM `'._DB_PREFIX_.'category_lang` cl
-			WHERE `id_lang` = '.(int)$id_lang.'
-			'.Shop::addSqlRestrictionOnLang('cl').'
-			AND cl.`id_category` = '.(int)$id_category
-		);
-
-		self::$_links[$id_category.'-'.$id_lang] = $result['link_rewrite'];
-
-		return $result['link_rewrite'];
+		if (!isset(self::$_links[$id_category.'-'.$id_lang]))
+			self::$_links[$id_category.'-'.$id_lang] = Db::getInstance()->getValue('
+				SELECT cl.`link_rewrite`
+				FROM `'._DB_PREFIX_.'category_lang` cl
+				WHERE `id_lang` = '.(int)$id_lang.'
+				'.Shop::addSqlRestrictionOnLang('cl').'
+				AND cl.`id_category` = '.(int)$id_category
+			);
+		return self::$_links[$id_category.'-'.$id_lang];
 	}

 	public function getLink(Link $link = null)
@@ -1395,8 +1390,7 @@ class CategoryCore extends ObjectModel
 		SELECT DISTINCT c.*
 		FROM `'._DB_PREFIX_.'category` c
 		LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category` AND cl.`id_lang` = '.(int)Context::getContext()->language->id.')
-		WHERE `level_depth` = 1
-		');
+		WHERE `level_depth` = 1');
 	}

 	public function isRootCategoryForAShop()
@@ -74,6 +74,16 @@ class CollectionCore implements Iterator, ArrayAccess, Countable
 	 * @var int Total of elements for iteration
 	 */
 	protected $total;
+	
+	/**
+	 * @var int Page number
+	 */
+	protected $page_number = 0;
+	
+	/**
+	 * @var int Size of a page
+	 */
+	protected $page_size = 0;

 	protected $fields = array();
 	protected $alias = array();
@@ -334,6 +344,11 @@ class CollectionCore implements Iterator, ArrayAccess, Countable
 				break;
 			}
 		}
+		
+		// All limit clause
+		if ($this->page_size)
+			$this->query->limit($this->page_size, $this->page_number * $this->page_size);
+		

 		// Shall we display query for debug ?
 		if ($display_query)
@@ -659,6 +674,34 @@ class CollectionCore implements Iterator, ArrayAccess, Countable
 		}
 		return $this->fields[$field];
 	}
+	
+	/**
+	 * Set the page number
+	 *
+	 * @param int $page_number
+	 * @return Collection
+	 */
+	public function setPageNumber($page_number)
+	{
+		$page_number = (int)$page_number;
+		if ($page_number > 0)
+			$page_number--;
+		
+		$this->page_number = $page_number;
+		return $this;
+	}
+	
+	/**
+	 * Set the nuber of item per page
+	 *
+	 * @param int $page_size
+	 * @return Collection
+	 */
+	public function setPageSize($page_size)
+	{
+		$this->page_size = (int)$page_size;
+		return $this;
+	}

 	/**
 	 * Generate uniq alias from association name
@@ -102,7 +102,14 @@ class CombinationCore extends ObjectModel
 			
 		// Removes the product from StockAvailable, for the current shop
 		StockAvailable::removeProductFromStockAvailable((int)$this->id_product, (int)$this->id);
-		
+
+		if ($specific_prices = SpecificPrice::getByProductId((int)$this->id_product, (int)$this->id))
+			foreach ($specific_prices as $specific_price)
+				{
+					$price = new SpecificPrice((int)$specific_price['id_specific_price']);
+					$price->delete();
+				}
+
 		if (!$this->hasMultishopEntries() && !$this->deleteAssociations())
 			return false;
 		return true;
@@ -128,6 +135,7 @@ class CombinationCore extends ObjectModel
 	{
 		$result = Db::getInstance()->delete('product_attribute_combination', '`id_product_attribute` = '.(int)$this->id);
 		$result &= Db::getInstance()->delete('cart_product', '`id_product_attribute` = '.(int)$this->id);
+		$result &= Db::getInstance()->delete('product_attribute_image', '`id_product_attribute` = '.(int)$this->id);

 		return $result;
 	}
@@ -49,7 +49,6 @@ class ConfigurationTestCore
 			'mysql_support' => false,
 			'config_dir' => 'config',
 			'cache_dir' => 'cache',
-			'sitemap' => 'sitemap.xml',
 			'log_dir' => 'log',
 			'img_dir' => 'img',
 			'mails_dir' => 'mails',
@@ -59,7 +58,8 @@ class ConfigurationTestCore
 			'theme_cache_dir' => 'themes/'._THEME_NAME_.'/cache/',
 			'translations_dir' => 'translations',
 			'customizable_products_dir' => 'upload',
-			'virtual_products_dir' => 'download'
+			'virtual_products_dir' => 'download',
+			'files' => false
 		);
 	}

@@ -319,4 +319,21 @@ class ConfigurationTestCore
 	{
 		return extension_loaded('Dom');
 	}
+	
+	public static function test_files()
+	{
+		$files = array(
+			'/cache/smarty/compile/index.php',
+			'/classes/log/index.php',
+			'/classes/cache/index.php',
+			'/config/index.php',
+			'/tools/tar/Archive_Tar.php',
+			'/tools/pear/PEAR.php',
+			'/index.php'
+		);
+		foreach ($files as $file)
+			if (!file_exists(rtrim(_PS_ROOT_DIR_, DIRECTORY_SEPARATOR).str_replace('/', DIRECTORY_SEPARATOR, $file)))
+				return false;
+		return true;		
+	}
 }
@@ -82,8 +82,12 @@ class ConnectionCore extends ObjectModel
 		// The connection is created if it does not exist yet and we get the current page id
 		if (!isset($cookie->id_connections) || !strstr(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '', Tools::getHttpHost(false, false)))
 			$id_page = Connection::setNewConnection($cookie);
+		// If we do not track the pages, no need to get the page id
+		if (!Configuration::get('PS_STATSDATA_PAGESVIEWS') && !Configuration::get('PS_STATSDATA_CUSTOMER_PAGESVIEWS'))
+			return array();
 		if (!isset($id_page) || !$id_page)
 			$id_page = Page::getCurrentId();
+		// If we do not track the page views by customer, the id_page is the only information needed
 		if (!Configuration::get('PS_STATSDATA_CUSTOMER_PAGESVIEWS'))
 			return array('id_page' => $id_page);

@@ -93,7 +97,7 @@ class ConnectionCore extends ObjectModel
 			'id_connections' => (int)$cookie->id_connections,
 			'id_page' => (int)$id_page,
 			'time_start' => $time_start
-		));
+		), false, true, Db::INSERT_IGNORE);

 		// This array is serialized and used by the ajax request to identify the page
 		return array(
@@ -110,7 +114,7 @@ class ConnectionCore extends ObjectModel
 			// This is a bot and we have to retrieve its connection ID
 			$sql = 'SELECT `id_connections` FROM `'._DB_PREFIX_.'connections`
 					WHERE ip_address = '.ip2long(Tools::getRemoteAddr()).'
-						AND DATE_ADD(`date_add`, INTERVAL 30 MINUTE) > \''.pSQL(date('Y-m-d H:i:00')).'\'
+						AND `date_add` > \''.pSQL(date('Y-m-d H:i:00', time() - 1800)).'\'
 						'.Shop::addSqlRestriction(Shop::SHARE_CUSTOMER).'
 					ORDER BY `date_add` DESC';
 			if ($id_connections = Db::getInstance()->getValue($sql))
@@ -124,7 +128,7 @@ class ConnectionCore extends ObjectModel
 		$sql = 'SELECT `id_guest`
 				FROM `'._DB_PREFIX_.'connections`
 				WHERE `id_guest` = '.(int)$cookie->id_guest.'
-					AND DATE_ADD(`date_add`, INTERVAL 30 MINUTE) > \''.pSQL(date('Y-m-d H:i:00')).'\'
+					AND `date_add` > \''.pSQL(date('Y-m-d H:i:00', time() - 1800)).'\'
 					'.Shop::addSqlRestriction(Shop::SHARE_CUSTOMER).'
 				ORDER BY `date_add` DESC';
 		$result = Db::getInstance()->getRow($sql);
@@ -298,7 +298,11 @@ class CookieCore

 		//checks if the language exists, if not choose the default language
 		if (!$this->_standalone && !Language::getLanguage((int)$this->id_lang))
+		{
 			$this->id_lang = Configuration::get('PS_LANG_DEFAULT');
+			// set detect_language to force going through Tools::setCookieLanguage to figure out browser lang
+			$this->detect_language = true;
+		}

 	}

@@ -121,20 +121,23 @@ class CountryCore extends ObjectModel
 	public static function getCountries($id_lang, $active = false, $contain_states = false, $list_states = true)
 	{
 		$countries = array();
-		foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT cl.*,c.*, cl.`name` country, z.`name` zone
-				FROM `'._DB_PREFIX_.'country` c '.Shop::addSqlAssociation('country', 'c').'
-				LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country` AND cl.`id_lang` = '.(int)$id_lang.')
-				LEFT JOIN `'._DB_PREFIX_.'zone` z ON (z.`id_zone` = c.`id_zone`)
-				WHERE 1'.($active ? ' AND c.active = 1' : '').($contain_states ? ' AND c.`contains_states` = '.(int)$contain_states : '').'
-				ORDER BY cl.name ASC') as $country)
-			$countries[$country['id_country']] = $country;
+		$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
+		SELECT cl.*,c.*, cl.`name` country, z.`name` zone
+		FROM `'._DB_PREFIX_.'country` c '.Shop::addSqlAssociation('country', 'c').'
+		LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country` AND cl.`id_lang` = '.(int)$id_lang.')
+		LEFT JOIN `'._DB_PREFIX_.'zone` z ON (z.`id_zone` = c.`id_zone`)
+		WHERE 1'.($active ? ' AND c.active = 1' : '').($contain_states ? ' AND c.`contains_states` = '.(int)$contain_states : '').'
+		ORDER BY cl.name ASC');
+		foreach ($result as $row)
+			$countries[$row['id_country']] = $row;

 		if ($list_states)
-			foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'state` ORDER BY `name` ASC') as $state)
-				if (isset($countries[$state['id_country']])) /* Does not keep the state if its country has been disabled and not selected */
-					if ($state['active'] == 1)
-						$countries[$state['id_country']]['states'][] = $state;
-
+		{
+			$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'state` ORDER BY `name` ASC');
+			foreach ($result as $row)
+				if (isset($countries[$row['id_country']]) && $row['active'] == 1) /* Does not keep the state if its country has been disabled and not selected */
+						$countries[$row['id_country']]['states'][] = $row;
+		}
 		return $countries;
 	}

@@ -81,6 +81,7 @@ class CurrencyCore extends ObjectModel

 	/** @var array Currency cache */
 	static protected $currencies = array();
+	protected static $countActiveCurrencies = array();

 	protected $webserviceParameters = array(
 		'objectsNodeName' => 'currencies',
@@ -414,5 +415,23 @@ class CurrencyCore extends ObjectModel
 			self::$currencies[(int)($id)] = new Currency($id);
 		return self::$currencies[(int)($id)];
 	}
-}
+	
+	public static function countActiveCurrencies($id_shop = null)
+	{
+		if ($id_shop === null)
+			$id_shop = (int)Context::getContext()->shop->id;

+		if (!isset(self::$countActiveCurrencies[$id_shop]))
+			self::$countActiveCurrencies[$id_shop] = Db::getInstance()->getValue('
+				SELECT COUNT(DISTINCT c.id_currency) FROM `'._DB_PREFIX_.'currency` c
+				LEFT JOIN '._DB_PREFIX_.'currency_shop cs ON (cs.id_currency = c.id_currency AND cs.id_shop = '.(int)$id_shop.')
+				WHERE c.`active` = 1
+			');
+		return self::$countActiveCurrencies[$id_shop];
+	}
+
+	public static function isMultiCurrencyActivated($id_shop = null)
+	{
+		return (Currency::countActiveCurrencies($id_shop) > 1);
+	}
+}
@@ -369,7 +369,7 @@ class DispatcherCore

 		// If there are several languages, get language from uri
 		if ($this->use_routes && Language::isMultiLanguageActivated())
-			if (preg_match('#^/([a-z]{2})/#', $this->request_uri, $m))
+			if (preg_match('#^/([a-z]{2})/?#', $this->request_uri, $m))
 			{
 				$_GET['isolang'] = $m[1];
 				$this->request_uri = substr($this->request_uri, 3);
@@ -379,12 +379,12 @@ class DispatcherCore
 	/**
 	 * Load default routes group by languages
 	 */
-	protected function loadRoutes()
+	protected function loadRoutes($id_shop = null)
 	{
 		$context = Context::getContext();
 		
 		// Load custom routes from modules
-		$modules_routes = Hook::exec('moduleRoutes', array(), null, true, false);
+		$modules_routes = Hook::exec('moduleRoutes', array('id_shop' => $id_shop), null, true, false);
 		if (is_array($modules_routes) && count($modules_routes))
 			foreach($modules_routes as $module_route)
 				foreach($module_route as $route => $route_details)
@@ -405,7 +405,8 @@ class DispatcherCore
 					$route['controller'],
 					$lang['id_lang'],
 					$route['keywords'],
-					isset($route['params']) ? $route['params'] : array()
+					isset($route['params']) ? $route['params'] : array(),
+					$id_shop
 				);
 		
 		// Load the custom routes prior the defaults to avoid infinite loops
@@ -420,13 +421,13 @@ class DispatcherCore
 			// Load routes from meta table
 			$sql = 'SELECT m.page, ml.url_rewrite, ml.id_lang
 					FROM `'._DB_PREFIX_.'meta` m
-					LEFT JOIN `'._DB_PREFIX_.'meta_lang` ml ON (m.id_meta = ml.id_meta'.Shop::addSqlRestrictionOnLang('ml').')
+					LEFT JOIN `'._DB_PREFIX_.'meta_lang` ml ON (m.id_meta = ml.id_meta'.Shop::addSqlRestrictionOnLang('ml', $id_shop).')
 					ORDER BY LENGTH(ml.url_rewrite) DESC';
 			if ($results = Db::getInstance()->executeS($sql))
 				foreach ($results as $row)
 				{
 					if ($row['url_rewrite'])
-						$this->addRoute($row['page'], $row['url_rewrite'], $row['page'], $row['id_lang']);
+						$this->addRoute($row['page'], $row['url_rewrite'], $row['page'], $row['id_lang'], array(), array(), $id_shop);
 				}

 			// Set default empty route if no empty route (that's weird I know)
@@ -439,7 +440,7 @@ class DispatcherCore

 			// Load custom routes
 			foreach ($this->default_routes as $route_id => $route_data)
-				if ($custom_route = Configuration::get('PS_ROUTE_'.$route_id))
+				if ($custom_route = Configuration::get('PS_ROUTE_'.$route_id, null, null, $id_shop))
 					foreach (Language::getLanguages() as $lang)
 						$this->addRoute(
 							$route_id,
@@ -447,7 +448,8 @@ class DispatcherCore
 							$route_data['controller'],
 							$lang['id_lang'],
 							$route_data['keywords'],
-							isset($route_data['params']) ? $route_data['params'] : array()
+							isset($route_data['params']) ? $route_data['params'] : array(),
+							$id_shop
 						);
 		}
 	}
@@ -458,11 +460,15 @@ class DispatcherCore
 	 * @param string $rule Url rule
 	 * @param string $controller Controller to call if request uri match the rule
 	 * @param int $id_lang
+ 	 * @param int $id_shop
 	 */
-	public function addRoute($route_id, $rule, $controller, $id_lang = null, array $keywords = array(), array $params = array())
+	public function addRoute($route_id, $rule, $controller, $id_lang = null, array $keywords = array(), array $params = array(), $id_shop = null)
 	{
-		if (is_null($id_lang))
-			$id_lang = Context::getContext()->language->id;
+		if ($id_lang === null)
+			$id_lang = (int)Context::getContext()->language->id;
+		
+		if ($id_shop === null)
+			$id_shop = (int)Context::getContext()->shop->id;
 		
 		$regexp = preg_quote($rule, '#');
 		if ($keywords)
@@ -497,10 +503,12 @@ class DispatcherCore
 		}

 		$regexp = '#^/'.$regexp.'(\?.*)?$#u';
-		if (!isset($this->routes[$id_lang]))
-			$this->routes[$id_lang] = array();
+		if (!isset($this->routes[$id_shop]))
+			$this->routes[$id_shop] = array();
+		if (!isset($this->routes[$id_shop][$id_lang]))
+			$this->routes[$id_shop][$id_lang] = array();
 		
-		$this->routes[$id_lang][$route_id] = array(
+		$this->routes[$id_shop][$id_lang][$route_id] = array(
 			'rule' =>		$rule,
 			'regexp' =>		$regexp,
 			'controller' =>	$controller,
@@ -514,14 +522,17 @@ class DispatcherCore
 	 *
 	 * @param string $route_id
 	 * @param int $id_lang
+ 	 * @param int $id_shop
 	 * @return bool
 	 */
-	public function hasRoute($route_id, $id_lang = null)
+	public function hasRoute($route_id, $id_lang = null, $id_shop = null)
 	{
-		if (is_null($id_lang))
-			$id_lang = Context::getContext()->language->id;
+		if ($id_lang === null)
+			$id_lang = (int)Context::getContext()->language->id;
+		if ($id_shop === null)
+			$id_shop = (int)Context::getContext()->shop->id;
 		
-		return isset($this->routes[$id_lang]) && isset($this->routes[$id_lang][$route_id]);
+		return isset($this->routes[$id_shop]) && isset($this->routes[$id_shop][$id_lang]) && isset($this->routes[$id_shop][$id_lang][$route_id]);
 	}

 	/**
@@ -530,14 +541,21 @@ class DispatcherCore
 	 * @param string $route_id
 	 * @param int $id_lang
 	 * @param string $keyword
+ 	 * @param int $id_shop
 	 * @return bool
 	 */
-	public function hasKeyword($route_id, $id_lang, $keyword)
+	public function hasKeyword($route_id, $id_lang, $keyword, $id_shop = null)
 	{
-		if (!isset($this->routes[$id_lang]) && !isset($this->routes[$id_lang][$route_id]))
+		if ($id_shop === null)
+			$id_shop = (int)Context::getContext()->shop->id;
+
+		if (!isset($this->routes[$id_shop]))
+			$this->loadRoutes($id_shop);
+
+		if (!isset($this->routes[$id_shop]) || !isset($this->routes[$id_shop][$id_lang]) || !isset($this->routes[$id_shop][$id_lang][$route_id]))
 			return false;

-		return preg_match('#\{([^{}]*:)?'.preg_quote($keyword, '#').'(:[^{}]*)?\}#', $this->routes[$id_lang][$route_id]['rule']);
+		return preg_match('#\{([^{}]*:)?'.preg_quote($keyword, '#').'(:[^{}]*)?\}#', $this->routes[$id_shop][$id_lang][$route_id]['rule']);
 	}

 	/**
@@ -569,18 +587,23 @@ class DispatcherCore
 	 * @param bool $use_routes If false, don't use to create this url
 	 * @param string $anchor Optional anchor to add at the end of this url
 	 */
-	public function createUrl($route_id, $id_lang = null, array $params = array(), $force_routes = false, $anchor = '')
+	public function createUrl($route_id, $id_lang = null, array $params = array(), $force_routes = false, $anchor = '', $id_shop = null)
 	{
-		if (!$id_lang)
-			$id_lang = Context::getContext()->language->id;
+		if ($id_lang === null)
+			$id_lang = (int)Context::getContext()->language->id;
+		if ($id_shop === null)
+			$id_shop = (int)Context::getContext()->shop->id;
 		
-		if (!isset($this->routes[$id_lang][$route_id]))
+		if (!isset($this->routes[$id_shop]))
+			$this->loadRoutes($id_shop);
+
+		if (!isset($this->routes[$id_shop][$id_lang][$route_id]))
 		{
 			$query = http_build_query($params, '', '&');
 			$index_link = $this->use_routes ? '' : 'index.php';
-			return ($route_id == 'index') ? $index_link.(($query) ? '?'.$query : '') : 'index.php?controller='.$route_id.(($query) ? '&'.$query : '').$anchor;
+			return ($route_id == 'index') ? $index_link.(($query) ? '?'.$query : '') : ((trim($route_id) == '') ? '' : 'index.php?controller='.$route_id).(($query) ? '&'.$query : '').$anchor;
 		}
-		$route = $this->routes[$id_lang][$route_id];
+		$route = $this->routes[$id_shop][$id_lang][$route_id];
 		// Check required fields
 		$query_params = isset($route['params']) ? $route['params'] : array();
 		foreach ($route['keywords'] as $key => $data)
@@ -646,7 +669,7 @@ class DispatcherCore
 	 *
 	 * @return string
 	 */
-	public function getController()
+	public function getController($id_shop = null)
 	{	
 		if (defined('_PS_ADMIN_DIR_'))
 			$_GET['controllerUri'] = Tools::getvalue('controller');		
@@ -655,7 +678,10 @@ class DispatcherCore
 			$_GET['controller'] = $this->controller;
 			return $this->controller;
 		}
-	
+
+		if ($id_shop === null)
+			$id_shop = (int)Context::getContext()->shop->id;
+
 		$controller = Tools::getValue('controller');
 	
 		if (isset($controller) && is_string($controller) && preg_match('/^([0-9a-z_-]+)\?(.*)=(.*)$/Ui', $controller, $m))
@@ -682,10 +708,10 @@ class DispatcherCore
 			{
 				// Add empty route as last route to prevent this greedy regexp to match request uri before right time
 				if ($this->empty_route)
-					$this->addRoute($this->empty_route['routeID'], $this->empty_route['rule'], $this->empty_route['controller'], Context::getContext()->language->id);
+					$this->addRoute($this->empty_route['routeID'], $this->empty_route['rule'], $this->empty_route['controller'], Context::getContext()->language->id, array(), array(), $id_shop);

-				if (isset($this->routes[Context::getContext()->language->id]))
-					foreach ($this->routes[Context::getContext()->language->id] as $route)
+				if (isset($this->routes[$id_shop][Context::getContext()->language->id]))
+					foreach ($this->routes[$id_shop][Context::getContext()->language->id] as $route)
 						if (preg_match($route['regexp'], $this->request_uri, $m))
 						{
 							// Route found ! Now fill $_GET with parameters of uri
@@ -771,4 +797,4 @@ class DispatcherCore

 		return $controllers;
 	}
-}
+}
@@ -244,12 +244,15 @@ class EmployeeCore extends ObjectModel
 	  */
 	public function isLoggedBack()
 	{
-		/* Employee is valid only if it can be load and if cookie password is the same as database one */
-	 	return ($this->id
-			&& Validate::isUnsignedId($this->id)
-			&& Employee::checkPassword($this->id, $this->passwd)
-			&& (!isset($this->remote_addr) || $this->remote_addr == ip2long(Tools::getRemoteAddr()) || !Configuration::get('PS_COOKIE_CHECKIP'))
-		);
+		if (!Cache::isStored('isLoggedBack'.$this->id))
+		{
+			/* Employee is valid only if it can be load and if cookie password is the same as database one */
+			Cache::store('isLoggedBack'.$this->id, (
+				$this->id && Validate::isUnsignedId($this->id) && Employee::checkPassword($this->id, Context::getContext()->cookie->passwd)
+				&& (!isset(Context::getContext()->cookie->remote_addr) || Context::getContext()->cookie->remote_addr == ip2long(Tools::getRemoteAddr()) || !Configuration::get('PS_COOKIE_CHECKIP'))
+			));
+		}
+		return Cache::retrieve('isLoggedBack'.$this->id);
 	}

 	/**
@@ -258,7 +261,10 @@ class EmployeeCore extends ObjectModel
 	public function logout()
 	{
 		if (isset(Context::getContext()->cookie))
+		{
 			Context::getContext()->cookie->logout();
+			Context::getContext()->cookie->write();
+		}
 		$this->id = null;
 	}

@@ -70,6 +70,13 @@ class GroupCore extends ObjectModel

 	protected $webserviceParameters = array();

+	public function __construct($id = null, $id_lang = null, $id_shop = null)
+	{
+		parent::__construct($id, $id_lang, $id_shop);
+		if ($this->id && !isset(Group::$group_price_display_method[$this->id]))
+			self::$group_price_display_method[$this->id] = $this->price_display_method;
+	}
+	
 	public static function getGroups($id_lang, $id_shop = false)
 	{
 		$shop_criteria = '';
@@ -216,13 +216,18 @@ class GroupReductionCore extends ObjectModel
 			FROM `'._DB_PREFIX_.'product_group_reduction_cache` pgr
 			WHERE pgr.`id_product` = '.(int)$id_product_old
 		);
+
 		if (!$res)
 			return true;
+
+		$query = '';
+
 		foreach ($res as $row)
 		{
-			$query = 'INSERT INTO `'._DB_PREFIX_.'product_group_reduction_cache` (`id_product`, `id_group`, `reduction`) VALUES ';
-			$query .= '('.(int)$id_product.', '.(int)$row['id_group'].', '.(float)$row['reduction'].')';
+			$query .= 'INSERT INTO `'._DB_PREFIX_.'product_group_reduction_cache` (`id_product`, `id_group`, `reduction`) VALUES ';
+			$query .= '('.(int)$id_product.', '.(int)$row['id_group'].', '.(float)$row['reduction'].') ON DUPLICATE KEY UPDATE `reduction` = '.(float)$row['reduction'].';';
 		}
+
 		return Db::getInstance()->execute($query);
 	}

@@ -64,10 +64,10 @@ class HookCore extends ObjectModel
 		'primary' => 'id_hook',
 		'fields' => array(
 			'name' => 			array('type' => self::TYPE_STRING, 'validate' => 'isHookName', 'required' => true, 'size' => 64),
-			'title' => 			array('type' => self::TYPE_STRING),
-			'description' => 	array('type' => self::TYPE_HTML),
-			'position' => 		array('type' => self::TYPE_BOOL),
-			'live_edit' => 		array('type' => self::TYPE_BOOL),
+			'title' => 			array('type' => self::TYPE_STRING, 'validate' => 'isGenericName'),
+			'description' => 	array('type' => self::TYPE_HTML, 'validate' => 'isCleanHtml'),
+			'position' => 		array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+			'live_edit' => 	array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
 		),
 	);

@@ -83,7 +83,7 @@ class HookCore extends ObjectModel

 	public function add($autodate = true, $null_values = false)
 	{
-		Cache::clean('hook_idbyname_'.$this->name);
+		Cache::clean('hook_idsbyname');
 		return parent::add($autodate, $null_values);
 	}

@@ -110,22 +110,30 @@ class HookCore extends ObjectModel
 	 */
 	public static function getIdByName($hook_name)
 	{
+		$hook_name = strtolower($hook_name);
 		if (!Validate::isHookName($hook_name))
 			return false;

-		$cache_id = 'hook_idbyname_'.$hook_name;
+		$cache_id = 'hook_idsbyname';
 		if (!Cache::isStored($cache_id))
 		{
-			$retro_hook_name = Hook::getRetroHookName($hook_name);
-			Cache::store($cache_id, Db::getInstance()->getValue('
-				SELECT `id_hook`
-				FROM `'._DB_PREFIX_.'hook`
-				WHERE `name` = \''.pSQL($hook_name).'\'
-					OR `name` = \''.pSQL($retro_hook_name).'\'
-			'));
+			// Get all hook ID by name and alias
+			$hook_ids = array();
+			$result = Db::getInstance()->ExecuteS('
+			SELECT `id_hook`, `name`
+			FROM `'._DB_PREFIX_.'hook`
+			UNION
+			SELECT `id_hook`, ha.`alias` as name
+			FROM `'._DB_PREFIX_.'hook_alias` ha
+			INNER JOIN `'._DB_PREFIX_.'hook` h ON ha.name = h.name');
+			foreach ($result as $row)
+				$hook_ids[strtolower($row['name'])] = $row['id_hook'];
+			Cache::store($cache_id, $hook_ids);
 		}
+		else
+			$hook_ids = Cache::retrieve($cache_id);

-		return Cache::retrieve($cache_id);
+		return (isset($hook_ids[$hook_name]) ? $hook_ids[$hook_name] : false);
 	}

 	/**
@@ -140,9 +148,23 @@ class HookCore extends ObjectModel
 				FROM `'._DB_PREFIX_.'hook`
 				WHERE `id_hook` = '.(int)$hook_id)
 			);
-
 		return Cache::retrieve($cache_id);
 	}
+	
+	/**
+	 * Return hook live edit bool from ID
+	 */
+	public static function getLiveEditById($hook_id)
+	{
+		$cache_id = 'hook_live_editbyid_'.$hook_id;
+		if (!Cache::isStored($cache_id))
+			Cache::store($cache_id, Db::getInstance()->getValue('
+				SELECT `live_edit`
+				FROM `'._DB_PREFIX_.'hook`
+				WHERE `id_hook` = '.(int)$hook_id)
+			);
+		return Cache::retrieve($cache_id);
+	}	

 	/**
 	 * Get list of hook alias
@@ -308,15 +330,9 @@ class HookCore extends ObjectModel

 			$sql->orderBy('hm.`position`');

-			// Store results per hook name
-			$results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
 			$list = array();
-			
-			// Get all available payment module
-			$payment_modules = array();
-
-			if ($results)
-				foreach ($results as $row)
+			if ($result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql))
+				foreach ($result as $row)
 				{
 					$row['hook'] = strtolower($row['hook']);
 					if (!isset($list[$row['hook']]))
@@ -346,14 +362,17 @@ class HookCore extends ObjectModel
 			$hook_name = strtolower($hook_name);

 			$return = array();
+			$inserted_modules = array();
 			if (isset($list[$hook_name]))
 				$return = $list[$hook_name];
+			foreach ($return as $module)
+				$inserted_modules[] = $module['id_module'];
 			if (isset($list[$retro_hook_name]))
-				$return = array_merge($return, $list[$retro_hook_name]);
+				foreach ($list[$retro_hook_name] as $retro_module_call)
+					if (!in_array($retro_module_call['id_module'], $inserted_modules))
+						$return[] = $retro_module_call;

-			if (count($return) > 0)
-				return $return;
-			return false;
+			return (count($return) > 0 ? $return : false);
 		}
 		else
 			return $list;
@@ -397,6 +416,7 @@ class HookCore extends ObjectModel
 		// Look on modules list
 		$altern = 0;
 		$output = '';
+						
 		foreach ($module_list as $array)
 		{
 			// Check errors
@@ -410,7 +430,7 @@ class HookCore extends ObjectModel
 			{
 				$exceptions = $moduleInstance->getExceptions($array['id_hook']);
 				$controller = Dispatcher::getInstance()->getController();
-								
+
 				if (in_array($controller, $exceptions))
 					continue;
 				
@@ -418,7 +438,7 @@ class HookCore extends ObjectModel
 				$matching_name = array(
 					'authentication' => 'auth',
 					'compare' => 'products-comparison',
-					);
+				);
 				if (isset($matching_name[$controller]) && in_array($matching_name[$controller], $exceptions))
 					continue;
 				if (Validate::isLoadedObject($context->employee) && !$moduleInstance->getPermission('view', $context->employee))
@@ -452,7 +472,7 @@ class HookCore extends ObjectModel
 		if ($array_return)
 			return $output;
 		else
-			return ($live_edit ? '<script type="text/javascript">hooks_list.push(\''.$hook_name.'\'); </script>
+			return ($live_edit ? '<script type="text/javascript">hooks_list.push(\''.$hook_name.'\');</script>
 				<div id="'.$hook_name.'" class="dndHook" style="min-height:50px">' : '').$output.($live_edit ? '</div>' : '');// Return html string
 	}

@@ -461,13 +481,13 @@ class HookCore extends ObjectModel
 		return '<script type="text/javascript"> modules_list.push(\''.Tools::safeOutput($moduleInstance->name).'\');</script>
 				<div id="hook_'.(int)$id_hook.'_module_'.(int)$moduleInstance->id.'_moduleName_'.str_replace('_', '-', Tools::safeOutput($moduleInstance->name)).'"
 				class="dndModule" style="border: 1px dotted red;'.(!strlen($display) ? 'height:50px;' : '').'">
-				<span style="font-family: Georgia;font-size:13px;font-style:italic;">
-				<img style="padding-right:5px;" src="'._MODULE_DIR_.Tools::safeOutput($moduleInstance->name).'/logo.gif">'
+					<span style="font-family: Georgia;font-size:13px;font-style:italic;">
+						<img style="padding-right:5px;" src="'._MODULE_DIR_.Tools::safeOutput($moduleInstance->name).'/logo.gif">'
 			 	.Tools::safeOutput($moduleInstance->displayName).'<span style="float:right">
 			 	<a href="#" id="'.(int)$id_hook.'_'.(int)$moduleInstance->id.'" class="moveModule">
 			 		<img src="'._PS_ADMIN_IMG_.'arrow_out.png"></a>
 			 	<a href="#" id="'.(int)$id_hook.'_'.(int)$moduleInstance->id.'" class="unregisterHook">
-			 		<img src="'._PS_ADMIN_IMG_.'delete.gif"></span></a>
+			 		<img src="'._PS_ADMIN_IMG_.'delete.gif"></a></span>
 			 	</span>'.$display.'</div>';
 	}

@@ -120,16 +120,22 @@ class ImageCore extends ObjectModel
 	 *
 	 * @param integer $id_lang Language ID
 	 * @param integer $id_product Product ID
+	 * @param integer $id_product_attribute Product Attribute ID
 	 * @return array Images
 	 */
-	public static function getImages($id_lang, $id_product)
+	public static function getImages($id_lang, $id_product, $id_product_attribute = NULL)
 	{
-		return Db::getInstance()->executeS('
-		SELECT *
-		FROM `'._DB_PREFIX_.'image` i
-		LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image`)
-		WHERE i.`id_product` = '.(int)$id_product.' AND il.`id_lang` = '.(int)$id_lang.'
-		ORDER BY i.`position` ASC');
+		$attribute_filter = ($id_product_attribute ? ' AND ai.`id_product_attribute` = '.(int)$id_product_attribute : '');
+		$sql = 'SELECT *
+			FROM `'._DB_PREFIX_.'image` i
+			LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image`)';
+
+		if ($id_product_attribute)
+			$sql .= ' LEFT JOIN `'._DB_PREFIX_.'product_attribute_image` ai ON (i.`id_image` = ai.`id_image`)';
+
+		$sql .= ' WHERE i.`id_product` = '.(int)$id_product.' AND il.`id_lang` = '.(int)$id_lang . $attribute_filter.'
+			ORDER BY i.`position` ASC';
+		return Db::getInstance()->executeS($sql);
 	}

 	/**
@@ -644,7 +650,7 @@ class ImageCore extends ObjectModel
 	 */
 	public static function testFileSystem()
 	{
-		$safe_mode = ini_get('safe_mode');
+		$safe_mode = Tools::getSafeModeStatus();
 		if ($safe_mode)
 			return false;
 		$folder1 = _PS_PROD_IMG_DIR_.'testfilesystem/';
@@ -407,6 +407,7 @@ class ImageManagerCore
 			case 'jpeg':
 			default:
 				$quality = (Configuration::get('PS_JPEG_QUALITY') === false ? 90 : Configuration::get('PS_JPEG_QUALITY'));
+				imageinterlace($resource,1); /// make it PROGRESSIVE
 				$success = imagejpeg($resource, $filename, (int)$quality);
 			break;
 		}
@@ -70,7 +70,7 @@ class LanguageCore extends ObjectModel
 	/** @var array Languages cache */
 	protected static $_checkedLangs;
 	protected static $_LANGUAGES;
-	protected static $countActiveLanguages;
+	protected static $countActiveLanguages = array();

 	protected	$webserviceParameters = array(
 		'objectNodeName' => 'language',
@@ -111,18 +111,22 @@ class LanguageCore extends ObjectModel
 		$iso_code = $newIso ? $newIso : $this->iso_code;

 		if (!file_exists(_PS_TRANSLATIONS_DIR_.$iso_code))
-			mkdir(_PS_TRANSLATIONS_DIR_.$iso_code);
+		{
+			if (@mkdir(_PS_TRANSLATIONS_DIR_.$iso_code))
+				@chmod(_PS_TRANSLATIONS_DIR_.$iso_code, 0777);
+		}
+
 		foreach ($this->translationsFilesAndVars as $file => $var)
 		{
 			$path_file = _PS_TRANSLATIONS_DIR_.$iso_code.'/'.$file.'.php';
 			if (!file_exists($path_file))
 				if ($file != 'tabs')
-					file_put_contents($path_file, '<?php
+					@file_put_contents($path_file, '<?php
 	global $'.$var.';
 	$'.$var.' = array();
 ?>');
 				else
-					file_put_contents($path_file, '<?php
+					@file_put_contents($path_file, '<?php
 	$'.$var.' = array();
 	return $'.$var.';
 ?>');
@@ -192,7 +196,7 @@ class LanguageCore extends ObjectModel

 	public function add($autodate = true, $nullValues = false, $only_add = false)
 	{
-		if (!parent::add($autodate))
+		if (!parent::add($autodate, $nullValues))
 			return false;

 		if ($only_add)
@@ -202,10 +206,9 @@ class LanguageCore extends ObjectModel
 		$this->_generateFiles();

 		// @todo Since a lot of modules are not in right format with their primary keys name, just get true ...
-		$resUpdateSQL = $this->loadUpdateSQL();
-		$resUpdateSQL = true;
-		Tools::generateHtaccess();
-		return $resUpdateSQL;
+		$this->loadUpdateSQL();
+
+		return Tools::generateHtaccess();
 	}

 	public function toggleStatus()
@@ -262,7 +265,7 @@ class LanguageCore extends ObjectModel
 			$mPath_to = _PS_MAIL_DIR_.(string)$iso_to.'/';
 		}

-		$lFiles = array('admin.php', 'errors.php', 'fields.php', 'pdf.php', 'tabs.php', 'index.php');
+		$lFiles = array('admin.php', 'errors.php', 'fields.php', 'pdf.php', 'tabs.php');

 		// Added natives mails files
 		$mFiles = array(
@@ -297,7 +300,7 @@ class LanguageCore extends ObjectModel
 			'test.html', 'test.txt',
 			'voucher.html', 'voucher.txt',
 			'voucher_new.html', 'voucher_new.txt',
-			'order_changed.html', 'order_changed.txt', 'index.php'
+			'order_changed.html', 'order_changed.txt'
 		);

 		$number = -1;
@@ -461,7 +464,8 @@ class LanguageCore extends ObjectModel
 				}
 			closedir($handle);
 		}
-		rmdir($dir);
+		if (is_writable($dir))
+			rmdir($dir);
 	}

 	public function delete()
@@ -488,7 +492,8 @@ class LanguageCore extends ObjectModel
 			// Files deletion
 			foreach (Language::getFilesList($this->iso_code, _THEME_NAME_, false, false, false, true, true) as $key => $file)
 				if (file_exists($key))
-				unlink($key);
+					unlink($key);
+
 			$modList = scandir(_PS_MODULE_DIR_);
 			foreach ($modList as $mod)
 			{
@@ -510,37 +515,32 @@ class LanguageCore extends ObjectModel
 				Language::recurseDeleteDir(_PS_MAIL_DIR_.$this->iso_code);
 			if (file_exists(_PS_TRANSLATIONS_DIR_.$this->iso_code))
 				Language::recurseDeleteDir(_PS_TRANSLATIONS_DIR_.$this->iso_code);
-		}
-		
-		if (!parent::delete())
-			return false;
-		if (!$this->hasMultishopEntries() || Shop::getContext() == Shop::CONTEXT_ALL)
-		{
-			// delete images
-			$files_copy = array(
-				'/en.jpg',
-				'/en-default-'.ImageType::getFormatedName('thickbox').'.jpg',
-				'/en-default-'.ImageType::getFormatedName('home').'.jpg',
-				'/en-default-'.ImageType::getFormatedName('large').'.jpg',
-				'/en-default-'.ImageType::getFormatedName('medium').'.jpg',
-				'/en-default-'.ImageType::getFormatedName('small').'.jpg'
+
+			$images = array(
+				'.jpg',
+				'-default-'.ImageType::getFormatedName('thickbox').'.jpg',
+				'-default-'.ImageType::getFormatedName('home').'.jpg',
+				'-default-'.ImageType::getFormatedName('large').'.jpg',
+				'-default-'.ImageType::getFormatedName('medium').'.jpg',
+				'-default-'.ImageType::getFormatedName('small').'.jpg'
 			);
-			$tos = array(_PS_CAT_IMG_DIR_, _PS_MANU_IMG_DIR_, _PS_PROD_IMG_DIR_, _PS_SUPP_IMG_DIR_);
-			foreach ($tos as $to)
-				foreach ($files_copy as $file)
+			$images_directories = array(_PS_CAT_IMG_DIR_, _PS_MANU_IMG_DIR_, _PS_PROD_IMG_DIR_, _PS_SUPP_IMG_DIR_);
+			foreach ($images_directories as $image_directory)
+				foreach ($images as $image)
 				{
-					$name = str_replace('/en', ''.$this->iso_code, $file);
-	
-					if (file_exists($to.$name))
-						unlink($to.$name);
+					if (file_exists($image_directory.$this->iso_code.$image))
+						unlink($image_directory.$this->iso_code.$image);
 					if (file_exists(dirname(__FILE__).'/../img/l/'.$this->id.'.jpg'))
 						unlink(dirname(__FILE__).'/../img/l/'.$this->id.'.jpg');
 				}
 		}
+
+		if (!parent::delete())
+			return false;
+
 		return Tools::generateHtaccess();
 	}

-
 	public function deleteSelection($selection)
 	{
 		if (!is_array($selection))
@@ -549,11 +549,10 @@ class LanguageCore extends ObjectModel
 		$result = true;
 		foreach ($selection as $id)
 		{
-			$this->id = (int)($id);
-			$result = $result && $this->delete();
+			$language = new Language($id);
+			$result = $result && $language->delete();
 		}

-		Tools::generateHtaccess();
 		return $result;
 	}

@@ -704,10 +703,8 @@ class LanguageCore extends ObjectModel
 					$lang->name = $lang_pack->name;
 		}
 		elseif ($params_lang !== null && is_array($params_lang))
-		{
 			foreach ($params_lang as $key => $value)
 				$lang->$key = $value;
-		}
 		else
 			return false;
 		
@@ -764,15 +761,18 @@ class LanguageCore extends ObjectModel
 		return (isset(self::$_cache_language_installation[$iso_code]) ? self::$_cache_language_installation[$iso_code] : false);
 	}

-	public static function countActiveLanguages()
+	public static function countActiveLanguages($id_shop = null)
 	{
-		if (!self::$countActiveLanguages)
-			self::$countActiveLanguages = Db::getInstance()->getValue('
+		if ($id_shop === null)
+			$id_shop = (int)Context::getContext()->shop->id;
+
+		if (!isset(self::$countActiveLanguages[$id_shop]))
+			self::$countActiveLanguages[$id_shop] = Db::getInstance()->getValue('
 				SELECT COUNT(DISTINCT l.id_lang) FROM `'._DB_PREFIX_.'lang` l
-				'.Shop::addSqlAssociation('lang', 'l').'
+				JOIN '._DB_PREFIX_.'lang_shop lang_shop ON (lang_shop.id_lang = l.id_lang AND lang_shop.id_shop = '.(int)$id_shop.')
 				WHERE l.`active` = 1
 			');
-		return self::$countActiveLanguages;
+		return self::$countActiveLanguages[$id_shop];
 	}

 	public static function downloadAndInstallLanguagePack($iso, $version = null, $params = null)
@@ -788,13 +788,22 @@ class LanguageCore extends ObjectModel
 		$lang_pack_ok = false;
 		$errors = array();
 		$file = _PS_TRANSLATIONS_DIR_.$iso.'.gzip';
+
 		if (!$lang_pack_link = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/get_language_pack.php?version='.$version.'&iso_lang='.Tools::strtolower($iso)))
 			$errors[] = Tools::displayError('Archive cannot be downloaded from prestashop.com.');
 		elseif (!$lang_pack = Tools::jsonDecode($lang_pack_link))
 			$errors[] = Tools::displayError('Error occurred when language was checked according to your Prestashop version.');
 		elseif ($content = Tools::file_get_contents('http://translations.prestashop.com/download/lang_packs/gzip/'.$lang_pack->version.'/'.Tools::strtolower($lang_pack->iso_code.'.gzip')))
 			if (!@file_put_contents($file, $content))
-				$errors[] = Tools::displayError('Server does not have permissions for writing.');
+			{
+				if (is_writable(dirname($file)))
+				{
+					@unlink($file);
+					@file_put_contents($file, $content);
+				}
+				elseif (!is_writable($file))
+					$errors[] = Tools::displayError('Server does not have permissions for writing.').' ('.$file.')';
+			}
 		if (file_exists($file))
 		{
 			$gz = new Archive_Tar($file, true);
@@ -827,8 +836,8 @@ class LanguageCore extends ObjectModel
 	 * @since 1.5.0
 	 * @return bool
 	 */
-	public static function isMultiLanguageActivated()
+	public static function isMultiLanguageActivated($id_shop = null)
 	{
-		return (Language::countActiveLanguages() > 1);
+		return (Language::countActiveLanguages($id_shop) > 1);
 	}
 }
@@ -91,19 +91,15 @@ class LinkCore
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;

-		if (!$id_shop)
-			$shop = Context::getContext()->shop;
-		else
-			$shop = new Shop($id_shop);
-		
-		$url = 'http://'.$shop->domain.$shop->getBaseURI().$this->getLangLink($id_lang);
+
+		$url = $this->getBaseLink($id_shop).$this->getLangLink($id_lang, null, $id_shop);

 		if (!is_object($product))
 		{
 			if (is_array($product) && isset($product['id_product']))
-					$product = new Product($product['id_product'], false, $id_lang);
-			else if (is_numeric($product) || !$product)
-				$product = new Product($product, false, $id_lang);
+				$product = new Product($product['id_product'], false, $id_lang, $id_shop);
+			elseif ((int)$product)
+				$product = new Product((int)$product, false, $id_lang, $id_shop);
 			else
 				throw new PrestaShopException('Invalid product vars');
 		}
@@ -112,29 +108,30 @@ class LinkCore
 		$params = array();
 		$params['id'] = $product->id;
 		$params['rewrite'] = (!$alias) ? $product->getFieldByLang('link_rewrite') : $alias;
+
 		$params['ean13'] = (!$ean13) ? $product->ean13 : $ean13;
 		$params['meta_keywords'] =	Tools::str2url($product->getFieldByLang('meta_keywords'));
 		$params['meta_title'] = Tools::str2url($product->getFieldByLang('meta_title'));

-		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'manufacturer'))
+		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'manufacturer', $id_shop))
 			$params['manufacturer'] = Tools::str2url($product->isFullyLoaded ? $product->manufacturer_name : Manufacturer::getNameById($product->id_manufacturer));

-		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'supplier'))
+		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'supplier', $id_shop))
 			$params['supplier'] = Tools::str2url($product->isFullyLoaded ? $product->supplier_name : Supplier::getNameById($product->id_supplier));

-		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'price'))
+		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'price', $id_shop))
 			$params['price'] = $product->isFullyLoaded ? $product->price : Product::getPriceStatic($product->id, false, null, 6, null, false, true, 1, false, null, null, null, $product->specificPrice);

-		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'tags'))
+		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'tags', $id_shop))
 			$params['tags'] = Tools::str2url($product->getTags($id_lang));
 		
-		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'category'))
-			$params['category'] = !is_null($product->category) ? Tools::str2url($product->category) : Tools::str2url($category);
+		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'category', $id_shop))
+			$params['category'] = (!is_null($product->category) && !empty($product->category)) ? Tools::str2url($product->category) : Tools::str2url($category);

-		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'reference'))
+		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'reference', $id_shop))
 			$params['reference'] = Tools::str2url($product->reference);

-		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'categories'))
+		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'categories', $id_shop))
 		{
 			$params['category'] = (!$category) ? $product->category : $category;
 			$cats = array();
@@ -145,7 +142,7 @@ class LinkCore
 		}
 		$anchor = $ipa ? $product->getAnchor($ipa) : '';

-		return $url.$dispatcher->createUrl('product_rule', $id_lang, $params, $force_routes, $anchor);
+		return $url.$dispatcher->createUrl('product_rule', $id_lang, $params, $force_routes, $anchor, $id_shop);
 	}

 	/**
@@ -157,11 +154,12 @@ class LinkCore
 	 * @param string $selected_filters Url parameter to autocheck filters of the module blocklayered
 	 * @return string
 	 */
-	public function getCategoryLink($category, $alias = null, $id_lang = null, $selected_filters = null)
+	public function getCategoryLink($category, $alias = null, $id_lang = null, $selected_filters = null, $id_shop = null)
 	{
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;
-		$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
+		
+		$url = $this->getBaseLink($id_shop).$this->getLangLink($id_lang, null, $id_shop);

 		if (!is_object($category))
 			$category = new Category($category, $id_lang);
@@ -184,7 +182,7 @@ class LinkCore
 			$params['selected_filters'] = $selected_filters;
 		}

-		return $url.Dispatcher::getInstance()->createUrl($rule, $id_lang, $params, $this->allow);
+		return $url.Dispatcher::getInstance()->createUrl($rule, $id_lang, $params, $this->allow, '', $id_shop);
 	}

 	/**
@@ -195,24 +193,29 @@ class LinkCore
 	 * @param int $id_lang
 	 * @return string
 	 */
-	public function getCMSCategoryLink($category, $alias = null, $id_lang = null)
+	public function getCMSCategoryLink($cms_category, $alias = null, $id_lang = null, $id_shop = null)
 	{
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;
-						
-		$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);

-		if (!is_object($category))
-			$category = new CMSCategory($category, $id_lang);
+		$url = $this->getBaseLink($id_shop).$this->getLangLink($id_lang, null, $id_shop);
+
+		$dispatcher = Dispatcher::getInstance();
+		if (!is_object($cms_category))
+		{
+			if ($alias !== null && !$dispatcher->hasKeyword('cms_category_rule', $id_lang, 'meta_keywords', $id_shop) && !$dispatcher->hasKeyword('cms_category_rule', $id_lang, 'meta_title', $id_shop))
+				return $url.$dispatcher->createUrl('cms_category_rule', $id_lang, array('id' => (int)$cms_category, 'rewrite' => (string)$alias), $this->allow, '', $id_shop);
+			$cms_category = new CMSCategory($cms_category, $id_lang);
+		}

 		// Set available keywords
 		$params = array();
-		$params['id'] = $category->id;
-		$params['rewrite'] = (!$alias) ? $category->link_rewrite : $alias;
-		$params['meta_keywords'] =	Tools::str2url($category->meta_keywords);
-		$params['meta_title'] = Tools::str2url($category->meta_title);
+		$params['id'] = $cms_category->id;
+		$params['rewrite'] = (!$alias) ? $cms_category->link_rewrite : $alias;
+		$params['meta_keywords'] =	Tools::str2url($cms_category->meta_keywords);
+		$params['meta_title'] = Tools::str2url($cms_category->meta_title);

-		return $url.Dispatcher::getInstance()->createUrl('cms_category_rule', $id_lang, $params, $this->allow);
+		return $url.$dispatcher->createUrl('cms_category_rule', $id_lang, $params, $this->allow, '', $id_shop);
 	}

 	/**
@@ -224,33 +227,35 @@ class LinkCore
 	 * @param int $id_lang
 	 * @return string
 	 */
-	public function getCMSLink($cms, $alias = null, $ssl = false, $id_lang = null)
+	public function getCMSLink($cms, $alias = null, $ssl = null, $id_lang = null, $id_shop = null)
 	{
-		$base = (($ssl && $this->ssl_enable) ? _PS_BASE_URL_SSL_ : _PS_BASE_URL_);
-
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;
-		$url = $base.__PS_BASE_URI__.$this->getLangLink($id_lang);

+		$url = $this->getBaseLink($id_shop, $ssl).$this->getLangLink($id_lang, null, $id_shop);
+
+		$dispatcher = Dispatcher::getInstance();
 		if (!is_object($cms))
+		{
+			if ($alias !== null && !$dispatcher->hasKeyword('cms_rule', $id_lang, 'meta_keywords', $id_shop) && !$dispatcher->hasKeyword('cms_rule', $id_lang, 'meta_title', $id_shop))
+				return $url.$dispatcher->createUrl('cms_rule', $id_lang, array('id' => (int)$cms, 'rewrite' => (string)$alias), $this->allow, '', $id_shop);
 			$cms = new CMS($cms, $id_lang);
+		}

 		// Set available keywords
 		$params = array();
 		$params['id'] = $cms->id;
 		$params['rewrite'] = (!$alias) ? (is_array($cms->link_rewrite) ? $cms->link_rewrite[(int)$id_lang] : $cms->link_rewrite) : $alias;

+		$params['meta_keywords'] = '';
 		if (isset($cms->meta_keywords) && !empty($cms->meta_keywords))
 			$params['meta_keywords'] = is_array($cms->meta_keywords) ?  Tools::str2url($cms->meta_keywords[(int)$id_lang]) :  Tools::str2url($cms->meta_keywords);
-		else
-			$params['meta_keywords'] = '';

+		$params['meta_title'] = '';
 		if (isset($cms->meta_title) && !empty($cms->meta_title))
 			$params['meta_title'] = is_array($cms->meta_title) ? Tools::str2url($cms->meta_title[(int)$id_lang]) : Tools::str2url($cms->meta_title);
-		else
-			$params['meta_title'] = '';

-		return $url.Dispatcher::getInstance()->createUrl('cms_rule', $id_lang, $params, $this->allow);
+		return $url.$dispatcher->createUrl('cms_rule', $id_lang, $params, $this->allow, '', $id_shop);
 	}

 	/**
@@ -261,14 +266,21 @@ class LinkCore
 	 * @param int $id_lang
 	 * @return string
 	 */
-	public function getSupplierLink($supplier, $alias = null, $id_lang = null)
+	public function getSupplierLink($supplier, $alias = null, $id_lang = null, $id_shop = null)
 	{
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;
-		$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);

+
+		$url = $this->getBaseLink($id_shop).$this->getLangLink($id_lang, null, $id_shop);
+		
+		$dispatcher = Dispatcher::getInstance();
 		if (!is_object($supplier))
+		{
+			if ($alias !== null && !$dispatcher->hasKeyword('supplier_rule', $id_lang, 'meta_keywords', $id_shop) && !$dispatcher->hasKeyword('supplier_rule', $id_lang, 'meta_title', $id_shop))
+				return $url.$dispatcher->createUrl('supplier_rule', $id_lang, array('id' => (int)$supplier, 'rewrite' => (string)$alias), $this->allow, '', $id_shop);
 			$supplier = new Supplier($supplier, $id_lang);
+		}

 		// Set available keywords
 		$params = array();
@@ -277,7 +289,7 @@ class LinkCore
 		$params['meta_keywords'] =	Tools::str2url($supplier->meta_keywords);
 		$params['meta_title'] = Tools::str2url($supplier->meta_title);

-		return $url.Dispatcher::getInstance()->createUrl('supplier_rule', $id_lang, $params, $this->allow);
+		return $url.$dispatcher->createUrl('supplier_rule', $id_lang, $params, $this->allow, '', $id_shop);
 	}

 	/**
@@ -288,14 +300,20 @@ class LinkCore
 	 * @param int $id_lang
 	 * @return string
 	 */
-	public function getManufacturerLink($manufacturer, $alias = null, $id_lang = null)
+	public function getManufacturerLink($manufacturer, $alias = null, $id_lang = null, $id_shop = null)
 	{
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;
-		$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);

+		$url = $this->getBaseLink($id_shop).$this->getLangLink($id_lang, null, $id_shop);
+
+		$dispatcher = Dispatcher::getInstance();
 		if (!is_object($manufacturer))
+		{
+			if ($alias !== null && !$dispatcher->hasKeyword('manufacturer_rule', $id_lang, 'meta_keywords', $id_shop) && !$dispatcher->hasKeyword('manufacturer_rule', $id_lang, 'meta_title', $id_shop))
+				return $url.$dispatcher->createUrl('manufacturer_rule', $id_lang, array('id' => (int)$manufacturer, 'rewrite' => (string)$alias), $this->allow, '', $id_shop);
 			$manufacturer = new Manufacturer($manufacturer, $id_lang);
+		}

 		// Set available keywords
 		$params = array();
@@ -304,7 +322,7 @@ class LinkCore
 		$params['meta_keywords'] =	Tools::str2url($manufacturer->meta_keywords);
 		$params['meta_title'] = Tools::str2url($manufacturer->meta_title);

-		return $url.Dispatcher::getInstance()->createUrl('manufacturer_rule', $id_lang, $params, $this->allow);
+		return $url.$dispatcher->createUrl('manufacturer_rule', $id_lang, $params, $this->allow, '', $id_shop);
 	}

 	/**
@@ -316,23 +334,23 @@ class LinkCore
 	 * @param int $id_lang
 	 * @return string
 	 */
-	public function getModuleLink($module, $controller = 'default', array $params = array(), $ssl = false, $id_lang = null)
+	public function getModuleLink($module, $controller = 'default', array $params = array(), $ssl = null, $id_lang = null, $id_shop = null)
 	{
-		$base = (($ssl && $this->ssl_enable) ? _PS_BASE_URL_SSL_ : _PS_BASE_URL_);
-
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;
-		$url = $base.__PS_BASE_URI__.$this->getLangLink($id_lang);

-		// Set available keywords
-		$params['module'] = $module;
-		$params['controller'] = $controller ? $controller : 'default';
+		$url = $this->getBaseLink($id_shop, $ssl).$this->getLangLink($id_lang, null, $id_shop);

 		// If the module has its own route ... just use it !
-		if (Dispatcher::getInstance()->hasRoute('module-'.$module.'-'.$controller, $id_lang))
+		if (Dispatcher::getInstance()->hasRoute('module-'.$module.'-'.$controller, $id_lang, $id_shop))
 			return $this->getPageLink('module-'.$module.'-'.$controller, $ssl, $id_lang, $params);
 		else
-			return $url.Dispatcher::getInstance()->createUrl('module', $id_lang, $params, $this->allow);
+		{
+			// Set available keywords
+			$params['module'] = $module;
+			$params['controller'] = $controller ? $controller : 'default';		
+			return $url.Dispatcher::getInstance()->createUrl('module', $id_lang, $params, $this->allow, '', $id_shop);
+		}
 	}

 	/**
@@ -403,10 +421,9 @@ class LinkCore
 	 *
 	 * @return string Page link
 	 */
-	public function getPageLink($controller, $ssl = false, $id_lang = null, $request = null, $request_url_encode = false)
+	public function getPageLink($controller, $ssl = null, $id_lang = null, $request = null, $request_url_encode = false, $id_shop = null)
 	{
 		$controller = Tools::strReplaceFirst('.php', '', $controller);
-
 		if (!$id_lang)
 			$id_lang = (int)Context::getContext()->language->id;

@@ -419,16 +436,17 @@ class LinkCore
 			parse_str($request, $request);
 		}

-		$uri_path = Dispatcher::getInstance()->createUrl($controller, $id_lang, $request);
-		$url = ($ssl && $this->ssl_enable) ? Tools::getShopDomainSsl(true) : Tools::getShopDomain(true);
-		$url .= __PS_BASE_URI__.$this->getLangLink($id_lang).ltrim($uri_path, '/');
+		$uri_path = Dispatcher::getInstance()->createUrl($controller, $id_lang, $request, false, '', $id_shop);

-		return $url;
+		return $this->getBaseLink($id_shop, $ssl).$this->getLangLink($id_lang, null, $id_shop).ltrim($uri_path, '/');
 	}

 	public function getCatImageLink($name, $id_category, $type = null)
 	{
-		$uri_path = ($this->allow == 1) ? (__PS_BASE_URI__.'c/'.$id_category.($type ? '-'.$type : '').'/'.$name.'.jpg') : (_THEME_CAT_DIR_.$id_category.($type ? '-'.$type : '').'.jpg');
+		if($this->allow == 1 && $type)
+			$uri_path = __PS_BASE_URI__.'c/'.$id_category.'-'.$type.'/'.$name.'.jpg';
+		else
+			$uri_path = _THEME_CAT_DIR_.$id_category.($type ? '-'.$type : '').'.jpg';
 		return $this->protocol_content.Tools::getMediaServer($uri_path).$uri_path;
 	}

@@ -452,6 +470,7 @@ class LinkCore
 			unset($params['id_lang']);

 		$controller = Dispatcher::getInstance()->getController();
+	
 		if (!empty(Context::getContext()->controller->php_self))
 			$controller = Context::getContext()->controller->php_self;

@@ -467,6 +486,15 @@ class LinkCore
 			return $this->getCMSLink((int)$params['id_cms'], null, false, (int)$id_lang);
 		elseif ($controller == 'cms' && isset($params['id_cms_category']))
 			return $this->getCMSCategoryLink((int)$params['id_cms_category'], null, (int)$id_lang);
+		elseif (isset($params['fc']) && $params['fc'] == 'module')
+		{
+			$module = Validate::isModuleName(Tools::getValue('module')) ? Tools::getValue('module') : '';
+			if (!empty($module))
+			{
+				unset($params['fc'], $params['module']);
+				return $this->getModuleLink($module, $controller, $params, false, (int)$id_lang);
+			}
+		}		

 		return $this->getPageLink($controller, false, $id_lang, $params);
 	}
@@ -561,12 +589,12 @@ class LinkCore
 		return $url.(!strstr($url, '?') ? '?' : '&').'orderby='.urlencode($orderby).'&orderway='.urlencode($orderway);
 	}

-	protected function getLangLink($id_lang = null, Context $context = null)
+	protected function getLangLink($id_lang = null, Context $context = null, $id_shop = null)
 	{
 		if (!$context)
 			$context = Context::getContext();

-		if (!$this->allow || !Language::isMultiLanguageActivated())
+		if ((!$this->allow && in_array($id_shop, array($context->shop->id,  null))) || !Language::isMultiLanguageActivated($id_shop) || !(int)Configuration::get('PS_REWRITING_SETTINGS', null, null, $id_shop))
 			return '';

 		if (!$id_lang)
@@ -574,5 +602,26 @@ class LinkCore

 		return Language::getIsoById($id_lang).'/';
 	}
+	
+	protected function getBaseLink($id_shop = null, $ssl = null)
+	{
+		static $force_ssl = null;
+		
+		if ($ssl === null)
+		{
+			if ($force_ssl === null)
+				$force_ssl = (Configuration::get('PS_SSL_ENABLED') && Configuration::get('PS_SSL_ENABLED_EVERYWHERE'));
+			$ssl = $force_ssl;
+		}
+
+		if (Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE') && $id_shop !== null)
+			$shop = new Shop($id_shop);
+		else
+			$shop = Context::getContext()->shop;
+
+		$base = (($ssl && $this->ssl_enable) ? 'https://'.$shop->domain_ssl : 'http://'.$shop->domain);
+
+		return $base.$shop->getBaseURI();
+	}
 }

@@ -70,8 +70,16 @@ class LocalizationPackCore
 			return $res;
 		}
 		foreach ($selection as $selected)
-			if (!Validate::isLocalizationPackSelection($selected) || !$this->{'_install'.ucfirst($selected)}($xml))
-				return false;
+			if (strtolower((string)$selected) == 'currencies')
+			{
+				if (!Validate::isLocalizationPackSelection($selected) || !$this->{'_install'.ucfirst($selected)}($xml, true))
+					return false;
+			}
+			else
+			{
+				if (!Validate::isLocalizationPackSelection($selected) || !$this->{'_install'.ucfirst($selected)}($xml))
+					return false;
+			}

 		return true;
 	}
@@ -239,8 +247,6 @@ class LocalizationPackCore
 	{
 		if (isset($xml->currencies->currency))
 		{
-
-
 			foreach ($xml->currencies->currency as $data)
 			{
 				$attributes = $data->attributes();
@@ -43,6 +43,9 @@ class	LoggerCore extends ObjectModel

 	/** @var integer Object ID */
 	public $object_id;
+	
+	/** @var integer Object ID */
+	public $id_employee;

 	/** @var string Object creation date */
 	public $date_add;
@@ -61,6 +64,7 @@ class	LoggerCore extends ObjectModel
 			'error_code' => 	array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
 			'message' => 		array('type' => self::TYPE_STRING, 'validate' => 'isMessage', 'required' => true),
 			'object_id' => 		array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
+			'id_employee' => 		array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
 			'object_type' =>	array('type' => self::TYPE_STRING, 'validate' => 'isName'),
 			'date_add' => 		array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
 			'date_upd' => 		array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
@@ -98,7 +102,7 @@ class	LoggerCore extends ObjectModel
 	 * @param boolean $allow_duplicate if set to true, can log several time the same information (not recommended)
 	 * @return boolean true if succeed
 	 */
-	public static function addLog($message, $severity = 1, $error_code = null, $object_type = null, $object_id = null, $allow_duplicate = false)
+	public static function addLog($message, $severity = 1, $error_code = null, $object_type = null, $object_id = null, $allow_duplicate = false, $id_employee = null)
 	{
 		$log = new Logger();
 		$log->severity = intval($severity);
@@ -106,6 +110,13 @@ class	LoggerCore extends ObjectModel
 		$log->message = pSQL($message);
 		$log->date_add = date('Y-m-d H:i:s');
 		$log->date_upd = date('Y-m-d H:i:s');
+
+		if ($id_employee === null && isset(Context::getContext()->employee) && Validate::isLoadedObject(Context::getContext()->employee))
+			$id_employee = Context::getContext()->employee->id;
+		
+		if ($id_employee !== null)
+			$log->id_employee = (int)$id_employee;
+
 		if (!empty($object_type) && !empty($object_id))
 		{
 			$log->object_type = pSQL($object_type);
@@ -138,6 +149,11 @@ class	LoggerCore extends ObjectModel

 		return $this->hash;
 	}
+	
+	public static function eraseAllLogs()
+	{
+		return Db::getInstance()->execute('TRUNCATE TABLE '._DB_PREFIX_.'log');
+	}

 	/**
 	 * check if this log message already exists in database.
@@ -50,9 +50,11 @@ class MailCore
 	 * @param bool $modeSMTP
 	 * @param string $template_path
 	 * @param bool $die
+         * @param string $bcc Bcc recipient
 	 */
 	public static function Send($id_lang, $template, $subject, $template_vars, $to,
-		$to_name = null, $from = null, $from_name = null, $file_attachment = null, $mode_smtp = null, $template_path = _PS_MAIL_DIR_, $die = false, $id_shop = null)
+		$to_name = null, $from = null, $from_name = null, $file_attachment = null, $mode_smtp = null,
+		$template_path = _PS_MAIL_DIR_, $die = false, $id_shop = null, $bcc = null)
 	{
 		$configuration = Configuration::getMultiple(array(
 			'PS_SHOP_EMAIL',
@@ -126,9 +128,9 @@ class MailCore
 		}

 		/* Construct multiple recipients list if needed */
+		$to_list = new Swift_RecipientList();
 		if (is_array($to) && isset($to))
 		{
-			$to_list = new Swift_RecipientList();
 			foreach ($to as $key => $addr)
 			{
 				$to_name = null;
@@ -146,17 +148,26 @@ class MailCore
 				if ($to_name == null)
 					$to_name = $addr;
 				/* Encode accentuated chars */
-				$to_list->addTo($addr, '=?UTF-8?B?'.base64_encode($to_name).'?=');
+				if (function_exists('mb_encode_mimeheader'))
+					$to_list->addTo($addr, mb_encode_mimeheader($to_name, 'utf-8'));
+				else
+					$to_list->addTo($addr, self::mimeEncode($to_name));
 			}
 			$to_plugin = $to[0];
-			$to = $to_list;
 		} else {
 			/* Simple recipient, one address */
 			$to_plugin = $to;
 			if ($to_name == null)
 				$to_name = $to;
-			$to = new Swift_Address($to, '=?UTF-8?B?'.base64_encode($to_name).'?=');
+			if (function_exists('mb_encode_mimeheader'))
+				$to_list->addTo($to, mb_encode_mimeheader($to_name, 'utf-8'));
+			else
+				$to_list->addTo($to, self::mimeEncode($to_name));
 		}
+		if(isset($bcc)) {
+			$to_list->addBcc($bcc);
+		}
+		$to = $to_list;
 		try {
 			/* Connect with the appropriate configuration */
 			if ($configuration['PS_MAIL_METHOD'] == 2)
@@ -230,6 +241,8 @@ class MailCore
 			/* Create mail and attach differents parts */
 			$message = new Swift_Message('['.Configuration::get('PS_SHOP_NAME', null, null, $id_shop).'] '.$subject);

+			$message->setCharset('utf-8');
+
 			/* Set Message-ID - getmypid() is blocked on some hosting */
 			$message->setId(Mail::generateId());

@@ -249,6 +262,9 @@ class MailCore
 			if (isset($logo))
 				$template_vars['{shop_logo}'] = $message->attach(new Swift_Message_EmbeddedFile(new Swift_File($logo), null, ImageManager::getMimeTypeByExtension($logo)));

+			if ((Context::getContext()->link instanceof Link) === false)
+				Context::getContext()->link = new Link();
+
 			$template_vars['{shop_name}'] = Tools::safeOutput(Configuration::get('PS_SHOP_NAME', null, null, $id_shop));
 			$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);
@@ -301,9 +317,9 @@ class MailCore
 			else
 				$swift = new Swift(new Swift_Connection_NativeMail(), Configuration::get('PS_MAIL_DOMAIN'));

-			$message = new Swift_Message($subject, 'Merci de laisser marie et vincent tranquilles ! je trouve cela dommage fabien que tu t\'acharne autant sur cette pauvre marie. Mais ne t\'inquete pas on en reparlera au prochain codir.', $type);
+			$message = new Swift_Message($subject, $content, $type);

-			if ($swift->send($message, 'francois.gaillard@prestashop.com', 'benjamin.teszner@prestahsop.com'))
+			if ($swift->send($message, $to, $from))
 				$result = true;

 			$swift->disconnect();
@@ -369,4 +385,68 @@ class MailCore
 		return vsprintf("<%s.%d.%s@%s>", $midparams);
 	}
 	
+	public static function isMultibyte($data)
+	{
+		$length = strlen($data);
+
+		for ($i = 0; $i < $length; $i++)
+		{
+			$result = ord(($data[$i]));
+
+			if ($result > 128)
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	public static function mimeEncode($string, $charset = 'UTF-8', $newline = "\r\n")
+	{
+		if (!self::isMultibyte($string) && strlen($string) < 75)
+		{
+			return $string;
+		}
+
+		$charset = strtoupper($charset);
+		$start   = '=?' . $charset . '?B?';
+		$end     = '?=';
+		$sep     = $end . $newline . ' ' . $start;
+		$length  = 75 - strlen($start) - strlen($end);
+		$length  = $length - ($length % 4);
+
+		if ($charset === 'UTF-8')
+		{
+			$parts = array();
+			$maxchars = floor(($length * 3) / 4);
+			$stringLength = strlen($string);
+
+			while ($stringLength > $maxchars)
+			{
+				$i = (int)$maxchars;
+				$result = ord($string[$i]);
+
+				while ($result >= 128 && $result <= 191)
+				{
+					$i--;
+					$result = ord($string[$i]);
+				}
+
+				$parts[] = base64_encode(substr($string, 0, $i));
+				$string = substr($string, $i);
+				$stringLength = strlen($string);
+			}
+
+			$parts[] = base64_encode($string);
+			$string = implode($sep, $parts);
+		}
+		else
+		{
+			$string = chunk_split(base64_encode($string), $length, $sep);
+			$string = preg_replace('/' . preg_quote($sep) . '$/', '', $string);
+		}
+
+		return $start . $string . $end;
+	}
 }
@@ -78,8 +78,8 @@ class ManufacturerCore extends ObjectModel
 			'date_upd' => 			array('type' => self::TYPE_DATE),

 			// Lang fields
-			'description' => 		array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isString'),
-			'short_description' => 	array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isString', 'size' => 254),
+			'description' => 		array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml'),
+			'short_description' => 	array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml'),
 			'meta_title' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 128),
 			'meta_description' => 	array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 255),
 			'meta_keywords' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName'),
@@ -198,6 +198,7 @@ class ManufacturerCore extends ObjectModel
 					LEFT JOIN `'._DB_PREFIX_.'manufacturer` as m ON (m.`id_manufacturer`= p.`id_manufacturer`)
 					WHERE m.`id_manufacturer` = '.(int)$manufacturer['id_manufacturer'].
 					($active ? ' AND product_shop.`active` = 1 ' : '').
+					' AND product_shop.`visibility` NOT IN ("none")'.
 					($all_group ? '' : ' AND p.`id_product` IN (
 						SELECT cp.`id_product`
 						FROM `'._DB_PREFIX_.'category_group` cg
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2012 PrestaShop
+* 2007-2013 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -30,36 +30,37 @@ class MediaCore
 		'ui.core' => array('fileName' => 'jquery.ui.core.min.js', 'dependencies' => array(), 'theme' => true),
 		'ui.widget' => array('fileName' => 'jquery.ui.widget.min.js', 'dependencies' => array(), 'theme' => false),
 		'ui.mouse' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('ui.core', 'ui.widget'), 'theme' => false),
-		'ui.position' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array(), 'theme' => false),
-		'ui.draggable' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.mouse'), 'theme' => false),
-		'ui.droppable' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.mouse', 'ui.draggable'), 'theme' => false),
-		'ui.resizable' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.mouse'), 'theme' => true),
-		'ui.selectable' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.mouse'), 'theme' => true),
-		'ui.sortable' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.mouse'), 'theme' => true),
-		'ui.accordion' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('ui.core', 'ui.widget'), 'theme' => true),
-		'ui.autocomplete' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.position'), 'theme' => true),
-		'ui.button' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('ui.core', 'ui.widget'), 'theme' => true),
-		'ui.dialog' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.position'), 'theme' => true),
-		'ui.slider' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.mouse'), 'theme' => true),
-		'ui.tabs' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('ui.core', 'ui.widget'), 'theme' => true),
-		'ui.datepicker' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('ui.core'), 'theme' => true),
-		'ui.progressbar' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('ui.core', 'ui.widget'), 'theme' => true),
-		'effects.core' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array(), 'theme' => false),
-		'effects.blind' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
-		'effects.bounce' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
-		'effects.clip' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
-		'effects.drop' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
-		'effects.explode' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
-		'effects.fade' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
-		'effects.fold' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
-		'effects.highlight' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
-		'effects.pulsate' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
-		'effects.scale' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
-		'effects.shake' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
-		'effects.slide' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
-		'effects.transfer' => array('fileName' => 'jquery.ui.mouse.min.js', 'dependencies' => array('effects.core'), 'theme' => false)
+		'ui.position' => array('fileName' => 'jquery.ui.position.min.js', 'dependencies' => array(), 'theme' => false),
+		'ui.draggable' => array('fileName' => 'jquery.ui.draggable.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.mouse'), 'theme' => false),
+		'ui.droppable' => array('fileName' => 'jquery.ui.droppable.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.mouse', 'ui.draggable'), 'theme' => false),
+		'ui.resizable' => array('fileName' => 'jquery.ui.resizable.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.mouse'), 'theme' => true),
+		'ui.selectable' => array('fileName' => 'jquery.ui.selectable.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.mouse'), 'theme' => true),
+		'ui.sortable' => array('fileName' => 'jquery.ui.sortable.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.mouse'), 'theme' => true),
+		'ui.accordion' => array('fileName' => 'jquery.ui.accordion.min.js', 'dependencies' => array('ui.core', 'ui.widget'), 'theme' => true),
+		'ui.autocomplete' => array('fileName' => 'jquery.ui.autocomplete.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.position'), 'theme' => true),
+		'ui.button' => array('fileName' => 'jquery.ui.button.min.js', 'dependencies' => array('ui.core', 'ui.widget'), 'theme' => true),
+		'ui.dialog' => array('fileName' => 'jquery.ui.dialog.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.position','ui.button'), 'theme' => true),
+		'ui.slider' => array('fileName' => 'jquery.ui.slider.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.mouse'), 'theme' => true),
+		'ui.tabs' => array('fileName' => 'jquery.ui.tabs.min.js', 'dependencies' => array('ui.core', 'ui.widget'), 'theme' => true),
+		'ui.datepicker' => array('fileName' => 'jquery.ui.datepicker.min.js', 'dependencies' => array('ui.core'), 'theme' => true),
+		'ui.progressbar' => array('fileName' => 'jquery.ui.progressbar.min.js', 'dependencies' => array('ui.core', 'ui.widget'), 'theme' => true),
+		'effects.core' => array('fileName' => 'jquery.effects.core.min.js', 'dependencies' => array(), 'theme' => false),
+		'effects.blind' => array('fileName' => 'jquery.effects.blind.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
+		'effects.bounce' => array('fileName' => 'jquery.effects.bounce.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
+		'effects.clip' => array('fileName' => 'jquery.effects.clip.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
+		'effects.drop' => array('fileName' => 'jquery.effects.drop.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
+		'effects.explode' => array('fileName' => 'jquery.effects.explode.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
+		'effects.fade' => array('fileName' => 'jquery.effects.fade.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
+		'effects.fold' => array('fileName' => 'jquery.effects.fold.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
+		'effects.highlight' => array('fileName' => 'jquery.effects.highlight.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
+		'effects.pulsate' => array('fileName' => 'jquery.effects.pulsate.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
+		'effects.scale' => array('fileName' => 'jquery.effects.scale.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
+		'effects.shake' => array('fileName' => 'jquery.effects.shake.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
+		'effects.slide' => array('fileName' => 'jquery.effects.slide.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
+		'effects.transfer' => array('fileName' => 'jquery.effects.transfer.min.js', 'dependencies' => array('effects.core'), 'theme' => false)
 	);

+
 	public static function minifyHTML($html_content)
 	{
 		if (strlen($html_content) > 0)
@@ -110,7 +111,8 @@ class MediaCore
 			// In this case, we don't compress the content
 			if (preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR)
 			{
-				error_log('ERROR: PREG_BACKTRACK_LIMIT_ERROR in function packJSinHTML');
+				if (_PS_MODE_DEV_)
+					error_log('ERROR: PREG_BACKTRACK_LIMIT_ERROR in function packJSinHTML');
 				return $html_content_copy;
 			}
 			return $html_content;
@@ -199,7 +201,7 @@ class MediaCore
 		if (!preg_match('/^http(s?):\/\//i', $file_uri) && !@filemtime($file_uri))
 			return false;

-		if (Context::getContext()->controller->controller_type == 'admin')
+		if (Context::getContext()->controller->controller_type == 'admin' && !array_key_exists('host', $url_data))
 		{
 			$js_uri = preg_replace('/^'.preg_quote(__PS_BASE_URI__, '/').'/', '/', $js_uri);
 			$js_uri = dirname(preg_replace('/\?.+$/', '', $_SERVER['REQUEST_URI']).'a').'/..'.$js_uri;
@@ -223,7 +225,7 @@ class MediaCore
 		$url_data = parse_url($css_uri);
 		$file_uri = _PS_ROOT_DIR_.Tools::str_replace_once(__PS_BASE_URI__, DIRECTORY_SEPARATOR, $url_data['path']);
 		// check if css files exists
-		if (!@filemtime($file_uri))
+		if (!@filemtime($file_uri) && !array_key_exists('host', $url_data)) 
 			return false;

 		if (Context::getContext()->controller->controller_type == 'admin')
@@ -270,6 +272,9 @@ class MediaCore
 		if ($add_no_conflict)
 			$return[] = Media::getJSPath(_PS_JS_DIR_.'jquery/jquery.noConflict.php?version='.$version);

+		//added query migrate for compatibility with new version of jquery will be removed in ps 1.6
+		$return[] = Media::getJSPath(_PS_JS_DIR_.'jquery/jquery-migrate-1.2.1.js');
+
 		return $return;
 	}

@@ -385,6 +390,7 @@ class MediaCore
 	{
 		//inits
 		$css_files_by_media = array();
+		$external_css_files = array(); 
 		$compressed_css_files = array();
 		$compressed_css_files_not_found = array();
 		$compressed_css_files_infos = array();
@@ -399,6 +405,13 @@ class MediaCore
 			$infos = array();
 			$infos['uri'] = $filename;
 			$url_data = parse_url($filename);
+
+			if(array_key_exists('host', $url_data))
+			{
+				$external_css_files[$filename] = $media;
+				continue;
+			}
+
 			$infos['path'] = _PS_ROOT_DIR_.Tools::str_replace_once(__PS_BASE_URI__, '/', $url_data['path']);
 			$css_files_by_media[$media]['files'][] = $infos;
 			if (!array_key_exists('date', $css_files_by_media[$media]))
@@ -460,7 +473,7 @@ class MediaCore
 			$url = str_replace(_PS_THEME_DIR_, _THEMES_DIR_._THEME_NAME_.'/', $filename);
 			$css_files[$protocol_link.Tools::getMediaServer($url).$url] = $media;
 		}
-		return $css_files;
+		return array_merge($external_css_files, $css_files); 
 	}

 	public static function getBackTrackLimit()
@@ -68,8 +68,11 @@ class MetaCore extends ObjectModel
 		{
 			if ($file != 'index.php' && !in_array(strtolower(str_replace('Controller.php', '', $file)), $exlude_pages))
 			{
-				$reflection = new ReflectionClass(str_replace('.php', '', $file));
-				$properties = $reflection->getDefaultProperties();
+				$class_name = str_replace('.php', '', $file);
+				if (class_exists($class_name))
+					$reflection = new ReflectionClass(str_replace('.php', '', $file));
+				if (isset($reflection) && $reflection)
+					$properties = $reflection->getDefaultProperties();
 				if (isset($properties['php_self']))
 					$selected_pages[$properties['php_self']] = $properties['php_self'];
 				else if (preg_match('/^[a-z0-9_.-]*\.php$/i', $file))
@@ -242,16 +242,6 @@ abstract class ObjectModelCore
 						$this->{$key} = $value;	
 			}
 		}
-
-		if (!is_array(self::$fieldsRequiredDatabase))
-		{
-			$fields = $this->getfieldsRequiredDatabase(true);
-			if ($fields)
-				foreach ($fields as $row)
-					self::$fieldsRequiredDatabase[$row['object_name']][(int)$row['id_required_field']] = pSQL($row['field_name']);
-			else
-				self::$fieldsRequiredDatabase = array();
-		}
 	}

 	/**
@@ -545,28 +535,28 @@ abstract class ObjectModelCore
 			return false;
 		
 		$object_id = Db::getInstance()->Insert_ID();
-		
+
 		if (isset($definition['multilang']) && $definition['multilang'])
 		{
-			$res = Db::getInstance()->executeS('
-						SELECT * 
-						FROM `'._DB_PREFIX_.bqSQL($definition['table']).'_lang`
-						WHERE `'.bqSQL($definition['primary']).'` = '.(int)$this->id
-					);
-
-			if (!$res)
+			$result = Db::getInstance()->executeS('
+			SELECT * 
+			FROM `'._DB_PREFIX_.bqSQL($definition['table']).'_lang`
+			WHERE `'.bqSQL($definition['primary']).'` = '.(int)$this->id);
+			if (!$result)
 				return false;
-
-			foreach ($res as $field => &$value)
-				if (isset($definition['fields'][$field]))
-					$value = ObjectModel::formatValue($value, $definition['fields'][$field]['type']);
-
-			foreach ($res as $row)
+	
+			foreach ($result as &$row)
+				foreach ($row as $field => &$value)
+					if (isset($definition['fields'][$field]))
+						$value = ObjectModel::formatValue($value, $definition['fields'][$field]['type']);
+			
+			// Keep $row2, you cannot use $row because there is an unexplicated conflict with the previous usage of this variable
+			foreach ($result as $row2)
 			{
-				$row[$definition['primary']] = (int)$object_id;	
-				if (!Db::getInstance()->insert($definition['table'].'_lang', $row))
+				$row2[$definition['primary']] = (int)$object_id;
+				if (!Db::getInstance()->insert($definition['table'].'_lang', $row2))
 					return false;
-				}
+			}
 		}
 	
 		$object_duplicated = new $definition['classname']((int)$object_id);
@@ -763,6 +753,9 @@ abstract class ObjectModelCore
 	 	if (!array_key_exists('active', $this))
 			throw new PrestaShopException('property "active" is missing in object '.get_class($this));

+		// Update only active field
+		$this->setFieldsToUpdate(array('active' => true));
+
 	 	// Update active status on object
 	 	$this->active = !(int)$this->active;

@@ -864,8 +857,12 @@ abstract class ObjectModelCore
 				continue;

 			$values = $this->$field;
+			
+			// If the object has not been loaded in multilanguage, then the value is the one for the current language of the object
 			if (!is_array($values))
 				$values = array($this->id_lang => $values);
+
+			// The value for the default must always be set, so we put an empty string if it does not exists
 			if (!isset($values[Configuration::get('PS_LANG_DEFAULT')]))
 				$values[Configuration::get('PS_LANG_DEFAULT')] = '';

@@ -898,6 +895,7 @@ abstract class ObjectModelCore
 	 */
 	public function validateField($field, $value, $id_lang = null)
 	{
+		$this->cacheFieldsRequiredDatabase();
 		$data = $this->def['fields'][$field];

 		// Check if field is required
@@ -936,8 +934,22 @@ abstract class ObjectModelCore
 			if (!method_exists('Validate', $data['validate']))
 				throw new PrestaShopException('Validation function not found. '.$data['validate']);

-			if (!empty($value) && !call_user_func(array('Validate', $data['validate']), $value))
-				return 'Property '.get_class($this).'->'.$field.' is not valid';
+			if (!empty($value))
+			{
+				$res = true;
+				if (Tools::strtolower($data['validate']) == 'iscleanhtml')
+				{
+					if (!call_user_func(array('Validate', $data['validate']), $value, (int)Configuration::get('PS_ALLOW_HTML_IFRAME')))
+						$res = false;
+				}
+				else
+				{
+					if (!call_user_func(array('Validate', $data['validate']), $value))
+						$res = false;
+				}
+				if (!$res)
+					return 'Property '.get_class($this).'->'.$field.' is not valid';
+			}
 		}

 		return true;
@@ -966,21 +978,23 @@ abstract class ObjectModelCore

 	public function validateController($htmlentities = true)
 	{
+		$this->cacheFieldsRequiredDatabase();
 		$errors = array();
 		$required_fields_database = (isset(self::$fieldsRequiredDatabase[get_class($this)])) ? self::$fieldsRequiredDatabase[get_class($this)] : array();
 		foreach ($this->def['fields'] as $field => $data)
 		{
+			$value = Tools::getValue($field, $this->{$field});		
 			// Check if field is required by user
 			if (in_array($field, $required_fields_database))
 				$data['required'] = true;
 			
 			// Checking for required fields
-			if (isset($data['required']) && $data['required'] && ($value = Tools::getValue($field, $this->{$field})) == false && (string)$value != '0')
+			if (isset($data['required']) && $data['required'] && empty($value) && $value !== '0')
 				if (!$this->id || $field != 'passwd')
 					$errors[$field] = '<b>'.self::displayFieldName($field, get_class($this), $htmlentities).'</b> '.Tools::displayError('is required.');

 			// Checking for maximum fields sizes
-			if (isset($data['size']) && ($value = Tools::getValue($field, $this->{$field})) && Tools::strlen($value) > $data['size'])
+			if (isset($data['size']) && !empty($value) && Tools::strlen($value) > $data['size'])
 				$errors[$field] = sprintf(
 					Tools::displayError('%1$s is too long. Maximum length: %2$d'),
 					self::displayFieldName($field, get_class($this), $htmlentities),
@@ -989,7 +1003,7 @@ abstract class ObjectModelCore

 			// Checking for fields validity
 			// Hack for postcode required for country which does not have postcodes
-			if (($value = Tools::getValue($field, $this->{$field})) || ($field == 'postcode' && $value == '0'))
+			if (!empty($value) || $value === '0' || ($field == 'postcode' && $value == '0'))
 			{
 				if (isset($data['validate']) && !Validate::$data['validate']($value) && (!empty($value) || $data['required']))
 					$errors[$field] = '<b>'.self::displayFieldName($field, get_class($this), $htmlentities).'</b> '.Tools::displayError('is invalid.');
@@ -1012,6 +1026,7 @@ abstract class ObjectModelCore

 	public function getWebserviceParameters($ws_params_attribute_name = null)
 	{
+		$this->cacheFieldsRequiredDatabase();
 		$default_resource_parameters = array(
 			'objectSqlId' => $this->def['primary'],
 			'retrieveData' => array(
@@ -1122,6 +1137,7 @@ abstract class ObjectModelCore

 	public function validateFieldsRequiredDatabase($htmlentities = true)
 	{
+		$this->cacheFieldsRequiredDatabase();
 		$errors = array();
 		$required_fields = (isset(self::$fieldsRequiredDatabase[get_class($this)])) ? self::$fieldsRequiredDatabase[get_class($this)] : array();

@@ -1149,6 +1165,19 @@ abstract class ObjectModelCore
 		FROM '._DB_PREFIX_.'required_field
 		'.(!$all ? 'WHERE object_name = \''.pSQL(get_class($this)).'\'' : ''));
 	}
+	
+	public function cacheFieldsRequiredDatabase()
+	{
+		if (!is_array(self::$fieldsRequiredDatabase))
+		{
+			$fields = $this->getfieldsRequiredDatabase(true);
+			if ($fields)
+				foreach ($fields as $row)
+					self::$fieldsRequiredDatabase[$row['object_name']][(int)$row['id_required_field']] = pSQL($row['field_name']);
+			else
+				self::$fieldsRequiredDatabase = array();
+		}
+	}

 	public function addFieldsRequiredDatabase($fields)
 	{
@@ -1298,7 +1327,7 @@ abstract class ObjectModelCore
 	 * @param string $specific_where Only executed for common table
 	 * @return bool
 	 */
-	public static function updateMultishopTable($classname, $data, $where, $specific_where = '')
+	public static function updateMultishopTable($classname, $data, $where = '', $specific_where = '')
 	{
 		$def = ObjectModel::getDefinition($classname);
 		$update_data = array();
@@ -1318,8 +1347,8 @@ abstract class ObjectModelCore

 		$sql = 'UPDATE '._DB_PREFIX_.$def['table'].' a
 				'.Shop::addSqlAssociation($def['table'], 'a', true, null, true).'
-				SET '.implode(', ', $update_data).'
-				WHERE '.$where;
+				SET '.implode(', ', $update_data).
+				(!empty($where) ? ' WHERE '.$where : '');
 		return Db::getInstance()->execute($sql);
 	}

@@ -348,7 +348,8 @@ abstract class PaymentModuleCore extends Module
 					// Construct order detail table for the email
 					$products_list = '';
 					$virtual_product = true;
-					foreach ($products as $key => $product)
+
+					foreach ($order->product_list as $key => $product)
 					{
 						$price = Product::getPriceStatic((int)$product['id_product'], false, ($product['id_product_attribute'] ? (int)$product['id_product_attribute'] : null), 6, null, false, true, $product['cart_quantity'], false, (int)$order->id_customer, (int)$order->id_cart, (int)$order->{Configuration::get('PS_TAX_ADDRESS_TYPE')});
 						$price_wt = Product::getPriceStatic((int)$product['id_product'], true, ($product['id_product_attribute'] ? (int)$product['id_product_attribute'] : null), 2, null, false, true, $product['cart_quantity'], false, (int)$order->id_customer, (int)$order->id_cart, (int)$order->{Configuration::get('PS_TAX_ADDRESS_TYPE')});
@@ -386,7 +387,7 @@ abstract class PaymentModuleCore extends Module
 							'<tr style="background-color: '.($key % 2 ? '#DDE2E6' : '#EBECEE').';">
 								<td style="padding: 0.6em 0.4em;width: 15%;">'.$product['reference'].'</td>
 								<td style="padding: 0.6em 0.4em;width: 30%;"><strong>'.$product['name'].(isset($product['attributes']) ? ' - '.$product['attributes'] : '').'</strong></td>
-								<td style="padding: 0.6em 0.4em; width: 20%;">'.Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt, $this->context->currency, false).'</td>
+								<td style="padding: 0.6em 0.4em; width: 20%;">'.Tools::displayPrice(Product::getTaxCalculationMethod((int)$this->context->customer->id) == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt, $this->context->currency, false).'</td>
 								<td style="padding: 0.6em 0.4em; width: 15%;">'.((int)$product['cart_quantity'] - $customization_quantity).'</td>
 								<td style="padding: 0.6em 0.4em; width: 20%;">'.Tools::displayPrice(((int)$product['cart_quantity'] - $customization_quantity) * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt), $this->context->currency, false).'</td>
 							</tr>';
@@ -431,9 +432,9 @@ abstract class PaymentModuleCore extends Module

 							// Set the new voucher value
 							if ($voucher->reduction_tax)
-								$voucher->reduction_amount = $values['tax_incl'] - $order->total_products_wt - $order->total_shipping_tax_incl;
+								$voucher->reduction_amount = $values['tax_incl'] - $order->total_products_wt - ($voucher->free_shipping == 1 ? $order->total_shipping_tax_incl : 0);
 							else
-								$voucher->reduction_amount = $values['tax_excl'] - $order->total_products - $order->total_shipping_tax_excl;
+								$voucher->reduction_amount = $values['tax_excl'] - $order->total_products - ($voucher->free_shipping == 1 ? $order->total_shipping_tax_excl : 0);

 							$voucher->id_customer = $order->id_customer;
 							$voucher->quantity = 1;
@@ -604,7 +605,8 @@ abstract class PaymentModuleCore extends Module
 						'{total_products}' => Tools::displayPrice($order->total_paid - $order->total_shipping - $order->total_wrapping + $order->total_discounts, $this->context->currency, false),
 						'{total_discounts}' => Tools::displayPrice($order->total_discounts, $this->context->currency, false),
 						'{total_shipping}' => Tools::displayPrice($order->total_shipping, $this->context->currency, false),
-						'{total_wrapping}' => Tools::displayPrice($order->total_wrapping, $this->context->currency, false));
+						'{total_wrapping}' => Tools::displayPrice($order->total_wrapping, $this->context->currency, false),
+						'{total_tax_paid}' => Tools::displayPrice(($order->total_products_wt - $order->total_products) + ($order->total_shipping_tax_incl - $order->total_shipping_tax_excl), $this->context->currency, false));

 						if (is_array($extra_vars))
 							$data = array_merge($data, $extra_vars);
@@ -297,8 +297,8 @@ class ProductCore extends ObjectModel
 			'meta_title' => 				array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 128),
 			'link_rewrite' => 				array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isLinkRewrite', 'required' => true, 'size' => 128),
 			'name' => 						array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isCatalogName', 'required' => true, 'size' => 128),
-			'description' => 				array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isString'),
-			'description_short' => 			array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isString'),
+			'description' => 				array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml'),
+			'description_short' => 			array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml'),
 			'available_now' => 				array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 255),
 			'available_later' => 			array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'IsGenericName', 'size' => 255),
 		),
@@ -347,7 +347,7 @@ class ProductCore extends ObjectModel
 			),
 			'id_tax_rules_group' => array(
 				'xlink_resource' => array(
-					'resourceName' => 'tax_rules_group'
+					'resourceName' => 'tax_rule_groups'
 				)
 			),
 			'position_in_category' => array(
@@ -364,7 +364,7 @@ class ProductCore extends ObjectModel
 			),
 			'type' => array(
 				'getter' => 'getWsType',
-				'setter' => false,
+				'setter' => 'setWsType',
 			),
 		),
 		'associations' => array(
@@ -668,6 +668,45 @@ class ProductCore extends ObjectModel
 		return false;
 	}

+	/**
+	 * For a given id_product and id_product_attribute, return available date
+	 *
+	 * @param int $id_product
+	 * @param int $id_product_attribute Optional
+	 * @return string/null
+	 */
+	public static function getAvailableDate($id_product, $id_product_attribute = null)
+	{
+		$sql = 'SELECT';
+
+		if ($id_product_attribute === null)
+			$sql .= ' p.`available_date`';
+		else
+			$sql .= ' IF(pa.`available_date` = "0000-00-00", p.`available_date`, pa.`available_date`) AS available_date';
+
+		$sql .= ' FROM `'._DB_PREFIX_.'product` p';
+
+		if ($id_product_attribute !== null)
+			$sql .= ' LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (pa.`id_product` = p.`id_product`)';
+
+		$sql .= Shop::addSqlAssociation('product', 'p');
+
+		if ($id_product_attribute !== null)
+			$sql .= Shop::addSqlAssociation('product_attribute', 'pa');
+
+		$sql .= ' WHERE p.`id_product` = '.(int)$id_product;
+
+		if ($id_product_attribute !== null)
+			$sql .= ' AND pa.`id_product` = '.(int)$id_product.' AND pa.`id_product_attribute` = '.(int)$id_product_attribute;
+
+		$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql);
+
+		if ($result == '0000-00-00')
+			$result = null;
+
+		return $result;
+	}
+
 	public static function updateIsVirtual($id_product)
 	{
 		Db::getInstance()->update('product', array(
@@ -868,12 +907,13 @@ class ProductCore extends ObjectModel
 			AND cp.id_product = '.$this->id
 		);

-		foreach ($result as $categ_to_delete)
-			$this->deleteCategory($categ_to_delete['id_category']);
 		// if none are found, it's an error
 		if (!is_array($result))
 			return false;

+		foreach ($result as $categ_to_delete)
+			$this->deleteCategory($categ_to_delete['id_category']);
+
 		if (!$this->addToCategories($categories))
 			return false;

@@ -1299,7 +1339,7 @@ class ProductCore extends ObjectModel
 	}

 	/**
-	 * Sets Supplier Reference
+	 * Sets or updates Supplier Reference
 	 *
 	 * @param int $id_supplier
 	 * @param int $id_product_attribute
@@ -1312,30 +1352,25 @@ class ProductCore extends ObjectModel
 		//in some case we need to add price without supplier reference
 		if ($supplier_reference === null)
 			$supplier_reference = '';
-		
+
 		//Try to set the default supplier reference
-		if ($id_supplier > 0)
+		if (($id_supplier > 0) && ($this->id > 0))
 		{
 			$id_product_supplier = (int)ProductSupplier::getIdByProductAndSupplier($this->id, $id_product_attribute, $id_supplier);

+			$product_supplier = new ProductSupplier($id_product_supplier);
+
 			if (!$id_product_supplier)
 			{
-				//create new record
-				$product_supplier_entity = new ProductSupplier();
-				$product_supplier_entity->id_product = (int)$this->id;
-				$product_supplier_entity->id_product_attribute = (int)$id_product_attribute;
-				$product_supplier_entity->id_supplier = (int)$id_supplier;
-				$product_supplier_entity->product_supplier_reference = pSQL($supplier_reference);
-				$product_supplier_entity->product_supplier_price_te = (int)$price;
-				$product_supplier_entity->id_currency = (int)$id_currency;
-				$product_supplier_entity->save();
-			}
-			else
-			{
-				$product_supplier = new ProductSupplier((int)$id_product_supplier);
-				$product_supplier->product_supplier_reference = pSQL($supplier_reference);
-				$product_supplier->update();
+				$product_supplier->id_product = (int)$this->id;
+				$product_supplier->id_product_attribute = (int)$id_product_attribute;
+				$product_supplier->id_supplier = (int)$id_supplier;
 			}
+
+			$product_supplier->product_supplier_reference = pSQL($supplier_reference);
+			$product_supplier->product_supplier_price_te = (float)$price;
+			$product_supplier->id_currency = (int)$id_currency;
+			$product_supplier->save();
 		}
 	}

@@ -1977,13 +2012,7 @@ class ProductCore extends ObjectModel
 					FROM `'._DB_PREFIX_.'product` p
 					'.Shop::addSqlAssociation('product', 'p').'
 					WHERE product_shop.`active` = 1
-					AND 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
+					AND product_shop.`date_add` > "'.date('Y-m-d', strtotime('-'.(Configuration::get('PS_NB_DAYS_NEW_PRODUCT') ? (int)Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20).' DAY')).'"
 					'.($front ? ' AND product_shop.`visibility` IN ("both", "catalog")' : '').'
 					AND p.`id_product` IN (
 						SELECT cp.`id_product`
@@ -1998,13 +2027,7 @@ class ProductCore extends ObjectModel
 		$sql->select(
 			'p.*, product_shop.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, pl.`description`, pl.`description_short`, pl.`link_rewrite`, pl.`meta_description`,
 			pl.`meta_keywords`, pl.`meta_title`, pl.`name`, MAX(image_shop.`id_image`) id_image, il.`legend`, m.`name` AS manufacturer_name,
-			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'
+			product_shop.`date_add` > "'.date('Y-m-d', strtotime('-'.(Configuration::get('PS_NB_DAYS_NEW_PRODUCT') ? (int)Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20).' DAY')).'" as new'
 		);

 		$sql->from('product', 'p');
@@ -2019,25 +2042,15 @@ class ProductCore extends ObjectModel
 		$sql->leftJoin('manufacturer', 'm', 'm.`id_manufacturer` = p.`id_manufacturer`');

 		$sql->where('product_shop.`active` = 1');
-
 		if ($front)
 			$sql->where('product_shop.`visibility` IN ("both", "catalog")');
-		$sql->where('
-			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'
-		);
-
+		$sql->where('product_shop.`date_add` > "'.date('Y-m-d', strtotime('-'.(Configuration::get('PS_NB_DAYS_NEW_PRODUCT') ? (int)Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20).' DAY')).'"');
 		$sql->where('p.`id_product` IN (
 			SELECT cp.`id_product`
 			FROM `'._DB_PREFIX_.'category_group` cg
 			LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_category` = cg.`id_category`)
-			WHERE cg.`id_group` '.$sql_groups.')'
-		);
+			WHERE cg.`id_group` '.$sql_groups.'
+		)');
 		$sql->groupBy('product_shop.id_product');

 		$sql->orderBy((isset($order_by_prefix) ? pSQL($order_by_prefix).'.' : '').'`'.pSQL($order_by).'` '.pSQL($order_way));
@@ -2371,8 +2384,14 @@ class ProductCore extends ObjectModel
 			WHERE id_product = '.(int)$this->id.'
 			AND id_shop = '.(int)$this->id_shop
 		);
-		if (count($data))
-			Db::getInstance()->insert('product_carrier', $data);
+		
+		$uniqueArray = array();
+		foreach($data as $subArray)
+			if(!in_array($subArray, $uniqueArray))
+			  $uniqueArray[] = $subArray;
+  		
+		if (count($uniqueArray))
+			Db::getInstance()->insert('product_carrier', $uniqueArray, false, true, Db::INSERT_IGNORE);
 	}

 	/**
@@ -2449,8 +2468,9 @@ class ProductCore extends ObjectModel

 		if (!Validate::isBool($usetax) || !Validate::isUnsignedId($id_product))
 			die(Tools::displayError());
+
 		// Initializations
-		$id_group = (isset($context->customer) ? $context->customer->id_default_group : (int)Configuration::get('PS_CUSTOMER_GROUP'));
+		$id_group = (int)Group::getCurrent()->id;

 		// If there is cart in context or if the specified id_cart is different from the context cart id
 		if (!is_object($cur_cart) || (Validate::isUnsignedInt($id_cart) && $id_cart && $cur_cart->id != $id_cart))
@@ -2699,8 +2719,10 @@ class ProductCore extends ObjectModel
 		// Group reduction
 		if ($use_group_reduction)
 		{
-			if ($reduction_from_category = (float)GroupReduction::getValueForProduct($id_product, $id_group))
-				$price -= $price * $reduction_from_category;
+			$reduction_from_category = GroupReduction::getValueForProduct($id_product, $id_group);
+
+			if (!empty($reduction_from_category) && (float)$reduction_from_category == 0)
+				$price -= $price * (float)$reduction_from_category;
 			else // apply group reduction if there is no group reduction for this category
 				$price *= ((100 - Group::getReductionByIdGroup($id_group)) / 100);
 		}
@@ -2893,7 +2915,7 @@ class ProductCore extends ObjectModel
 	 * @param Shop $shop
 	 * @return string
 	 */
-	public static function sqlStock($product_alias, $product_attribute = 0, $inner_join = false, Shop $shop = null)
+	public static function sqlStock($product_alias, $product_attribute = null, $inner_join = false, Shop $shop = null)
 	{
 		$id_shop = ($shop !== null ? (int)$shop->id : null);
 		$sql = (($inner_join) ? ' INNER ' : ' LEFT ').'
@@ -3034,18 +3056,18 @@ class ProductCore extends ObjectModel
 		if (!Combination::isFeatureActive())
 			return array();
 		$sql = 'SELECT ag.`id_attribute_group`, ag.`is_color_group`, agl.`name` AS group_name, agl.`public_name` AS public_group_name,
-					a.`id_attribute`, al.`name` AS attribute_name, a.`color` AS attribute_color, pa.`id_product_attribute`,
-					IFNULL(stock.quantity, 0) as quantity, product_attribute_shop.`price`, product_attribute_shop.`ecotax`, pa.`weight`,
+					a.`id_attribute`, al.`name` AS attribute_name, a.`color` AS attribute_color, product_attribute_shop.`id_product_attribute`,
+					IFNULL(stock.quantity, 0) as quantity, product_attribute_shop.`price`, product_attribute_shop.`ecotax`, product_attribute_shop.`weight`,
 					product_attribute_shop.`default_on`, pa.`reference`, product_attribute_shop.`unit_price_impact`,
-					pa.`minimal_quantity`, pa.`available_date`, ag.`group_type`
+					product_attribute_shop.`minimal_quantity`, product_attribute_shop.`available_date`, ag.`group_type`
 				FROM `'._DB_PREFIX_.'product_attribute` pa
 				'.Shop::addSqlAssociation('product_attribute', 'pa').'
 				'.Product::sqlStock('pa', 'pa').'
-				LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON pac.`id_product_attribute` = pa.`id_product_attribute`
-				LEFT JOIN `'._DB_PREFIX_.'attribute` a ON a.`id_attribute` = pac.`id_attribute`
-				LEFT JOIN `'._DB_PREFIX_.'attribute_group` ag ON ag.`id_attribute_group` = a.`id_attribute_group`
-				LEFT JOIN `'._DB_PREFIX_.'attribute_lang` al ON a.`id_attribute` = al.`id_attribute`
-				LEFT JOIN `'._DB_PREFIX_.'attribute_group_lang` agl ON ag.`id_attribute_group` = agl.`id_attribute_group`
+				LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON (pac.`id_product_attribute` = pa.`id_product_attribute`)
+				LEFT JOIN `'._DB_PREFIX_.'attribute` a ON (a.`id_attribute` = pac.`id_attribute`)
+				LEFT JOIN `'._DB_PREFIX_.'attribute_group` ag ON (ag.`id_attribute_group` = a.`id_attribute_group`)
+				LEFT JOIN `'._DB_PREFIX_.'attribute_lang` al ON (a.`id_attribute` = al.`id_attribute`)
+				LEFT JOIN `'._DB_PREFIX_.'attribute_group_lang` agl ON (ag.`id_attribute_group` = agl.`id_attribute_group`)
 				'.Shop::addSqlAssociation('attribute', 'a').'
 				WHERE pa.`id_product` = '.(int)$this->id.'
 					AND al.`id_lang` = '.(int)$id_lang.'
@@ -3794,15 +3816,14 @@ class ProductCore extends ObjectModel
 			isset($row['cache_is_pack']) ? $row['cache_is_pack'] : null
 		);

+		$row['quantity_all_versions'] = $row['quantity'];
+
 		if ($row['id_product_attribute'])
-		{
-			$row['quantity_all_versions'] = $row['quantity'];
 			$row['quantity'] = Product::getQuantity(
 				(int)$row['id_product'],
    			$row['id_product_attribute'],
 			   isset($row['cache_is_pack']) ? $row['cache_is_pack'] : null
 			);
-		}	

 		$row['id_image'] = Product::defineProductImage($row, $id_lang);
 		$row['features'] = Product::getFrontFeaturesStatic((int)$id_lang, $row['id_product']);
@@ -4473,7 +4494,7 @@ class ProductCore extends ObjectModel

 		return true;
 	}
-	/*
+
 	/**
 	* Webservice getter : get virtual field default combination
 	*
@@ -4738,6 +4759,44 @@ class ProductCore extends ObjectModel
 		FROM `'._DB_PREFIX_.'product_tag`
 		WHERE `id_product` = '.(int)$this->id);
 	}
+	
+	/**
+	* Webservice setter : set tag ids of current product for association
+	*
+	* @param $tag_ids tag ids
+	*/
+	public function setWsTags($tag_ids)
+	{
+		$ids = array();
+		foreach ($tag_ids as $value)
+			$ids[] = $value['id'];
+		if ($this->deleteWsTags())
+		{
+			if ($ids)
+			{
+				$sql_values = '';
+				$ids = array_map('intval', $ids);
+				foreach ($ids as $position => $id)
+					$sql_values[] = '('.(int)$this->id.', '.(int)$id.')';
+				$result = Db::getInstance()->execute('
+					INSERT INTO `'._DB_PREFIX_.'product_tag` (`id_product`, `id_tag`)
+					VALUES '.implode(',', $sql_values)
+				);
+				return $result;
+			}
+		}
+		return true;
+	}
+	
+	/**
+	* Delete products tags entries without delete tags for webservice usage
+	*
+	* @return array Deletion result
+	*/
+	public function deleteWsTags()
+	{
+		return Db::getInstance()->delete('product_tag', 'id_product = '.(int)$this->id);
+	}		


 	public function getWsManufacturerName()
@@ -4749,7 +4808,7 @@ class ProductCore extends ObjectModel
 	{
 		return ObjectModel::updateMultishopTable('product', array(
 			'ecotax' => 0,
-		), '');
+		));
 	}

 	/**
@@ -5342,6 +5401,41 @@ class ProductCore extends ObjectModel

 	public function getWsProductBundle()
 	{
-		return Db::getInstance()->executeS('SELECT id_product_item as id, quantity FROM '._DB_PREFIX_.'pack where id_product_pack = '.(int)$this->id);
+		return Db::getInstance()->executeS('SELECT id_product_item as id, quantity FROM '._DB_PREFIX_.'pack WHERE id_product_pack = '.(int)$this->id);
 	}
-}
+	
+	public function setWsType($type_str)
+	{
+		$reverse_type_information = array(
+			'simple' => Product::PTYPE_SIMPLE,
+			'pack' => Product::PTYPE_PACK,
+			'virtual' => Product::PTYPE_VIRTUAL,
+		);
+	
+		if (!isset($reverse_type_information[$type_str]))
+			return false;
+		
+		$type = $reverse_type_information[$type_str];
+	
+		if (Pack::isPack((int)$this->id) && $type != Product::PTYPE_PACK)
+			Pack::deleteItems($this->id);
+			
+		$this->cache_is_pack = ($type == Product::PTYPE_PACK);
+		$this->is_virtual = ($type == Product::PTYPE_VIRTUAL);
+	
+		return true;
+	}
+
+	public function setWsProductBundle($items)
+	{
+		if($this->is_virtual)
+			return false;
+	
+		Pack::deleteItems($this->id);
+		
+		foreach ($items as $item)
+			if((int)$item['id'] > 0)
+				Pack::addItem($this->id, (int)$item['id'], (int)$item['quantity']);
+		return true;
+	}
+}
@@ -299,10 +299,10 @@ class ProductDownloadCore extends ObjectModel
 	 */
 	public static function getNewFilename()
 	{
-		$ret = sha1(microtime());
-		if (file_exists(_PS_DOWNLOAD_DIR_.$ret))
-			$ret = ProductDownload::getNewFilename();
-		return $ret;
+		do {
+			$filename = sha1(microtime());
+		} while (file_exists(_PS_DOWNLOAD_DIR_.$filename));
+		return $filename;
 	}

 	/**
@@ -314,4 +314,4 @@ class ProductDownloadCore extends ObjectModel
 	{
 		return Configuration::get('PS_VIRTUAL_PROD_FEATURE_ACTIVE');
 	}
-}
+}
@@ -66,8 +66,11 @@ class ProductSaleCore
 		if ($page_number < 0) $page_number = 0;
 		if ($nb_products < 1) $nb_products = 10;
 		$final_order_by = $order_by;
+		$order_table = ''; 		
 		if (is_null($order_by) || $order_by == 'position' || $order_by == 'price') $order_by = 'sales';
-		if (is_null($order_way) || $order_by == 'sales') $order_way == 'DESC';
+		if ($order_by == 'date_add' || $order_by == 'date_upd')
+			$order_table = 'product_shop'; 				
+		if (is_null($order_way) || $order_by == 'sales') $order_way = 'DESC';
 		$groups = FrontController::getCurrentCustomerGroups();
 		$sql_groups = (count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1');
 		$interval = Validate::isUnsignedInt(Configuration::get('PS_NB_DAYS_NEW_PRODUCT')) ? Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20;
@@ -108,7 +111,7 @@ class ProductSaleCore
 						WHERE cg.`id_group` '.$sql_groups.'
 					)
 				GROUP BY product_shop.id_product
-				ORDER BY '.$prefix.'`'.pSQL($order_by).'` '.pSQL($order_way).'
+				ORDER BY '.(!empty($order_table) ? '`'.pSQL($order_table).'`.' : '').'`'.pSQL($order_by).'` '.pSQL($order_way).'
 				LIMIT '.(int)($page_number * $nb_products).', '.(int)$nb_products;

 		$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
@@ -208,9 +208,10 @@ class ProductSupplierCore extends ObjectModel
 	 *
 	 * @param int $id_product
 	 * @param int $id_product_attribute Optional
+	 * @param bool $converted_price Optional
 	 * @return Array keys: price_te, id_currency
 	 */
-	public static function getProductPrice($id_supplier, $id_product, $id_product_attribute = 0)
+	public static function getProductPrice($id_supplier, $id_product, $id_product_attribute = 0, $converted_price = false)
 	{
 		if (is_null($id_supplier) || is_null($id_product))
 			return;
@@ -222,6 +223,9 @@ class ProductSupplierCore extends ObjectModel
 		$query->where('id_supplier = '.(int)$id_supplier);

 		$row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($query);
+		if ($converted_price)
+			return Tools::convertPrice($row['price_te'], $row['id_currency']);
+
 		return $row['price_te'];
 	}
-}
+}
@@ -37,7 +37,7 @@ class RequestSqlCore extends ObjectModel
 		'primary' => 'id_request_sql',
 		'fields' => array(
 			'name' => 	array('type' => self::TYPE_STRING, 'validate' => 'isString', 'required' => true, 'size' => 200),
-			'sql' => 	array('type' => self::TYPE_STRING, 'validate' => 'isString', 'required' => true, 'size' => 1000),
+			'sql' => 	array('type' => self::TYPE_STRING, 'validate' => 'isString', 'required' => true),
 		),
 	);

@@ -232,8 +232,6 @@ class RequestSqlCore extends ObjectModel
 		{
 			if ($attribut = $this->cutAttribute(trim($attr), $from))
 				$tab[] = $attribut;
-			else
-				return false;
 		}
 		return $tab;
 	}
@@ -93,8 +93,12 @@ define('PREG_CLASS_CJK', '\x{3041}-\x{30ff}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{

 class SearchCore
 {
-	public static function sanitize($string, $id_lang, $indexation = false)
+	public static function sanitize($string, $id_lang, $indexation = false, $iso_code = false)
 	{
+		$string = trim($string);
+		if (empty($string))
+			return '';
+
 		$string = Tools::strtolower(strip_tags($string));
 		$string = html_entity_decode($string, ENT_NOQUOTES, 'utf-8');

@@ -102,11 +106,11 @@ class SearchCore
 		$string = preg_replace('/['.PREG_CLASS_SEARCH_EXCLUDE.']+/u', ' ', $string);

 		if ($indexation)
-			$string = preg_replace('/[._-]+/', '', $string);
+			$string = preg_replace('/[._-]+/', ' ', $string);
 		else
 		{
 			$string = preg_replace('/[._]+/', '', $string);
-			$string = ltrim(preg_replace('/([^ ])-/', '$1', ' '.$string));
+			$string = ltrim(preg_replace('/([^ ])-/', '$1 ', ' '.$string));
 			$string = preg_replace('/[._]+/', '', $string);
 			$string = preg_replace('/[^\s]-+/', '', $string);
 		}
@@ -136,7 +140,24 @@ class SearchCore
 			$string = implode(' ', $processed_words);
 		}

-		if ($indexation)
+		// If the language is constituted with symbol and there is no "words", then split every chars
+		if (in_array($iso_code, array('zh', 'tw', 'ja')) && function_exists('mb_strlen'))
+		{
+			// Cut symbols from letters
+			$symbols = '';
+			$letters = '';
+			foreach (explode(' ', $string) as $mb_word)
+				if (strlen(Tools::replaceAccentedChars($mb_word)) == mb_strlen(Tools::replaceAccentedChars($mb_word)))
+					$letters .= $mb_word.' ';
+				else
+					$symbols .= $mb_word.' ';
+		
+			if (preg_match_all('/./u', $symbols, $matches))
+				$symbols = implode(' ', $matches[0]);
+
+			$string = $letters.$symbols;
+		}
+		elseif ($indexation)
 		{
 			$minWordLen = (int)Configuration::get('PS_SEARCH_MINWORDLEN');
 			if ($minWordLen > 1)
@@ -175,7 +196,7 @@ class SearchCore

 		$intersect_array = array();
 		$score_array = array();
-		$words = explode(' ', Search::sanitize($expr, $id_lang));
+		$words = explode(' ', Search::sanitize($expr, $id_lang, false, $context->language->iso_code));

 		foreach ($words as $key => $word)
 			if (!empty($word) && strlen($word) >= (int)Configuration::get('PS_SEARCH_MINWORDLEN'))
@@ -383,7 +404,7 @@ class SearchCore

 		return Db::getInstance()->executeS('
 			SELECT p.id_product, pl.id_lang, pl.id_shop, pl.name pname, p.reference, p.ean13, p.upc,
-				pl.description_short, pl.description, cl.name cname, m.name mname
+				pl.description_short, pl.description, cl.name cname, m.name mname, l.iso_code
 			FROM '._DB_PREFIX_.'product p
 			LEFT JOIN '._DB_PREFIX_.'product_lang pl
 				ON p.id_product = pl.id_product
@@ -392,6 +413,8 @@ class SearchCore
 				ON (cl.id_category = product_shop.id_category_default AND pl.id_lang = cl.id_lang AND cl.id_shop = product_shop.id_shop)
 			LEFT JOIN '._DB_PREFIX_.'manufacturer m
 				ON m.id_manufacturer = p.id_manufacturer
+			LEFT JOIN '._DB_PREFIX_.'lang l
+				ON l.id_lang = pl.id_lang
 			WHERE product_shop.indexed = 0
 			AND product_shop.visibility IN ("both", "search")
 			'.($id_product ? 'AND p.id_product = '.(int)$id_product : '').'
@@ -410,7 +433,7 @@ class SearchCore
 		{
 			$db->execute('TRUNCATE '._DB_PREFIX_.'search_index');
 			$db->execute('TRUNCATE '._DB_PREFIX_.'search_word');
-			ObjectModel::updateMultishopTable('Product', array('indexed' => 0), '1');
+			ObjectModel::updateMultishopTable('Product', array('indexed' => 0));
 		}
 		else
 		{
@@ -452,7 +475,6 @@ class SearchCore
 		// Those are kind of global variables required to save the processed data in the database every X occurrences, in order to avoid overloading MySQL
 		$count_words = 0;
 		$query_array3 = array();
-		$products_array = array();

 		// Every indexed words are cached into a PHP array
 		$word_ids = $db->executeS('
@@ -472,6 +494,7 @@ class SearchCore
 		// Products are processed 50 by 50 in order to avoid overloading MySQL
 		while (($products = Search::getProductsToIndex($total_languages, $id_product, 50)) && (count($products) > 0))
 		{
+			$products_array = array();
 			// Now each non-indexed product is processed one by one, langage by langage
 			foreach ($products as $product)
 			{
@@ -482,9 +505,9 @@ class SearchCore
 				// Data must be cleaned of html, bad characters, spaces and anything, then if the resulting words are long enough, they're added to the array
 				$product_array = array();
 				foreach ($product as $key => $value)
-					if (strncmp($key, 'id_', 3))
+					if (strncmp($key, 'id_', 3) && isset($weight_array[$key]))
 					{
-						$words = explode(' ', Search::sanitize($value, (int)$product['id_lang'], true));
+						$words = explode(' ', Search::sanitize($value, (int)$product['id_lang'], true, $product['iso_code']));
 						foreach ($words as $word)
 							if (!empty($word))
 							{
@@ -571,6 +594,14 @@ class SearchCore
 		return true;
 	}

+	public static function removeProductsSearchIndex($products)
+	{
+		if (count($products)) {
+			Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'search_index WHERE id_product IN ('.implode(',', $products).')');
+			ObjectModel::updateMultishopTable('Product', array('indexed' => 0), 'a.id_product IN ('.implode(',', $products).')');
+		}
+	}
+
 	protected static function setProductsAsIndexed(&$products)
 	{
 		if (count($products))
@@ -668,4 +699,4 @@ class SearchCore

 		return Product::getProductsProperties((int)$id_lang, $result);
 	}
-}
+}
@@ -135,7 +135,7 @@ class SpecificPriceCore extends ObjectModel
 			SELECT *
 			FROM `'._DB_PREFIX_.'specific_price`
 			WHERE `id_product` = '.(int)$id_product.
-			($id_product_attribute ? 'AND id_product_attribute = '.(int)$id_product_attribute : '').'
+			($id_product_attribute ? ' AND id_product_attribute = '.(int)$id_product_attribute : '').'
 			AND id_cart = '.(int)$id_cart);
 	}

@@ -72,7 +72,7 @@ class SupplierCore extends ObjectModel
 			'date_upd' => 			array('type' => self::TYPE_DATE, 'validate' => 'isDate'),

 			// Lang fields
-			'description' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName'),
+			'description' => 		array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml'),
 			'meta_title' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 128),
 			'meta_description' => 	array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 255),
 			'meta_keywords' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 255),
@@ -140,6 +140,7 @@ class SupplierCore extends ObjectModel
 					WHERE ps.`id_supplier` = '.(int)$supplier['id_supplier'].'
 					AND ps.id_product_attribute = 0'.
 					($active ? ' AND product_shop.`active` = 1' : '').
+					' AND product_shop.`visibility` NOT IN ("none")'.
 					($all_groups ? '' :'
 					AND ps.`id_product` IN (
 						SELECT cp.`id_product`
--- a/Show More
+++ b/Show More