[-] BO : fixed bug loading wrong root category in AdminCategoriesController

Fix wrong root category being loaded. There's an issue if you activate multishop and create a new root category which loads the wrong category and causes, at least, 'Add new Category' and 'Export' in AdminCategories to redirect back to the category list (e.g. impossible to add/remove categories).
//tab module list fix
2013-12-11 01:38:05 +00:00 · 2013-12-10 09:43:15 +01:00 · 2013-12-08 08:50:09 -08:00 · 2013-12-06 21:18:52 +02:00 · 2013-12-05 18:13:45 +01:00 · 2013-11-29 17:00:50 +01:00
702 changed files with 17842 additions and 22756 deletions
@@ -1,7 +1,7 @@
 Contributing
 ------------

-PrestaShop is an open-source e-commerce solution - To contribute to our project, you can make pull requests on the development branch.  
+PrestaShop is an open-source e-commerce solution - To contribute to our project, you can make pull requests on the bootstrap branch.  
 If you need some help to make a [pull-request][1]  
 All contributions must respect [the coding norm][2] and [the commit norm][3] in your pull-request.  
 All core files you commit in your pull request must have Open Software License (OSL 3.0)  
@@ -1,80 +1,186 @@
-	- (d)oekia
+	- adonis karavokyros
+	- aFolletete
+	- Agence CINS
+	- aKorczak
+	- Aleksander Palyan
 	- Alexander Otchenashev
+	- anat
+	- Andrew
+	- aNiassy
+	- antoniofr
+	- AntonLejon
+	- Arnaud Lemercier
+	- Axome
 	- Benjamin PONGY
+	- BigZ
+	- bLeveque
+	- bMancone
+	- bumbu
 	- Burhan
 	- Caleydon Media
+	- cam.lafit
+	- Captain FLAM
+	- Captain-FLAM
+	- ccauw
+	- cedricfontaine
+	- Cédric Mouleyre
+	- Chris
+	- ChristopheBoucaut
+	- CINS
+	- cippest
+	- cmouleyre
+	- Corentin Delcourt
+	- Cosmin Hutanu
 	- Damien Metzger
 	- DamienMetzger
 	- Damon Skelhorn
 	- Daniel
+	- Daniele Giachino
 	- 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
+	- Davy Rolink
+	- Dinis Lage
 	- djfm
+	- dlage
+	- dMetzger
+	- (d)oekia
+	- Dragan Skrbic
+	- dreammeup
+	- DrySs
+	- DrÿSs
+	- DrÿSs'
+	- dSevere
+	- Edouard Gaulué
+	- emily-d
+	- Eric Le Lay
+	- Fabio Chelly
 	- fBrignoli
-	- fSerny
+	- fchellypresta
 	- fram
+	- Francois Gaillard
+	- François Gaillard
+	- Fran�ois Gaillard
+	- fSerny
+	- Gabriel Schwardy
+	- Gaelle ITZKOVITZ
 	- gBrunier
 	- gCharmes
 	- gPoulain
+	- gr4devel
+	- Grégoire Bélorgey
+	- Gregory Roussac
 	- gRoussac
+	- Guillaume DELOINCE
+	- ha99y
 	- hAitmansour
+	- Ha!*!*y
+	- indesign47
+	- inem0o
 	- ivancasasempere
+	- Jáchym Toušek
+	- Javsmile
 	- jBreux
-	- jObregon
+	- jeckyl
+	- jeromenadaud
+	- Jerome Nadaud
+	- Jérôme Nadaud
 	- jessylenne
 	- jmCollin
+	- jObregon
+	- Jonathan Danse
+	- joseantgv
+	- Julien
+	- Kevin Granger
+	- kiropowered
 	- kpodemski
+	- Krystian Podemski
 	- lBrieu
 	- lCherifi
+	- ldecoker
 	- lLefevre
+	- LOIC ROSSET ltd
+	- Madef
+	- Mainmich
+	- makk1ntosh
+	- marcinsz101
+	- Marco Cervellin
+	- matiasiglesias
+	- Mats Rynge
+	- MatthieuB
+	- Maxence
 	- mBertholino
 	- mDeflotte
+	- Michel Courtade
+	- Mickael Desgranges
+	- Mikael Blotin
+	- Milow
+	- minic studio
+	- misthero
 	- mMarinetti
-	- marcinsz101
 	- montes
-	- nPellicari
+	- MustangZhong
 	- nezenmoins
+	- Nicolas Sorosac
+	- Nils-Helge Garli Hegvik
+	- Nino Uzelac
+	- nPellicari
+	- nturato
 	- oleacorner
+	- Otto Nascarella
+	- Patanock
+	- PhpMadman
+	- Pierre
+	- Piotr Kaczor
+	- Piotr Moćko
+	- PrestaEdit
+	- PrestaLab
+	- PrestanceDesign
+	- prestarocket
+	- Prestaspirit
+	- pxls
+	- Raphaël Malié
+	- raulgundin
+	- Rémi Gaillard
 	- rGaillard
+	- Rimas Kudelis
 	- rMalie
 	- rMontagne
+	- romainberger
 	- root
+	- runningz
+	- sagaradonis
+	- Samy Rabih
+	- Sarah Lorenzini
+	- Seb
+	- Sébastien
+	- Sébastien Bocahu
+	- Seynaeve
+	- Shagshag
+	- sjousse
 	- sLorenzini
+	- smartdatasoft
+	- soufyan
+	- soware
+	- Staging
 	- sThiebaut
+	- Sylvain Gougouzian
+	- Sylvain WITMEYER
 	- tDidierjean
+	- thoma202
+	- Tomasz Slominski
+	- Tom Panier
+	- tucoinfo
+	- unknown
 	- vAugagneur
 	- vChabot
+	- Vincent Augagneur
+	- Vincent Schoener
+	- Vincent Terenti
+	- vinvin27
 	- vKham
 	- vSchoener
+	- Xavier
+	- Xavier POITAU
+	- Yoozio
+	- zimmi1
+	- Zollner Robert

@@ -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>';
-}
@@ -22,26 +22,18 @@
 								
 	$upload->setInvalidFileExt(explode(",", CONFIG_UPLOAD_INVALID_EXTS));
 	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_UPLOAD)
-	{
 		$error = SYS_DISABLED;
-	}
 	elseif(empty($_GET['folder']) || !isUnderRoot($_GET['folder']))
-	{
 		$error = ERR_FOLDER_PATH_NOT_ALLOWED;
-	}else	if(!$upload->isFileUploaded('file'))
-	{
+	elseif (!$upload->isFileUploaded('file'))
 		$error = ERR_FILE_NOT_UPLOADED;
-	}else if(!$upload->moveUploadedFile($_GET['folder']))
-	{
-		$error = ERR_FILE_MOVE_FAILED;
-	}	
-	elseif(!$upload->isPermittedFileExt(explode(",", CONFIG_UPLOAD_VALID_EXTS)))
-	{		
+	elseif (!$upload->isPermittedFileExt(explode(",", CONFIG_UPLOAD_VALID_EXTS)))
 		$error = ERR_FILE_TYPE_NOT_ALLOWED;
-	}elseif(defined('CONFIG_UPLOAD_MAXSIZE') && CONFIG_UPLOAD_MAXSIZE && $upload->isSizeTooBig(CONFIG_UPLOAD_MAXSIZE))
-	{		
+	elseif (defined('CONFIG_UPLOAD_MAXSIZE') && CONFIG_UPLOAD_MAXSIZE && $upload->isSizeTooBig(CONFIG_UPLOAD_MAXSIZE))	
 		 $error = sprintf(ERROR_FILE_TOO_BID, transformFileSize(CONFIG_UPLOAD_MAXSIZE));
-	}else
+	elseif (!$upload->moveUploadedFile($_GET['folder']))
+		$error = ERR_FILE_MOVE_FAILED;
+	else
 	{
 							include_once(CLASS_FILE);
 							$path = $upload->getFilePath();
@@ -24,7 +24,8 @@
 		if(!empty($_GET['search']))
 		{
 			include_once(CLASS_SEARCH);
-			
+			if (!preg_match('/^'.Tools::pRegexp(realpath(dirname(__FILE__).'/'.$_GET['search_folder']), '/').'/i', _PS_ROOT_DIR_.'/img/cms'))
+				exit;
 			$search  = new Search($_GET['search_folder']);
 			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
 			$search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']);
@@ -78,9 +78,9 @@
 	define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html,xml,js,css'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid
 	
 	define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste
-	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png');// // 
+	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png');// // 
 	//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,bmp,tif,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf,ppt,rtf,doc,pdf,xls,txt,xml,xsl,dtd');//
-	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,jpg,png');
+	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,jpg,jpeg,jpeg,png');
 	//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // 
 	define('CONFIG_UPLOAD_INVALID_EXTS', '');

@@ -10,6 +10,9 @@
 	
 	//FILESYSTEM CONFIG	<br>
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "class.auth.php");	
+	if (_PS_MODE_DEMO_)
+		die('This functionality has been disabled.');
+
 	define('CONFIG_QUERY_STRING_ENABLE', true); //Enable passed query string to setting the system configuration
 	if(!isset($_SESSION))
 	{
@@ -73,9 +73,9 @@
 	define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html,xml,js,css'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid
 	
 	define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste
-	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // 
+	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png,txt'); // 
 	//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,bmp,tif,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf,ppt,rtf,doc,pdf,xls,txt,xml,xsl,dtd');//
-	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,png,tif,html,htm,js,css,xml,xsl,dtd,mp3,wav,wmv,wma,rm,rmvb,mov,swf');
+	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,jpeg,png,tif,html,htm,js,css,xml,xsl,dtd,mp3,wav,wmv,wma,rm,rmvb,mov,swf');
 	//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // 
 	define('CONFIG_UPLOAD_INVALID_EXTS', '');

@@ -27,6 +27,9 @@
 $timer_start = microtime(true);
 define('_PS_ADMIN_DIR_', getcwd());

+if (!defined('PS_ADMIN_DIR'))
+	define('PS_ADMIN_DIR', _PS_ADMIN_DIR_);
+
 require(_PS_ADMIN_DIR_.'/../config/config.inc.php');
 require(_PS_ADMIN_DIR_.'/functions.php');

@@ -49,9 +49,12 @@ try
 	AdminTab::$currentIndex = $currentIndex;

 	$iso = $context->language->iso_code;
-	include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
-	include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
-	include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
+	if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php'))
+		include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
+	if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php'))
+		include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
+	if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php'))
+		include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');

 	/* Server Params */
 	$protocol_link = (Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
@@ -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;
@@ -673,4 +674,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;}
@@ -34,7 +34,7 @@
 .toolbarBox .process-icon-new-module { background-image: url('../img/process-icon-new-module.png')}
 .toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png')}

-div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1}
+div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:11}


 /*FILTER MODULE*/
@@ -32,7 +32,7 @@
 	{if $input.name == 'zones'}
 		<div class="ranges_not_follow warn" style="display:none">
 			<label>{l s="Ranges are not correctly ordered:"}</label>
-			<a href="#" class="button" style="text-decoration:none">{l s="Reordering"}</a>
+			<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'}
 		<!--
@@ -21,7 +21,7 @@
 				</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 {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>
@@ -40,7 +40,7 @@
 					</td>
 					{foreach from=$ranges key=r item=range}
 						<td class="center">
-							<input name="fees[{$zone.id_zone|intval}][{$range.id_range|intval}]" type="text" 
+							<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}
@@ -53,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>
@@ -41,6 +41,7 @@
 	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}">
@@ -25,14 +25,12 @@

 <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 the displayed delivery time is: @s2.' 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='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_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>
@@ -47,18 +45,18 @@
 		<div id="summary_range"></div>
 		<div class="clear">&nbsp;</div>
 		<div>
-			{l s='It will be displayed only for the following zones:'}
+			{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='It will be displayed only for the following groups:'}
+			{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='It will be displayed only for the following shops:'}
+			{l s='Finally, this carrier will be proposed in those shops:'}
 			<ul id="summary_shops"></ul>
 		</div>
 		{/if}
@@ -50,7 +50,7 @@
 		<h2><img src="../img/admin/cart.gif" /> {l s='Order information'}</h2>
 		<span>
 		{if $order->id}
-			<a href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&id_order={$order->id}&vieworder"> {l s='Order #%d' sprintf=$order->id|string_format:"%06d"}</a></span>
+			<a href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&id_order={$order->id}&vieworder"> {l s='Order #%s' sprintf=$order->reference}</a></span>
 			<br /><br />
 			{l s='Made on:'} {dateFormat date=$order->date_add}<br /><br /><br /><br />
 		{else}
@@ -187,4 +187,4 @@
 	<div class="clear" style="height:20px;">&nbsp;</div>
 {/block}

-</div>
+</div>
@@ -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}
@@ -57,14 +57,14 @@
 			
 			<dl>			
 				<dt>{l s='Sent on:'}</dt>
-				<dd>{$message.date_add}</dd> 
+				<dd>{$message.date_add}&nbsp;</dd> 
 			
 			</dl>

 			{if empty($message.id_employee)}
 			<dl>
 				<dt>{l s='Browser:'}</dt>
-				<dd>{$message.user_agent}</dd>
+				<dd>{$message.user_agent}&nbsp;</dd>
 			</dl>
 			{/if}

@@ -79,34 +79,35 @@
 			</dl>
 			{/if}

-			{if !empty($message.id_order) && empty($message.id_employee)}
+			{if !empty($message.id_order) && $is_valid_order_id && empty($message.id_employee)}
 				<dl>
 					<dt>{l s='Order #'}</dt> 
-					<dd><a href="index.php?tab=AdminOrders&id_order={$message.id_order}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}">
-					{$message.id_order} <img src="../img/admin/search.gif" alt="{l s='View'}" />
-				</a></dd>
+					<dd><a href="index.php?tab=AdminOrders&id_order={$message.id_order}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}">{$message.id_order} <img src="../img/admin/search.gif" alt="{l s='View'}" /></a>
+					</dd>
 				</dl>
 			{/if}

 			{if !empty($message.id_product) && empty($message.id_employee)}
 				<dl>
 					<dt>{l s='Product #'}</dt> 
-					<dd><a href="index.php?tab=AdminProducts&id_product={$message.id_product}&updateproduct&token={getAdminToken tab='AdminProducts'}" title="{l s='View order'}">
-					{$message.id_product} <img src="../img/admin/search.gif" alt="{l s='View'}" />
-				</a></dd>
+					<dd><a href="index.php?tab=AdminProducts&id_product={$message.id_product}&updateproduct&token={getAdminToken tab='AdminProducts'}" title="{l s='View order'}">{$message.id_product} <img src="../img/admin/search.gif" alt="{l s='View'}" /></a></dd>
 				</dl>
 			{/if}
 			
 				<form action="{$current}&token={$token}&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread" method="post">
-				<b>{l s='Subject:'}</b>
 				<input type="hidden" name="id_customer_message" value="{$message.id_customer_message}" />
-				<select name="id_contact" onchange="this.form.submit();">
-					{foreach $contacts as $contact}
-						<option value="{$contact.id_contact}" {if $contact.id_contact == $message.id_contact}selected="selected"{/if}>
-							{$contact.name}
-						</option>
-					{/foreach}
-				</select>
+				<dl>
+					<dt>{l s='Subject:'}</dt>
+					<dd>
+						<select name="id_contact" onchange="this.form.submit();">
+							{foreach $contacts as $contact}
+								<option value="{$contact.id_contact}" {if $contact.id_contact == $message.id_contact}selected="selected"{/if}>
+									{$contact.name}
+								</option>
+							{/foreach}
+						</select>
+					</dd>
+				</dl>
 			</form>


@@ -35,7 +35,7 @@
 			$.ajax({
 				type: "POST",
 				url: "index.php",
-				data: "token={getAdminToken tab='AdminCustomers'}&tab=AdminCustomers&ajax=1&action=updateCustomerNote&id_customer={$customer->id}&note="+noteContent,
+				data: "token={getAdminToken tab='AdminCustomers'}&tab=AdminCustomers&ajax=1&action=updateCustomerNote&id_customer={$customer->id}&note="+encodeURIComponent(noteContent),
 				async : true,
 				success: function(r) {
 					$('#note_feedback').html('').hide();
@@ -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();
 				}
 			});
@@ -138,7 +138,7 @@
 					}
 					else
 					{
-						$('#group_discount_category_table').append('<tr class="alt_row" id="'+jsonData.id_category+'"><td>'+jsonData.catPath+'</td><td>{l s='Discount:'}'+jsonData.discount+'{l s='%'}</td><td><a href="#" onclick="deleteCategoryReduction('+jsonData.id_category+');"><img src="../img/admin/delete.gif"></a></td></tr>');
+						$('#group_discount_category_table').append('<tr class="alt_row" id="'+jsonData.id_category+'"><td>'+jsonData.catPath+'</td><td>{l s='Discount:'}' + ' ' + jsonData.discount+'{l s='%'}</td><td><a href="#" onclick="deleteCategoryReduction('+jsonData.id_category+');"><img src="../img/admin/delete.gif"></a></td></tr>');
 						
 						var input_hidden = document.createElement("input");
 						input_hidden.setAttribute('type', 'hidden');
@@ -168,7 +168,7 @@
 				{foreach $input['values'] key=key item=category }
 					<tr class="alt_row" id="{$category.id_category}">
 						<td>{$category.path}</td>
-						<td>{l s='Discount: %d%%' sprintf=$category.reduction}</td>
+						<td>{l s='Discount: %.2f%%' sprintf=$category.reduction}</td>
 						<td>
 							<a href="#" onclick="deleteCategoryReduction({$category.id_category});"><img src="../img/admin/delete.gif"></a>
 							<input type="hidden" class="category_reduction" name="category_reduction[{$category.id_category}]" value="{$category.reduction}">
@@ -30,7 +30,7 @@
 	<fieldset>
 		<ul>
 			<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Name:'}</span> {$group->name[$language->id]}</li>
-		<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Discount: %d%%' sprintf=$group->reduction}</span></li>
+		<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Discount: %.2f%%' sprintf=$group->reduction}</span></li>
 		<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Current category discount:'}</span>
 			{if !$categorieReductions}
 				{l s='None'}
@@ -39,7 +39,7 @@
 					{foreach $categorieReductions key=key item=category }
 						<tr class="alt_row">
 							<td>{$category.path}</td>
-							<td>{l s='Discount: %d%%' sprintf=$category.reduction}</td>
+							<td>{l s='Discount: %.2f%%' sprintf=$category.reduction}</td>
 						</tr>
 					{/foreach}
 				</table>
@@ -58,6 +58,7 @@
 		</ul>
 	</fieldset>
 	<h2>{l s='Members of this customer group'}</h2>
+	<p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p>
 	{$customerList}

-{/block}
+{/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.'}
+		{l s='Your .CSV file has been sucessfully imported into your shop. Don\'t forget to Re-build the products search index.'}
 	</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|escape:'htmlall':'UTF-8'}</option>
 						{/foreach}
 					</select>
 				{/if}
@@ -126,33 +67,44 @@
 				<a href="#upload_file_import" id="upload_file_import_link" class="button"><img src="../img/admin/add.gif" alt="Uplaod" title="Upload" />{l s='Upload'}</a>
 			</div>
 			<div style="width:50%; margin: 0 auto;">
-				<a href="#" onclick="$('#sample_files_import').slideToggle(); return false;">{l s='Click to view our sample import csv files.'}</a>
-				<ul id="sample_files_import" style="display:none">
-					<li><a href="../docs/csv_import/categories_import.csv">{l s='Sample Categories file'}</a></li>
-					<li><a href="../docs/csv_import/products_import.csv">{l s='Sample Products file'}</a></li>
-					<li><a href="../docs/csv_import/combinations_import.csv">{l s='Sample Combinations file'}</a></li>
-					<li><a href="../docs/csv_import/customers_import.csv">{l s='Sample Customers file'}</a></li>
-					<li><a href="../docs/csv_import/addresses_import.csv">{l s='Sample Addresses file'}</a></li>
-					<li><a href="../docs/csv_import/manufacturers_import.csv">{l s='Sample Manufacturers file'}</a></li>
-					<li><a href="../docs/csv_import/suppliers_import.csv">{l s='Sample Suppliers file'}</a></li>
-					{if $PS_ADVANCED_STOCK_MANAGEMENT}
-						<li><a href="../docs/csv_import/supply_orders_import.csv">{l s='Supply Orders sample file'}</a></li>
-						<li><a href="../docs/csv_import/supply_orders_details_import.csv">{l s='Supply Orders Details sample file'}</a></li>
-					{/if}
-				</ul>
+				<div style="width:50%; display: inline-block; float :left;">
+					<a href="#" onclick="$('#sample_files_import').slideToggle(); return false;">{l s='Click to view our sample import csv files.'}</a>
+					<ul id="sample_files_import" style="display:none;">
+						<li><a class="_blank" href="../docs/csv_import/categories_import.csv">{l s='Sample Categories file'}</a></li>
+						<li><a class="_blank" href="../docs/csv_import/products_import.csv">{l s='Sample Products file'}</a></li>
+						<li><a class="_blank" href="../docs/csv_import/combinations_import.csv">{l s='Sample Combinations file'}</a></li>
+						<li><a class="_blank" href="../docs/csv_import/customers_import.csv">{l s='Sample Customers file'}</a></li>
+						<li><a class="_blank" href="../docs/csv_import/addresses_import.csv">{l s='Sample Addresses file'}</a></li>
+						<li><a class="_blank" href="../docs/csv_import/manufacturers_import.csv">{l s='Sample Manufacturers file'}</a></li>
+						<li><a class="_blank" href="../docs/csv_import/suppliers_import.csv">{l s='Sample Suppliers file'}</a></li>
+						<li><a class="_blank" href="../docs/csv_import/alias_import.csv">{l s='Sample Alias file'}</a></li>
+						{if $PS_ADVANCED_STOCK_MANAGEMENT}
+							<li><a class="_blank" href="../docs/csv_import/supply_orders_import.csv">{l s='Supply Orders sample file'}</a></li>
+							<li><a class="_blank" href="../docs/csv_import/supply_orders_details_import.csv">{l s='Supply Orders Details sample file'}</a></li>
+						{/if}
+					</ul>
+				</div>
+				<div style="width:50%; float:left;">
+					<a href="#" onclick="$('#csv_files_import').slideToggle(); return false;">{l s='Click to view your csv files.'}</a>
+					<ul id="csv_files_import" style="display:none;">
+							{foreach $files_to_import AS $filename}
+								<li><a href="{$current}&token={$token}&csvfilename={$filename|@base64_encode}">{$filename}</a>&nbsp;&nbsp;
+<a href="{$current}&token={$token}&csvfilename={$filename|@base64_encode}&delete=1"><img src="../img/admin/delete.gif" /></a></li>
+							{/foreach}
+					</ul>
+				</div>
 				<div class="clear">&nbsp;</div>
 			</div>
 			<label class="clear">{l s='What kind of entity would you like to import?'} </label>
 			<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">
@@ -168,26 +120,30 @@
 			</div>
 			<label class="clear">{l s='Field separator'} </label>
 			<div class="margin-form">
-				<input type="text" size="2" value=";" name="separator"/>
+				<input type="text" size="2" value="{if isset($separator_selected)}{$separator_selected|escape:'htmlall':'UTF-8'}{else};{/if}" name="separator"/>
 				{l s='e.g. '}"1<span class="bold" style="color: red">;</span>Ipod<span class="bold" style="color: red">;</span>129.90<span class="bold" style="color: red">;</span>5"
 			</div>
 			<label class="clear">{l s='Multiple value separator'} </label>
 			<div class="margin-form">
-				<input type="text" size="2" value="," name="multiple_value_separator"/>
+				<input type="text" size="2" value="{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected|escape:'htmlall':'UTF-8'}{else},{/if}" name="multiple_value_separator"/>
 				{l s='e.g. '}"Ipod;red.jpg<span class="bold" style="color: red">,</span>blue.jpg<span class="bold" style="color: red">,</span>green.jpg;129.90"
 			</div>
 			<label for="truncate" class="clear">{l s='Delete all'} <span id="entitie">{l s='categories'}</span> {l s='before import?'} </label>
 			<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 +166,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 +177,93 @@
 	<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() == 8 || $("#entity > option:selected").val() == 9)
+				$("label[for=truncate],#truncate").hide();
+			else
+				$("label[for=truncate],#truncate").show();
+	
+			if ($("#entity > option:selected").val() == 9)
+				$(".import_supply_orders_details").show();
+			else
+			{
+				$(".import_supply_orders_details").hide();
+				$('input[name=multiple_value_separator]').val('{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected}{else},{/if}');
+			}
+			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() == 5 || $("#entity > option:selected").val() == 6)
+				$("label[for=regenerate], #regenerate").show()
+			else
+				$("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 || $("#entity > option:selected").val() == 7)
+				$("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>
@@ -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="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}
-
@@ -23,10 +23,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}

-<div class="width4">
-	{$localization_form}
-</div>
+{if isset($localization_form)}{$localization_form}{/if}
 <br />
-<div class="width4">
-	{$localization_options}
-</div>
+{if isset($localization_options)}{$localization_options}{/if}
@@ -59,14 +59,14 @@
 						<td>{$module->categoryName}</td>
 						<td>
 						<select name="i_{$module->name}" class="moduleFavorite" style="width:50px">
-							<option value="" selected="selected">---</option>
+							<option value="" selected="selected">-</option>
 							<option value="1" {if isset($module->preferences.interest) && $module->preferences.interest eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
 							<option value="0" {if isset($module->preferences.interest) && $module->preferences.interest eq '0'}selected="selected"{/if}>{l s='No'}</option>
 						</select>
 						</td>
 						<td>
 						<select name="f_{$module->name}" class="moduleFavorite" style="width:50px">
-							<option value="" selected="selected">---</option>
+							<option value="" selected="selected">-</option>
 							<option value="1" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
 							<option value="0" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '0'}selected="selected"{/if}>{l s='No'}</option>
 						</select>
@@ -22,7 +22,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-
+<script type="text/javascript" src="../js/jquery/plugins/jquery.uitablefilter.js"></script>
 {if $add_permission eq '1'}
 	{if isset($logged_on_addons)}
 			<!--start addons login-->
@@ -62,10 +62,7 @@
 <!--start filter module-->
 <style>.ac_results { border:1px solid #C2C4D9; }</style>
 <div class="filter-module">
-	<form id="filternameForm" method="post">
-		<input type="text" value="" name="filtername" autocomplete="off" class="ac_input">
-		<input type="submit" class="button" value="{l s='Search'}">
-	</form>
+	<input style="float: left; margin-right: 15px" placeholder="{l s='Search'}" type="text" value="" name="quicksearch" autocomplete="off" onkeyup="$.uiTableFilter($('#moduleContainer').find('table'), this.value);">
 	<form method="post">
 		<div class="select-filter">
 			<label class="search-filter">{l s='Sort by'}:</label>
@@ -87,7 +87,7 @@
 		});

 		// Method to check / uncheck all modules checkbox
-		$('#checkme').click(function()
+		$('#moduleContainer').on("click", "#checkme", function()
 		{
 			if ($(this).attr("rel") == 'false')
 			{
@@ -321,8 +321,8 @@
 			catch(e){}
 			return false;
 		});
-		
-		$('.toggle_favorite').live('click', function(event)
+
+		$('#moduleContainer').on("click", ".toggle_favorite", function()
 	    {
 	      var el = $(this);
 	      var value_pref = el.data('value');
@@ -46,8 +46,8 @@
 				</td>
 				<td><img class="imgm" alt="" src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}"></td>
 				<td>
-					<div class="moduleDesc" id="anchor{$module->name|ucfirst}">
-						<h3>{$module->displayName}
+					<div class="moduleDesc" id="anchor{$module->name|ucfirst}" title="{$module->name}">
+						<h3>{$module->displayName}<span style="display:none">{$module->name}</span>
 							{if isset($module->type) && $module->type == 'addonsMustHave'}
 								<span class="setup must-have">{l s='Must Have'}</span>
 							{else}
@@ -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) && (!isset($module->type) || ($module->type != 'addonsMustHave' || $module->type !== 'addonsNative'))}<div class="conf">{$module->message}</div>{/if}
+						{if isset($module->message) && (empty($module->name) === false) && (!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}
@@ -101,7 +101,7 @@
 								<a href="{$module->addons_buy_url}" target="_blank" class="button updated"><span><img src="../img/admin/cart_addons.png">&nbsp;&nbsp;{if isset($module->id_currency) && isset($module->price)}{displayPrice price=$module->price currency=$module->id_currency}{/if}</span></a>
 							</li>
 						{else}
-							{if $module->id && isset($module->version_addons) && $module->version_addons}
+							{if isset($module->version_addons) && $module->version_addons}
 								<li><a href="{$module->options.update_url}" class="button updated"><span>{l s='Update it!'}</span></a></li>
 							{/if}
 								<li>
@@ -34,6 +34,7 @@
 				<td valign="top">
 					<div class="moduleDesc" id="anchor{$module->name|ucfirst}">
 						<h3>
+							<span style="display:none">{$module->name}</span> 
 							{$module->displayName|truncate:36:'…'} {$module->version}
 							{if isset($module->id) && $module->id gt 0 }
 								{if $module->active}
@@ -37,7 +37,7 @@
 	{l s='Show'} :
 	<select id="show_modules" onChange="autoUrl('show_modules', '{$url_show_modules}')">
 		<option value="all">{l s='All modules'}&nbsp;</option>
-		<option>---------------</option>
+		<option>-</option>

 		{foreach $modules as $module}
 			<option value="{$module->id|intval}" {if $display_key == $module->id}selected="selected"{/if}>{$module->displayName}</option>
@@ -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">
@@ -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>
@@ -26,7 +26,7 @@
 {* Generate HTML code for printing Invoice Icon with link *}
 <span style="width:20px; margin-right:5px;">
 {if ($order_state->invoice || $order->invoice_number)}
-	<a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
+	<a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
 {else}
 	-
 {/if}
@@ -35,7 +35,7 @@
 {* Generate HTML code for printing Delivery Icon with link *}
 <span style="width:20px;">
 {if ($order_state->delivery || $order->delivery_number)}
-	<a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}"><img src="../img/admin/delivery.gif" alt="delivery" /></a>
+	<a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}"><img src="../img/admin/delivery.gif" alt="delivery" /></a>
 {else}
 	-
 {/if}
@@ -56,6 +56,7 @@
 		</span>
 		{/if}
 	</td>
+	{if $display_warehouse}<td align="center">{$product.warehouse_name|escape:'htmlall':'UTF-8'}</td>{/if}
 	{if ($order->hasBeenPaid())}
 		<td align="center" class="productQuantity">
 			{$product['product_quantity_refunded']}
@@ -38,6 +38,11 @@
 	var defaults_order_state = new Array();
 	var customization_errors = false;
 	var pic_dir = '{$pic_dir}';
+	var currency_format = 5;
+	var currency_sign = '';
+	var currency_blank = false;
+	var priceDisplayPrecision = 2;
+	
 	{foreach from=$defaults_order_state key='module' item='id_order_state'}
 		defaults_order_state['{$module}'] = '{$id_order_state}';
 	{/foreach}
@@ -117,7 +122,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: {
@@ -505,7 +510,6 @@
 				}
 				displaySummary(res);
 				resetBind();
-				updateCurrencySign();
 			}
 		});
 	}
@@ -652,11 +656,12 @@
 			var id_product = Number(this.id_product);
 			var id_product_attribute = Number(this.id_product_attribute);
 			cart_quantity[Number(this.id_product)+'_'+Number(this.id_product_attribute)+'_'+Number(this.id_customization)] = this.cart_quantity;
-			cart_content += '<tr><td><img src="'+this.image_link+'" title="'+this.name+'" /></td><td>'+this.name+'<br />'+this.attributes_small+'</td><td>'+this.reference+'</td><td><input type="text" size="7" rel="'+this.id_product+'_'+this.id_product_attribute+'" class="product_unit_price" value="'+this.price+'" />&nbsp;<span class="currency_sign"></span></td><td>';
+			cart_content += '<tr><td><img src="'+this.image_link+'" title="'+this.name+'" /></td><td>'+this.name+'<br />'+this.attributes_small+'</td><td>'+this.reference+'</td><td><input type="text" size="7" rel="'+this.id_product+'_'+this.id_product_attribute+'" class="product_unit_price" value="'+this.numeric_price+'" /></td><td>';
 			cart_content += (!this.id_customization ? '<div style="float:left;"><a href="#" class="increaseqty_product" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" ><img src="../img/admin/up.gif" /></a><br /><a href="#" class="decreaseqty_product" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'"><img src="../img/admin/down.gif" /></a></div>' : '');
 			cart_content += (!this.id_customization ? '<div style="float:left;"><input type="text" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" class="cart_quantity" size="2" value="'+this.cart_quantity+'" />' : '');
 			cart_content += (!this.id_customization ? '<a href="#" class="delete_product" rel="delete_'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" ><img src="../img/admin/delete.gif" /></a></div>' : '');
-			cart_content += '</td><td>'+this.total+'&nbsp;<span class="currency_sign"></span></td></tr>';
+			cart_content += '</td><td>' + formatCurrency(this.numeric_total, currency_format, currency_sign, currency_blank) + '</td></tr>';
+			
 			if (this.id_customization && this.id_customization != 0)
 			{
 				$.each(this.customized_datas[this.id_product][this.id_product_attribute][id_address_delivery], function() {
@@ -694,17 +699,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)
@@ -712,8 +715,23 @@
 		$('#payment_list').html(payment_list);
 	}

+	function fixPriceFormat(price)
+	{
+		if(price.indexOf(',') > 0 && price.indexOf('.') > 0) // if contains , and .
+			if(price.indexOf(',') < price.indexOf('.')) // if , is before .
+				price = price.replace(',','');  // remove ,
+		price = price.replace(' ',''); // remove any spaces
+		price = price.replace(',','.'); // remove , if price did not cotain both , and .
+		return price;
+	}
+
 	function displaySummary(jsonSummary)
 	{
+		currency_format = jsonSummary.currency.format;
+		currency_sign = jsonSummary.currency.sign;
+		currency_blank = jsonSummary.currency.blank;
+		priceDisplayPrecision = jsonSummary.currency.decimals ? 2 : 0;
+	
 		updateCartProducts(jsonSummary.summary.products, jsonSummary.summary.gift_products, jsonSummary.cart.id_address_delivery);
 		updateCartVouchers(jsonSummary.summary.discounts);
 		updateAddressesList(jsonSummary.addresses, jsonSummary.cart.id_address_delivery, jsonSummary.cart.id_address_invoice);
@@ -739,20 +757,19 @@
 			$('#free_shipping').removeAttr('checked');

 		$('#gift_message').html(jsonSummary.cart.gift_message);
-		if(!changed_shipping_price)
-			$('#shipping_price').html('<b>'+jsonSummary.summary.total_shipping+'</b>');
+		if (!changed_shipping_price)
+			$('#shipping_price').html('<b>' + formatCurrency(parseFloat(jsonSummary.summary.total_shipping), currency_format, currency_sign, currency_blank) + '</b>');
 		shipping_price_selected_carrier = jsonSummary.summary.total_shipping;

-		$('#total_vouchers').html(jsonSummary.summary.total_discounts_tax_exc);
-		$('#total_shipping').html(jsonSummary.summary.total_shipping_tax_exc);
-		$('#total_taxes').html(jsonSummary.summary.total_tax);
-		$('#total_without_taxes').html(jsonSummary.summary.total_price_without_tax);
-		$('#total_with_taxes').html(jsonSummary.summary.total_price);
-		$('#total_products').html(jsonSummary.summary.total_products);
+		$('#total_vouchers').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_discounts_tax_exc)), currency_format, currency_sign, currency_blank));
+		$('#total_shipping').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_shipping_tax_exc)), currency_format, currency_sign, currency_blank));
+		$('#total_taxes').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_tax)), currency_format, currency_sign, currency_blank));
+		$('#total_without_taxes').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_price_without_tax)), currency_format, currency_sign, currency_blank));
+		$('#total_with_taxes').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_price)), currency_format, currency_sign, currency_blank));
+		$('#total_products').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_products)), currency_format, currency_sign, currency_blank));
 		id_currency = jsonSummary.cart.id_currency;
 		$('#id_currency option').removeAttr('selected');
 		$('#id_currency option[value="'+id_currency+'"]').attr('selected', true);
-		updateCurrencySign();
 		id_lang = jsonSummary.cart.id_lang;
 		$('#id_lang option').removeAttr('selected');
 		$('#id_lang option[value="'+id_lang+'"]').attr('selected', true);
@@ -780,21 +797,21 @@
 				qty: qty,
 				id_customer: id_customer,
 				id_cart: id_cart,
-				},
+			},
 			success : function(res)
 			{
-					displaySummary(res);
-					var errors = '';
-					if(res.errors.length)
-					{
-						$.each(res.errors, function() {
-							errors += this+'<br />';
-						});
-						$('#products_err').show();
-					}
-					else
-						$('#products_err').hide();
-					$('#products_err').html(errors);
+				displaySummary(res);
+				var errors = '';
+				if (res.errors.length)
+				{
+					$.each(res.errors, function() {
+						errors += this + '<br />';
+					});
+					$('#products_err').show();
+				}
+				else
+					$('#products_err').hide();
+				$('#products_err').html(errors);
 			}
 		});
 	}
@@ -890,11 +907,6 @@
 		});
 	}

-	function updateCurrencySign()
-	{
-		$('.currency_sign').html(currencies[id_currency]);
-	}
-
 	function sendMailToCustomer()
 	{
 		$.ajax({
@@ -927,11 +939,33 @@
 		var addresses_invoice_options = '';
 		var address_invoice_detail = '';
 		var address_delivery_detail = '';
+		var delivery_address_edit_link = '';
+		var invoice_address_edit_link = '';
+
 		$.each(addresses, function() {
 			if (this.id_address == id_address_invoice)
-				address_invoice_detail = this.company+' '+this.firstname+' '+this.lastname+'<br />'+this.address1+'<br />'+this.address2+'<br />'+this.postcode+' '+this.city+' '+this.country;
+			{
+				address_invoice_detail = this.company+' '+this.firstname+' '+this.lastname+'<br />'+this.address1+'<br />'+this.address2+'<br />'+this.postcode+' '+this.city;
+
+				if (this.state != null)
+					address_invoice_detail += ' '+this.state;
+
+				address_invoice_detail += '</br>'+this.country;
+
+				invoice_address_edit_link = "{$link->getAdminLink('AdminAddresses')}&id_address="+this.id_address+"&updateaddress&realedit=1&liteDisplaying=1&submitFormAjax=1#";
+			}
+
 			if(this.id_address == id_address_delivery)
-				address_delivery_detail = this.company+' '+this.firstname+' '+this.lastname+'<br />'+this.address1+'<br />'+this.address2+'<br />'+this.postcode+' '+this.city+' '+this.country;
+			{
+				address_delivery_detail = this.company+' '+this.firstname+' '+this.lastname+'<br />'+this.address1+'<br />'+this.address2+'<br />'+this.postcode+' '+this.city;
+
+				if (this.state != null)
+					address_delivery_detail += ' '+this.state;
+
+				address_delivery_detail += '</br>'+this.country;
+
+				delivery_address_edit_link = "{$link->getAdminLink('AdminAddresses')}&id_address="+this.id_address+"&updateaddress&realedit=1&liteDisplaying=1&submitFormAjax=1#";
+			}

 			addresses_delivery_options += '<option value="'+this.id_address+'" '+(this.id_address == id_address_delivery ? 'selected="selected"' : '')+'>'+this.alias+'</option>';
 			addresses_invoice_options += '<option value="'+this.id_address+'" '+(this.id_address == id_address_invoice ? 'selected="selected"' : '')+'>'+this.alias+'</option>';
@@ -951,6 +985,8 @@
 		$('#id_address_invoice').html(addresses_invoice_options);
 		$('#address_delivery_detail').html(address_delivery_detail);
 		$('#address_invoice_detail').html(address_invoice_detail);
+		$('#edit_delivery_address').attr('href', delivery_address_edit_link);
+		$('#edit_invoice_address').attr('href', invoice_address_edit_link);
 	}

 	function updateAddresses()
@@ -986,7 +1022,7 @@
 	<label>{l s='Search customers'}</label>
 	<div class="margin-form">
 		<input type="text" id="customer" value="" />
-		<p>{l s='Search a customer by tapping the first letters of his/her name'}</p>
+		<p>{l s='Search a customer by typing the first letters of his/her name'}</p>
 		<a class="fancybox button" href="{$link->getAdminLink('AdminCustomers')|escape:'htmlall':'UTF-8'}&addcustomer&liteDisplaying=1&submitFormAjax=1#">
 			<img src="../img/admin/add.gif" title="new"/><span>{l s='Add new customer'}</span>
 		</a>
@@ -1001,7 +1037,7 @@
 		<div class="margin-form">
 			<input type="hidden" value="" id="id_cart" name="id_cart" />
 			<input type="text" id="product" value="" />
-			<p>{l s='Search a product by tapping the first letters of his/her name.'}</p>
+			<p>{l s='Search a product by typing the first letters of his/her name.'}</p>
 		</div>
 		<div id="products_found">
 			<div id="product_list">
@@ -1161,14 +1197,14 @@
 	<div id="address_delivery">
 		<h3>{l s='Delivery'}</h3>
 		<select id="id_address_delivery" name="id_address_delivery">
-		</select>
+		</select>&nbsp;<a class="fancybox" id="edit_delivery_address" href="#"><img src="../img/admin/edit.gif" /></a>
 		<div id="address_delivery_detail">
 		</div>
 	</div>
 	<div id="address_invoice">
 		<h3>{l s='Invoice'}</h3>
 		<select id="id_address_invoice" name="id_address_invoice">
-		</select>
+		</select>&nbsp;<a class="fancybox" id="edit_invoice_address" href="#"><img src="../img/admin/edit.gif" /></a>
 		<div id="address_invoice_detail">
 		</div>
 	</div>
@@ -1186,7 +1222,7 @@
 				</select>
 			</p>
 			<p>
-				<label for="shipping_price">{l s='Shipping price'}</label> <span id="shipping_price"  name="shipping_price"></span>&nbsp;<span class="currency_sign"></span>&nbsp;
+				<label for="shipping_price">{l s='Shipping price'}</label> <span id="shipping_price"  name="shipping_price"></span>
 			</p>
 			<p>
 				<label for="free_shipping">{l s='Free shipping'}</label>
@@ -1210,12 +1246,12 @@
 	<div id="send_email_feedback"></div>
 	<div id="cart_summary" style="clear:both;float:left;">
 		<ul>
-			<li><span class="total_cart">{l s='Total products'}</span><span id="total_products"></span><span class="currency_sign"></span></li>
-			<li><span class="total_cart">{l s='Total vouchers'}</span><span id="total_vouchers"></span><span class="currency_sign"></span></li>
-			<li><span class="total_cart">{l s='Total shipping'}</span><span id="total_shipping"></span><span class="currency_sign"></span></li>
-			<li><span class="total_cart">{l s='Total taxes'}</span><span id="total_taxes"></span><span class="currency_sign"></span></li>
-			<li><span class="total_cart">{l s='Total without taxes'}</span><span id="total_without_taxes"></span><span class="currency_sign"></span></li>
-			<li><span class="total_cart">{l s='Total with taxes'}</span><span id="total_with_taxes"></span><span class="currency_sign"></span></li>
+			<li><span class="total_cart">{l s='Total products'}</span><span id="total_products"></span></li>
+			<li><span class="total_cart">{l s='Total vouchers'}</span><span id="total_vouchers"></span></li>
+			<li><span class="total_cart">{l s='Total shipping'}</span><span id="total_shipping"></span></li>
+			<li><span class="total_cart">{l s='Total taxes'}</span><span id="total_taxes"></span></li>
+			<li><span class="total_cart">{l s='Total without taxes'}</span><span id="total_without_taxes"></span></li>
+			<li><span class="total_cart">{l s='Total with taxes'}</span><span id="total_with_taxes"></span></li>
 		</ul>
 	</div>
 	<div class="order_message_right">
@@ -65,7 +65,7 @@
 <div class="bloc-command">
 	<div class="button-command">
 			{if (count($invoices_collection))}
-				<a class="button" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}" target="_blank">
+				<a class="button" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}">
 					<img src="../img/admin/charged_ok.gif" alt="{l s='View invoice'}" /> {l s='View invoice'}
 				</a>
 			{else}
@@ -73,7 +73,7 @@
 			{/if}
 			 |
 			{if (($currentState && $currentState->delivery) || $order->delivery_number)}
-				<a class="button"  href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}" target="_blank">
+				<a class="button"  href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}">
 					<img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'}
 				</a>
 			{else}
@@ -124,10 +124,10 @@
 			<!-- History of status -->
 			<table cellspacing="0" cellpadding="0" class="table history-status" style="width: 100%;">
 				<colgroup>
-					<col width="1%">
-					<col width="">
-					<col width="20%">
-					<col width="20%">
+					<col width="1%"/>
+					<col width=""/>
+					<col width="20%"/>
+					<col width="20%"/>
 				</colgroup>
 			{foreach from=$history item=row key=key}
 				{if ($key == 0)}
@@ -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.'}
@@ -299,12 +299,12 @@
 				<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
 					<table class="table" width="100%" cellspacing="0" cellpadding="0">
 						<colgroup>
-							<col width="15%">
-							<col width="">
-							<col width="20%">
-							<col width="10%">
-							<col width="10%">
-							<col width="1%">
+							<col width="15%"/>
+							<col width=""/>
+							<col width="20%"/>
+							<col width="10%"/>
+							<col width="10%"/>
+							<col width="1%"/>
 						</colgroup>
 						<thead>
 							<tr>
@@ -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}
@@ -750,7 +751,7 @@
 			<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}"><b>{l s='Click here'}</b> {l s='to see all messages.'}</a><br>
 			<div id="message" style="display: {if Tools::getValue('message')}block{else}none{/if}">
 						<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
-							<option value="0" selected="selected">-- {l s='Choose a standard message'} --</option>
+							<option value="0" selected="selected">- {l s='Choose a standard message'} -</option>
 			{foreach from=$orderMessages item=orderMessage}
 				<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
 			{/foreach}
@@ -786,8 +787,6 @@
 		</fieldset>
 	{/if}
 	</div>
-
-
 	<div class="clear">&nbsp;</div>
 	<br /><br /><a href="{$current_index}&token={$smarty.get.token}"><img src="../img/admin/arrow2.gif" /> {l s='Back to list'}</a><br />
-{/block}
+{/block}
@@ -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}
@@ -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"}
@@ -103,11 +103,11 @@
 		<td class="col-left"><label>{l s='Manufacturer:'}</label></td>
 		<td style="padding-bottom:5px;">
 			<select name="id_manufacturer" id="id_manufacturer">
-				<option value="0">-- {l s='Choose (optional)'} --</option>
+				<option value="0">- {l s='Choose (optional)'} -</option>
 				{if $product->id_manufacturer}
 				<option value="{$product->id_manufacturer}" selected="selected">{$product->manufacturer_name}</option>
 				{/if}
-				<option disabled="disabled">----------</option>
+				<option disabled="disabled">-</option>
 			</select>&nbsp;&nbsp;&nbsp;
 			<a class="button bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'htmlall':'UTF-8'}&addmanufacturer">
 				<img src="../img/admin/add.gif" alt="{l s='Create new manufacturer'}" title="{l s='Create new manufacturer'}" />
@@ -85,7 +85,7 @@
 				</td>
 				<td style="padding-bottom:5px;">
 					<select name="attribute" id="attribute" style="width: 200px;">
-						<option value="0">---</option>
+						<option value="0">-</option>
 					</select>
 					<script type="text/javascript">
 					$(document).ready(function(){
@@ -252,7 +252,7 @@
 							<li style="float: left; width: {$imageWidth}px;">
 								<input type="checkbox" name="id_image_attr[]" value="{$image.id_image}" id="id_image_attr_{$image.id_image}" />
 								<label for="id_image_attr_{$image.id_image}" style="float: none;">
-									<img src="{$smarty.const._THEME_PROD_DIR_}{$image.obj->getExistingImgPath()}-small_default.jpg" alt="{$image.legend|escape:'htmlall':'UTF-8'}" title="{$image.legend|escape:'htmlall':'UTF-8'}" />
+									<img src="{$smarty.const._THEME_PROD_DIR_}{$image.obj->getExistingImgPath()}-{$imageType}.jpg" alt="{$image.legend|escape:'htmlall':'UTF-8'}" title="{$image.legend|escape:'htmlall':'UTF-8'}" />
 								</label>
 							</li>
 						{/foreach}
@@ -106,7 +106,6 @@

 		$(document).ready(function()
 		{
-			$('#product-tab-content-wait').show();
 			//product_type = $("input[name=type_product]:checked").val();
 			if (product_type == product_type_pack)
 			{
@@ -29,6 +29,19 @@
 	<h4>{if isset($id_image)}{l s='Edit this product image'}{else}{l s='Add a new image to this product'}{/if}</h4>	<div class="separation"></div><br />

 	<table cellpadding="5" style="width:100%">
+		<tr>
+			<td class="col-left">
+				<label>{l s='Legend:'}</label>
+			</td>
+			<td style="padding-bottom:5px;" class="translatable">
+			{foreach from=$languages item=language}
+				<div class="lang_{$language.id_lang}" style="{if !$language.is_default}display: none;{/if} float: left;">
+					<input class="updateCurrentText" size="43" type="text" {if !$product->id}disabled="disabled"{/if} id="legend_{$language.id_lang}" name="legend_{$language.id_lang}" value="{$product->name[$language.id_lang]|escape:'htmlall':'UTF-8'}"/>
+					<span class="hint" name="help_box">{l s='Invalid characters:'} <>;=#{}<span class="hint-pointer">&nbsp;</span></span>
+				</div>
+			{/foreach}
+			</td>
+		</tr>
 		<tr>
 			<td class="col-left"><label class="file_upload_label">{l s='File:'}</label></td>
 			<td style="padding-bottom:5px;">
@@ -57,6 +70,7 @@
 						<thead>
 						<tr class="nodrag nodrop"> 
 							<th style="width: 100px;">{l s='Image'}</th>
+							<th>{l s='Legend'}</th>
 							<th>{l s='Position'}</th>
 							{if $shops}
 							{foreach from=$shops item=shop}
@@ -78,9 +92,10 @@
 		<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_}{$iso_lang}-default-small_default.jpg" alt="image_id" title="image_id" />
+					<img src="{$smarty.const._THEME_PROD_DIR_}{$iso_lang}-default-{$imageType}.jpg" alt="legend" title="legend" />
 				</a>
 			</td>
+			<td>legend</td>
 			<td id="td_image_id" class="pointer dragHandle center positionImage">
 				image_position
 			</td>
@@ -101,7 +116,6 @@
 			</td>
 		</tr>
 	</table>
-
 	<script type="text/javascript">
 		var upbutton = '{l s='Upload an image'}';
 		var token = '{$token}';
@@ -128,7 +142,7 @@
 				}
 				else
 					assoc = false;
-				imageLine({$image->id}, "{$image->getExistingImgPath()}", {$image->position}, "{if $image->cover}enabled{else}forbbiden{/if}", assoc);
+				imageLine({$image->id}, "{$image->getExistingImgPath()}", {$image->position}, "{if $image->cover}enabled{else}forbbiden{/if}", assoc, "{$image->legend[$default_language]|@addcslashes:'\"'}");
 			{/foreach}
 			{literal}
 			$("#imageTable").tableDnD(
@@ -147,20 +161,20 @@
 				updateImagePosition(image_up);
 				}
 			});
+		
 			var filecheck = 1;
-			var uploader = new qq.FileUploader(
+			var params = new Array;
+			params['id_product'] = {/literal}{$id_product|intval}{literal};
+			params['id_category'] = {/literal}{$id_category_default|intval}{literal};
+			params['token'] = "{/literal}{$token}{literal}";
+			params['tab'] = "AdminProducts";
+			params['action'] = "addImage";
+			params['ajax'] = 1;
+			uploader = new qq.FileUploader(
 			{
 				element: document.getElementById("file-uploader"),
 				action: "ajax-tab.php",
 				debug: false,
-				params: {
-					id_product : {/literal}{$id_product}{literal},
-					id_category : {/literal}{$id_category_default}{literal},
-					token : "{/literal}{$token}{literal}",
-					tab : "AdminProducts",
-					action : 'addImage',
-					ajax: 1
-				},
 				onComplete: function(id, fileName, responseJSON)
 				{
 					var percent = ((filecheck * 100) / nbfile);
@@ -185,7 +199,7 @@
 						cover = "forbbiden";
 						if (responseJSON.cover == "1")
 							cover = "enabled";
-						imageLine(responseJSON.id, responseJSON.path, responseJSON.position, cover, responseJSON.shops)
+						imageLine(responseJSON.id, responseJSON.path, responseJSON.position, cover, responseJSON.shops, responseJSON.legend[{/literal}{$default_language|intval}{literal}])
 						$("#imageTable tr:last").after(responseJSON.html);
 						$("#countImage").html(parseInt($("#countImage").html()) + 1);
 						$("#img" + id).remove();
@@ -198,6 +212,12 @@
 				},
 				onSubmit: function(id, filename)
 				{
+					$('input[id^="legend_"]').each(function()
+					{
+						id = $(this).prop("id").replace("legend_", "legend[") + "]";
+						params[id] = $(this).val();
+					});
+					uploader.setParams(params);					
 					$("#imageTable").show();
 					$("#listImage").append("<li id='img"+id+"'><div class=\"float\" >" + filename + "</div></div><a style=\"margin-left:10px\"href=\"javascript:delQueue(" + id +");\"><img src=\"../img/admin/disabled.gif\" alt=\"\" border=\"0\"></a><p class=\"errorImg\"></p></li>");
 				}
@@ -309,13 +329,14 @@
 				$("#img" + id).remove();
 			}
 			
-			function imageLine(id, path, position, cover, shops)
+			function imageLine(id, path, position, cover, shops, legend)
 			{
 				line = $("#lineType").html();
 				line = line.replace(/image_id/g, id);
-				line = line.replace(/[a-z]{2}-default/g, path);
+				line = line.replace(/[a-z]{0,2}-default/g, path);
 				line = line.replace(/image_path/g, path);
 				line = line.replace(/image_position/g, position);
+				line = line.replace(/legend/g, legend);
 				line = line.replace(/blank/g, cover);
 				line = line.replace(/<tbody>/gi, "");
 				line = line.replace(/<\/tbody>/gi, "");
@@ -330,7 +351,6 @@

 				$("#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;">
@@ -375,8 +375,19 @@
 			<td style="padding-bottom:5px;" class="translatable">
 				{foreach from=$languages item=language}
 					<div class="lang_{$language.id_lang}" style="{if !$language.is_default}display: none;{/if}float: left;">
+						{literal}
+						<script type="text/javascript">
+							$().ready(function () {
+								var input_id = '{/literal}tags_{$language.id_lang}{literal}';
+								$('#'+input_id).tagify({delimiters: [13,44], addTagPrompt: '{/literal}{l s='Add tag' js=1}{literal}'});
+								$({/literal}'#{$table}{literal}_form').submit( function() {
+									$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
+								});
+							});
+						</script>
+						{/literal}
 						<input size="55" type="text" id="tags_{$language.id_lang}" name="tags_{$language.id_lang}"
-							value="{$product->getTags($language.id_lang, true)|htmlentitiesUTF8}" />
+							value="{$product->getTags($language.id_lang, true)|htmlentitiesUTF8}" class="tagify" />
 						<span class="hint" name="help_box">{l s='Forbidden characters:'} !&lt;;&gt;;?=+#&quot;&deg;{}_$%<span class="hint-pointer">&nbsp;</span></span>
 					</div>
 				{/foreach}
@@ -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>
@@ -223,7 +223,7 @@ $(document).ready(function () {
 	<tr>
 		<td class="col-left"><label><b>{l s='Final retail price:'}</b></label></td>
 		<td>
-			<span {if !$country_display_tax_label}style="display:none"{/if} >
+			<span>
 			{$currency->prefix}<span id="finalPrice" style="font-weight: bold;">0.00</span>{$currency->suffix}<span {if $ps_tax}style="display:none;"{/if}> ({l s='tax incl.'})</span>
 			</span>
 			<span {if $ps_tax}style="display:none;"{/if} >
@@ -249,7 +249,7 @@ $(document).ready(function () {
 	<script type="text/javascript">
 	var product_prices = new Array();
 	{foreach from=$combinations item='combination'}
-		product_prices['{$combination.id_product_attribute}'] = '{$combination.price}';
+		product_prices['{$combination.id_product_attribute}'] = '{$combination.price|@addcslashes:'\''}';
 	{/foreach}
 	</script>
 	<div id="add_specific_price" style="display: none;">
@@ -375,7 +375,7 @@ $(document).ready(function () {
 		<div class="margin-form">
 			<input type="text" name="sp_reduction" value="0.00" size="11" />
 			<select name="sp_reduction_type">
-				<option selected="selected">---</option>
+				<option selected="selected">-</option>
 				<option value="amount">{l s='Amount'}</option>
 				<option value="percentage">{l s='Percentage'}</option>
 			</select>
@@ -75,7 +75,7 @@
 	<p>{l s='Click "Save and Stay" after changing selected suppliers to display the associated product references.'}</p>
 	<div id="suppliers_accordion" style="margin-top:10px; display:block;">
 		{foreach from=$associated_suppliers item=supplier}
-		    <h3 style="margin-bottom:0;"><a href="#">{$supplier->name}</a></h3>
+		    <h3 style="margin-bottom:0;"><a href="#">{if isset($supplier->name)}{$supplier->name}{/if}</a></h3>
 		    <div style="display:block;">

 				<table cellpadding="10" cellspacing="0" class="table">
@@ -28,7 +28,7 @@
 <div class="lang_{$language.id_lang}" style="{if !$language.is_default}display:none;{/if}float: left;">
 	<textarea cols="100" rows="10" id="{$input_name}_{$language.id_lang}" 
 		name="{$input_name}_{$language.id_lang}" 
-		class="autoload_rte" >{if isset($input_value[$language.id_lang])}{$input_value[$language.id_lang]|htmlentitiesUTF8}{/if}</textarea>
+		class="autoload_rte" >{if isset($input_value[$language.id_lang])}{$input_value[$language.id_lang]|htmlentitiesUTF8|replace:'\r\n':''|replace:'\&quot;':'&quot;'}{/if}</textarea>
 	<span class="counter" max="{if isset($max)}{$max}{else}none{/if}"></span>
 	<span class="hint">{$hint|default:''}<span class="hint-pointer">&nbsp;</span></span>
 </div>
@@ -58,6 +58,7 @@
 						$('#file_missing').hide();
 						$('#virtual_product_name').attr('value', fileName);
 						$("#upload-confirmation .error").remove();
+						$('#upload-confirmation div').find('span').remove();
 						$('#upload-confirmation div').prepend('<span>{l s='The file'}&nbsp;"<a class="link" href="get-file-admin.php?file='+msg+'&filename='+fileName+'">'+fileName+'</a>"&nbsp;{l s='has successfully been uploaded'}' +
 							'<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="' + msg + '" /></span>');
 						$("#upload-confirmation").show();
@@ -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 />
@@ -112,7 +112,7 @@
 			<label>{l s='Filter by product:'}</label>
 			<div class="margin-left">
 				<select id="selectProduct" name="selectProduct" style="width: 200px;" onfocus="fillProducts();" onchange="updateConversionRate(this.value);">
-					<option value="0" selected="selected">-- {l s='All'} --</option>
+					<option value="0" selected="selected">- {l s='All'} -</option>
 				</select>
 			</div>
 			<br class="clear" />
@@ -41,7 +41,7 @@
 				<div class="margin-form">
 					<select id="id_category" name="id_category">
 						{foreach from=$categories item='category'}
-						<option value="{$category.id_category}">{$category.name}</option>
+						<option value="{$category.id_category|intval}">({$category.id_category|intval}) {$category.name}</option>
 						{/foreach}
 					</select>
 					<a class="button bt-icon" href="#" id="add_condition_category">
@@ -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);
 }

@@ -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')
@@ -54,7 +54,7 @@ $(document).ready(function() {
 </div>

 <div class="margin-form">
-<input type="submit" id="_form_submit_btn" value="{l s='Save'}" name="submitChangestate" class="button" style="display: none;">
+<input type="submit" id="{$table}_form_submit_btn" value="{l s='Save'}" name="submitChangestate" class="button" style="display: none;">
 </div>
 {/if}
 {/block}
@@ -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>
@@ -34,54 +34,51 @@
 	<title>{$meta_title} - PrestaShop&trade;</title>
 {if $display_header}
 	<script type="text/javascript">
-		var help_class_name = '{$controller_name}';
-		var iso_user = '{$iso_user}';
-		var country_iso_code = '{$country_iso_code}';
-		var _PS_VERSION_ = '{$smarty.const._PS_VERSION_}';
-
-		var helpboxes = {$help_box};
-		var roundMode = {$round_mode};
-			{if isset($shop_context)}
-				{if $shop_context == Shop::CONTEXT_ALL}
-				var youEditFieldFor = "{l s='A modification of this field will be applied for all shops' slashes=1 }";
-					{elseif $shop_context == Shop::CONTEXT_GROUP}
-				var youEditFieldFor = "{l s='A modification of this field will be applied for all shops of group ' slashes=1 }<b>{$shop_name}</b>";
-					{else}
-				var youEditFieldFor = "{l s='A modification of this field will be applied for the shop ' slashes=1 }<b>{$shop_name}</b>";
-				{/if}
-				{else}
-			var youEditFieldFor = '';
-			{/if}
-		{* Notifications vars *}
-		var autorefresh_notifications = '{$autorefresh_notifications}';
-		var new_order_msg = '{l s='A new order has been placed on your shop.' slashes=1}';
-		var order_number_msg = '{l s='Order number: ' slashes=1}';
-		var total_msg = '{l s='Total: ' slashes=1}';
-		var from_msg = '{l s='From: ' slashes=1}';
-		var see_order_msg = '{l s='View this order' slashes=1}';
-		var new_customer_msg = '{l s='A new customer registered on your shop.' slashes=1}';
-		var customer_name_msg = '{l s='Customer name: ' slashes=1}';
-		var see_customer_msg = '{l s='View this customer' slashes=1}';
-		var new_msg = '{l s='A new message posted on your shop.' slashes=1}';
-		var excerpt_msg = '{l s='Excerpt: ' slashes=1}';
-		var see_msg = '{l s='Read this message' slashes=1}';
-		var token_admin_orders = '{getAdminToken tab='AdminOrders' slashes=1}';
-		var token_admin_customers = '{getAdminToken tab='AdminCustomers' slashes=1}';
-		var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads' slashes=1}';
-		var currentIndex = '{$currentIndex}';
-		var choose_language_translate = "{l s='Choose language' slashes=1 }";
+		var help_class_name = '{$controller_name|@addcslashes:'\''}';
+		var iso_user = '{$iso_user|@addcslashes:'\''}';
+		var country_iso_code = '{$country_iso_code|@addcslashes:'\''}';
+		var _PS_VERSION_ = '{$smarty.const._PS_VERSION_|@addcslashes:'\''}';
+		var helpboxes = {$help_box|intval};
+		var roundMode = {$round_mode|intval};
+{if isset($shop_context)}
+{if $shop_context == Shop::CONTEXT_ALL}
+		var youEditFieldFor = '{l s='A modification of this field will be applied for all shops' js=1}';
+{elseif $shop_context == Shop::CONTEXT_GROUP}
+		var youEditFieldFor = '{l s='A modification of this field will be applied for all shops of group' js=1} <b>{$shop_name|@addcslashes:'\''}</b>';
+{else}
+		var youEditFieldFor = '{l s='A modification of this field will be applied for the shop' js=1} <b>{$shop_name|@addcslashes:'\''}</b>';
+{/if}
+{else}
+		var youEditFieldFor = '';
+{/if}
+		var autorefresh_notifications = '{$autorefresh_notifications|@addcslashes:'\''}';
+		var new_order_msg = '{l s='A new order has been placed on your shop.' js=1}';
+		var order_number_msg = '{l s='Order number: ' js=1}';
+		var total_msg = '{l s='Total: ' js=1}';
+		var from_msg = '{l s='From: ' js=1}';
+		var see_order_msg = '{l s='View this order' js=1}';
+		var new_customer_msg = '{l s='A new customer registered on your shop.' js=1}';
+		var customer_name_msg = '{l s='Customer name: ' js=1}';
+		var see_customer_msg = '{l s='View this customer' js=1}';
+		var new_msg = '{l s='A new message posted on your shop.' js=1}';
+		var excerpt_msg = '{l s='Excerpt: ' js=1}';
+		var see_msg = '{l s='Read this message' js=1}';
+		var token_admin_orders = '{getAdminToken tab='AdminOrders'}';
+		var token_admin_customers = '{getAdminToken tab='AdminCustomers'}';
+		var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads'}';
+		var currentIndex = '{$currentIndex|@addcslashes:'\''}';
+		var choose_language_translate = '{l s='Choose language' js=1}';
 	</script>
 {/if}
-
 {if isset($css_files)}
-	{foreach from=$css_files key=css_uri item=media}
-		<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
-	{/foreach}
+{foreach from=$css_files key=css_uri item=media}
+	<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
+{/foreach}
 {/if}
 {if isset($js_files)}
-	{foreach from=$js_files item=js_uri}
-		<script type="text/javascript" src="{$js_uri}"></script>
-	{/foreach}
+{foreach from=$js_files item=js_uri}
+	<script type="text/javascript" src="{$js_uri}"></script>
+{/foreach}
 {/if}
 	<link rel="icon" type="image/vnd.microsoft.icon" href="{$img_dir}favicon.ico" />
 	<link rel="shortcut icon" type="image/x-icon" href="{$img_dir}favicon.ico" />
@@ -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}
@@ -68,7 +68,7 @@
 														<script type="text/javascript">
 															$().ready(function () {
 																var input_id = '{/literal}{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}{literal}';
-																$('#'+input_id).tagify({addTagPrompt: '{/literal}{l s='Add tag' js=1}{literal}'});
+																$('#'+input_id).tagify({delimiters: [13,44], addTagPrompt: '{/literal}{l s='Add tag' js=1}{literal}'});
 																$({/literal}'#{$table}{literal}_form').submit( function() {
 																	$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
 																});
@@ -97,8 +97,7 @@
 											<script type="text/javascript">
 												$().ready(function () {
 													var input_id = '{/literal}{if isset($input.id)}{$input.id}{else}{$input.name}{/if}{literal}';
-													$('#'+input_id).tagify();
-													$('#'+input_id).tagify({addTagPrompt: '{/literal}{l s='Add tag'}{literal}'});
+													$('#'+input_id).tagify({delimiters: [13,44], addTagPrompt: '{/literal}{l s='Add tag'}{literal}'});
 													$({/literal}'#{$table}{literal}_form').submit( function() {
 														$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
 													});
@@ -168,7 +167,7 @@
 															{/if}
 														>{$option->$input.options.name}</option>
 													{elseif $option == "-"}
-														<option value="">--</option>
+														<option value="">-</option>
 													{else}
 														<option value="{$option[$input.options.id]}"
 															{if isset($input.multiple)}
@@ -192,7 +191,7 @@
 									{/if}
 								{elseif $input.type == 'radio'}
 									{foreach $input.values as $value}
-										<input type="radio"	name="{$input.name}"id="{$value.id}" value="{$value.value|escape:'htmlall':'UTF-8'}"
+										<input type="radio" name="{$input.name}" id="{$value.id}" value="{$value.value|escape:'htmlall':'UTF-8'}"
 												{if $fields_value[$input.name] == $value.value}checked="checked"{/if}
 												{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
 										<label {if isset($input.class)}class="{$input.class}"{/if} for="{$value.id}">
@@ -237,7 +236,7 @@
 										{if isset($fields_value[$input.name].image) && $fields_value[$input.name].image}
 											<div id="image">
 												{$fields_value[$input.name].image}
-												<p align="center">{l s='File size'} {$fields_value[$input.name].size}kb</p>
+												<p align="center">{l s='File size'} {$fields_value[$input.name].size}{l s='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>
@@ -432,7 +431,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() {
@@ -454,6 +454,7 @@
 				});

 		});
+	state_token = '{getAdminToken tab='AdminStates'}';
 	{block name="script"}{/block}
 	</script>
 {/if}
@@ -24,11 +24,11 @@
 *}
 {if count($categories) && isset($categories)}
 	<script type="text/javascript">
-		var inputName = '{$categories.input_name}';
+		var inputName = '{$categories.input_name|@addcslashes:'\''}';
 		var use_radio = {if $categories.use_radio}1{else}0{/if};
-		var selectedCat = '{implode value=$categories.selected_cat}';
-		var selectedLabel = '{$categories.trads.selected}';
-		var home = '{$categories.trads.Root.name}';
+		var selectedCat = {$categories.selected_cat|@implode|intval};
+		var selectedLabel = '{$categories.trads.selected|@addcslashes:'\''}';
+		var home = '{$categories.trads.Root.name|@addcslashes:'\''}';
 		var use_radio = {if $categories.use_radio}1{else}0{/if};
 		var use_context = {if isset($categories.use_context)}1{else}0{/if};
 		$(document).ready(function(){
@@ -49,6 +49,7 @@
 					{/if}
 					class="{if !$no_link}pointer{/if}
 					{if isset($params.position) && $order_by == 'position'  && $order_way != 'DESC'} dragHandle{/if}
+					{if isset($params.class)} {$params.class}{/if}
 					{if isset($params.align)} {$params.align}{/if}"
 					{if (!isset($params.position) && !$no_link && !isset($params.remove_onclick))}
 						onclick="document.location = '{$current_index}&{$identifier}={$tr.$identifier}{if $view}&view{else}&update{/if}{$table}&token={$token}'">
@@ -103,7 +103,7 @@
 						<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>
+								<option value="{$value|intval}"{if $selected_pagination == $value && $selected_pagination != NULL} selected="selected"{elseif $selected_pagination == NULL && $value == $pagination[1]} selected="selected2"{/if}>{$value|intval}</option>
 							{/foreach}
 						</select>
 						/ {$list_total} {l s='result(s)'}
@@ -187,9 +187,9 @@
 									{else}
 										{if $params.type == 'bool'}
 											<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>
+												<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>
 											</select>
 										{elseif $params.type == 'date' || $params.type == 'datetime'}
 											{l s='From'} <input type="text" class="filter datepicker" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($params.value.0)}{$params.value.0}{/if}"{if isset($params.width)} style="width:70px"{/if}/><br />
@@ -197,10 +197,10 @@
 										{elseif $params.type == 'select'}
 											{if isset($params.filter_key)}
 												<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>
+													<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}
-															<option value="{$option_value}" {if $option_display == $params.value ||  $option_value == $params.value} selected="selected"{/if}>{$option_display}</option>
+															<option value="{$option_value}" {if $params.value != '' && ($option_display == $params.value ||  $option_value == $params.value)} selected="selected"{/if}>{$option_display}</option>
 														{/foreach}
 													{/if}
 												</select>
@@ -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"
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}

-<div class="toolbar-placeholder">
+<div id="{$table}_toolbar" class="toolbar-placeholder">
 	<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
 		{block name=toolbarBox}
 			<ul class="cc_button">
@@ -36,7 +36,7 @@
 						{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_container_tab" style="display:none;"></div>
@@ -52,7 +52,7 @@
 				var modules_list_loaded = false;
 				$(function() {
 					//get reference on save link
-					btn_save = $('span[class~="process-icon-save"]').parent();
+					btn_save = $('#{$table}_toolbar span[class~="process-icon-save"]').parent();

 					//get reference on form submit button
 					btn_submit = $('#{$table}_form_submit_btn');
@@ -87,12 +87,15 @@
 						btn_submit.hide();
 						//bind enter key press to validate form
 						$('#{$table}_form').keypress(function (e) {
-							if (e.which == 13 && e.target.localName != 'textarea')
+							if (e.which == 13 && e.target.localName != 'textarea' && !e.target.hasClass('tagify'))
 								$('#desc-{$table}-save').click();
 						});
 						//submit the form
 						{block name=formSubmit}
 							btn_save.click(function() {
+								// Vars
+								var btn_submit = $('#{$table}_form_submit_btn');
+
 								// Avoid double click
 								if (submited)
 									return false;
@@ -264,13 +264,17 @@ class AddressCore extends ObjectModel
 		if(!isset($id_address) || empty($id_address))
 			return false;

-		if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
-		SELECT c.`active`
-		FROM `'._DB_PREFIX_.'address` a
-		LEFT JOIN `'._DB_PREFIX_.'country` c ON c.`id_country` = a.`id_country`
-		WHERE a.`id_address` = '.(int)$id_address))
-			return false;
-		return ($result['active']);
+		$cache_id = 'Address::isCountryActiveById_'.(int)$id_address;
+		if (!Cache::isStored($cache_id))
+		{
+			$result = (bool)Db::getInstance(_PS_USE_SQL_SLAVE_)->getvalue('
+			SELECT c.`active`
+			FROM `'._DB_PREFIX_.'address` a
+			LEFT JOIN `'._DB_PREFIX_.'country` c ON c.`id_country` = a.`id_country`
+			WHERE a.`id_address` = '.(int)$id_address);
+			Cache::store($cache_id, $result);
+		}
+		return Cache::retrieve($cache_id);
 	}

 	/**
@@ -324,12 +328,17 @@ class AddressCore extends ObjectModel
 	{
 		if (!$id_customer)
 			return false;
-
-		return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
-			SELECT `id_address`
-			FROM `'._DB_PREFIX_.'address`
-			WHERE `id_customer` = '.(int)$id_customer.' AND `deleted` = 0'.($active ? ' AND `active` = 1' : '')
-		);
+		$cache_id = 'Address::getFirstCustomerAddressId_'.(int)$id_customer.'-'.(bool)$active;
+		if (!Cache::isStored($cache_id))
+		{
+			$result = (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+				SELECT `id_address`
+				FROM `'._DB_PREFIX_.'address`
+				WHERE `id_customer` = '.(int)$id_customer.' AND `deleted` = 0'.($active ? ' AND `active` = 1' : '')
+			);
+			Cache::store($cache_id, $result);
+		}
+		return Cache::retrieve($cache_id);
 	}

 	/**
@@ -379,5 +388,4 @@ class AddressCore extends ObjectModel
 		$query->where('id_warehouse = 0');
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
 	}
-}
-
+}
@@ -99,6 +99,7 @@ class AddressFormatCore extends ObjectModel
 		'outstanding_allow_amount',
 		'call_prefix',
 		'definition',
+		'debug_list'
 	);

 	public static $forbiddenClassList = array(
@@ -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();
@@ -1500,7 +1500,7 @@ abstract class AdminTabCore
 				case 'bool':
 					echo '
 					<select name="'.$this->table.'Filter_'.$key.'">
-						<option value="">--</option>
+						<option value="">-</option>
 						<option value="1"'.($value == 1 ? ' selected="selected"' : '').'>'.$this->l('Yes').'</option>
 						<option value="0"'.(($value == 0 && $value != '') ? ' selected="selected"' : '').'>'.$this->l('No').'</option>
 					</select>';
@@ -1524,7 +1524,7 @@ abstract class AdminTabCore
 					if (isset($params['filter_key']))
 					{
 						echo '<select onchange="$(\'#submitFilter'.$this->table.'\').focus();$(\'#submitFilter'.$this->table.'\').click();" name="'.$this->table.'Filter_'.$params['filter_key'].'" '.(isset($params['width']) ? 'style="width: '.$params['width'].'px"' : '').'>
-								<option value=""'.(($value == 0 && $value != '') ? ' selected="selected"' : '').'>--</option>';
+								<option value=""'.(($value == 0 && $value != '') ? ' selected="selected"' : '').'>-</option>';
 						if (isset($params['select']) && is_array($params['select']))
 							foreach ($params['select'] as $optionValue => $optionDisplay)
 							{
@@ -124,5 +124,21 @@ class AliasCore extends ObjectModel
 	{
 		return Configuration::get('PS_ALIAS_FEATURE_ACTIVE');
 	}
+
+	/**
+	 * This method is allow to know if a alias exist for AdminImportController
+	 * @since 1.5.6.0
+	 * @return bool
+	 */
+	public static function aliasExists($id_alias)
+	{
+		$row = Db::getInstance()->getRow('
+			SELECT `id_alias`
+			FROM '._DB_PREFIX_.'alias a
+			WHERE a.`id_alias` = '.(int)$id_alias
+		);
+
+		return isset($row['id_alias']);
+	}
 }

@@ -139,7 +139,7 @@ class AttributeCore extends ObjectModel
 				ON (a.`id_attribute` = al.`id_attribute` AND al.`id_lang` = '.(int)$id_lang.')
 			'.Shop::addSqlAssociation('attribute_group', 'ag').'
 			'.Shop::addSqlAssociation('attribute', 'a').'
-			'.($not_null ? 'WHERE a.`id_attribute` IS NOT NULL AND al.`name` IS NOT NULL' : '').'
+			'.($not_null ? 'WHERE a.`id_attribute` IS NOT NULL AND al.`name` IS NOT NULL AND agl.`id_attribute_group` IS NOT NULL' : '').'
 			ORDER BY agl.`name` ASC, a.`position` ASC
 		');
 	}
@@ -343,4 +343,4 @@ class AttributeCore extends ObjectModel

 		return (is_numeric($position)) ? $position : -1;
 	}
-}
+}
@@ -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();
@@ -49,11 +49,15 @@ class Autoload
 	 */
 	public $index = array();

+	public $_include_override_path = true;
+
 	protected function __construct()
 	{
 		$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 +84,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();

@@ -119,36 +122,32 @@ class Autoload
 	{
 		$classes = array_merge(
 			$this->getClassesFromDir('classes/'),
-			$this->getClassesFromDir('override/classes/'),
-			$this->getClassesFromDir('controllers/'),
-			$this->getClassesFromDir('override/controllers/')
+			$this->getClassesFromDir('controllers/')
 		);
+
+		if ($this->_include_override_path)
+			$classes = array_merge(
+				$classes,
+				$this->getClassesFromDir('override/classes/'),
+				$this->getClassesFromDir('override/controllers/')
+			);
+
 		ksort($classes);
 		$content = '<?php return '.var_export($classes, true).'; ?>';

 		// Write classes index on disc to cache it
 		$filename = $this->root_dir.Autoload::INDEX_FILE;
-		if ((file_exists($filename) && !is_writable($filename)) || !is_writable(dirname($filename)))
+		$filename_tmp = tempnam(dirname($filename), basename($filename.'.'));
+		if ($filename_tmp !== false && file_put_contents($filename_tmp, $content, LOCK_EX) !== false)
 		{
-			header('HTTP/1.1 503 temporarily overloaded');
-			// Cannot use PrestaShopException in this context
-			die('/cache/class_index.php is not writable, please give write permissions (chmod 666) on this file.');
+			if (!rename($filename_tmp, $filename))
+				unlink($filename_tmp);
+			else
+				@chmod($filename, 0666);
 		}
+		// $filename_tmp couldn't be written. $filename should be there anyway (even if outdated), no need to die.
 		else
-		{
-			$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);
-			}
-            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);
-			}
-		}
+			error_log('Cannot write temporary file '.$filename_tmp);

 		$this->index = $classes;
 	}
@@ -192,4 +191,3 @@ class Autoload
 		return isset($this->index[$classname]) ? $this->index[$classname] : null;
 	}
 }
-
@@ -34,6 +34,7 @@ class CMSCore extends ObjectModel
 	public $link_rewrite;
 	public $id_cms_category;
 	public $position;
+	public $indexation;
 	public $active;

 	/**
@@ -46,6 +47,7 @@ class CMSCore extends ObjectModel
 		'fields' => array(
 			'id_cms_category' => 	array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
 			'position' => 			array('type' => self::TYPE_INT),
+			'indexation' =>     	array('type' => self::TYPE_BOOL),
 			'active' => 			array('type' => self::TYPE_BOOL),

 			// Lang fields
@@ -188,7 +190,7 @@ class CMSCore extends ObjectModel
 		return (Db::getInstance()->getValue($sql));
 	}

-	public static function getCMSPages($id_lang = null, $id_cms_category = null, $active = true)
+	public static function getCMSPages($id_lang = null, $id_cms_category = null, $active = true, $id_shop = null)
 	{
 		$sql = new DbQuery();
 		$sql->select('*');
@@ -196,6 +198,9 @@ class CMSCore extends ObjectModel
 		if ($id_lang)
 			$sql->innerJoin('cms_lang', 'l', 'c.id_cms = l.id_cms AND l.id_lang = '.(int)$id_lang);

+		if ($id_shop)
+			$sql->innerJoin('cms_shop', 'cs', 'c.id_cms = cs.id_cms AND cs.id_shop = '.(int)$id_shop); 
+
 		if ($active)
 			$sql->where('c.active = 1');

@@ -277,17 +277,20 @@ class CarrierCore extends ObjectModel

 	public function getMaxDeliveryPriceByWeight($id_zone)
 	{
-		$sql = 'SELECT d.`price`
-				FROM `'._DB_PREFIX_.'delivery` d
-				INNER JOIN `'._DB_PREFIX_.'range_weight` w ON d.`id_range_weight` = w.`id_range_weight`
-				WHERE d.`id_zone` = '.(int)$id_zone.'
-					AND d.`id_carrier` = '.(int)$this->id.'
-					'.Carrier::sqlDeliveryRangeShop('range_weight').'
-				ORDER BY w.`delimiter2` DESC LIMIT 1';
-		$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
-		if (!isset($result[0]['price']))
-			return false;
-		return $result[0]['price'];
+		$cache_id = 'Carrier::getMaxDeliveryPriceByWeight_'.(int)$this->id.'-'.(int)$id_zone;
+		if (!Cache::isStored($cache_id))
+		{
+			$sql = 'SELECT d.`price`
+					FROM `'._DB_PREFIX_.'delivery` d
+					INNER JOIN `'._DB_PREFIX_.'range_weight` w ON d.`id_range_weight` = w.`id_range_weight`
+					WHERE d.`id_zone` = '.(int)$id_zone.'
+						AND d.`id_carrier` = '.(int)$this->id.'
+						'.Carrier::sqlDeliveryRangeShop('range_weight').'
+					ORDER BY w.`delimiter2` DESC';
+			$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql);
+			Cache::store($cache_id, $result);
+		}
+		return Cache::retrieve($cache_id);
 	}

 	/**
@@ -357,17 +360,20 @@ class CarrierCore extends ObjectModel

 	public function getMaxDeliveryPriceByPrice($id_zone)
 	{
-		$sql = 'SELECT d.`price`
-				FROM `'._DB_PREFIX_.'delivery` d
-				INNER JOIN `'._DB_PREFIX_.'range_price` r ON d.`id_range_price` = r.`id_range_price`
-				WHERE d.`id_zone` = '.(int)$id_zone.'
-					AND d.`id_carrier` = '.(int)$this->id.'
-					'.Carrier::sqlDeliveryRangeShop('range_price').'
-				ORDER BY r.`delimiter2` DESC LIMIT 1';
-		$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
-		if (!isset($result[0]['price']))
-			return false;
-		return $result[0]['price'];
+		$cache_id = 'Carrier::getMaxDeliveryPriceByPrice_'.(int)$this->id.'-'.(int)$id_zone;
+		if (!Cache::isStored($cache_id))
+		{
+			$sql = 'SELECT d.`price`
+					FROM `'._DB_PREFIX_.'delivery` d
+					INNER JOIN `'._DB_PREFIX_.'range_price` r ON d.`id_range_price` = r.`id_range_price`
+					WHERE d.`id_zone` = '.(int)$id_zone.'
+						AND d.`id_carrier` = '.(int)$this->id.'
+						'.Carrier::sqlDeliveryRangeShop('range_price').'
+					ORDER BY r.`delimiter2` DESC';
+			$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql);
+			Cache::store($cache_id, $result);
+		}
+		return Cache::retrieve($cache_id);
 	}

 	/**
@@ -449,7 +455,13 @@ class CarrierCore extends ObjectModel
 			GROUP BY c.`id_carrier`
 			ORDER BY c.`position` ASC';

-		$carriers = Db::getInstance()->executeS($sql);
+		$cache_id = 'Carrier::getCarriers_'.md5($sql);
+		if (!Cache::isStored($cache_id))
+		{
+			$carriers = Db::getInstance()->executeS($sql);
+			Cache::store($cache_id, $carriers);
+		}
+		$carriers = Cache::retrieve($cache_id);

 		if (is_array($carriers) && count($carriers))
 		{
@@ -775,11 +787,11 @@ class CarrierCore extends ObjectModel
 			if ($delete)
 				Db::getInstance()->execute('
 					DELETE FROM `'._DB_PREFIX_.'delivery` 
-					WHERE id_shop = '.(int)$values['id_shop'].' 
-					AND id_shop_group='.(int)$values['id_shop_group'].' 
+					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'] : '').
-					($values['id_range_weight'] !== null ? ' AND id_range_weight='.(int)$values['id_range_weight'] : '').'
+					($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']
 				);

@@ -1199,7 +1211,14 @@ class CarrierCore extends ObjectModel
 		$query->where('pc.id_product = '.(int)$product->id);
 		$query->where('pc.id_shop = '.(int)$id_shop);

-		$carriers_for_product = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
+		$cache_id = 'Carrier::getAvailableCarrierList_'.(int)$product->id.'-'.(int)$id_shop;
+		if (!Cache::isStored($cache_id))
+		{
+			$carriers_for_product = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
+			Cache::store($cache_id, $carriers_for_product);
+		}
+		$carriers_for_product = Cache::retrieve($cache_id);
+
 		$carrier_list = array();
 		if (!empty($carriers_for_product))
 		{				
@@ -1291,7 +1310,7 @@ class CarrierCore extends ObjectModel
 	{
 		if ($delete)
 			Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'carrier_group WHERE id_carrier = '.(int)$this->id);
-		if (!count($groups))
+		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)
@@ -325,7 +325,7 @@ class CartCore extends ObjectModel
 		if (!CartRule::isFeatureActive() || !$this->id)
 			return array();

-		$cache_key = 'Cart::getCartRules'.$this->id.'-'.$filter;
+		$cache_key = 'Cart::getCartRules_'.$this->id.'-'.$filter;
 		if (!Cache::isStored($cache_key))
 		{
 			$result = Db::getInstance()->executeS('
@@ -340,6 +340,7 @@ class CartCore extends ObjectModel
 				'.($filter == CartRule::FILTER_ACTION_SHIPPING ? 'AND free_shipping = 1' : '').'
 				'.($filter == CartRule::FILTER_ACTION_GIFT ? 'AND gift_product != 0' : '').'
 				'.($filter == CartRule::FILTER_ACTION_REDUCTION ? 'AND (reduction_percent != 0 OR reduction_amount != 0)' : '')
+				.' ORDER by cr.priority ASC'
 			);
 			Cache::store($cache_key, $result);
 		}
@@ -367,12 +368,16 @@ class CartCore extends ObjectModel
 	{
 		if (!CartRule::isFeatureActive())
 			return 0;
-
-		return Db::getInstance()->getValue('
-			SELECT COUNT(*)
-			FROM `'._DB_PREFIX_.'cart_cart_rule`
-			WHERE `id_cart_rule` = '.(int)$id_cart_rule.' AND `id_cart` = '.(int)$this->id
-		);
+		$cache_id = 'Cart::getDiscountsCustomer_'.(int)$this->id.'-'.(int)$id_cart_rule;
+		if (!Cache::isStored($cache_id))
+		{
+			$result = (int)Db::getInstance()->getValue('
+				SELECT COUNT(*)
+				FROM `'._DB_PREFIX_.'cart_cart_rule`
+				WHERE `id_cart_rule` = '.(int)$id_cart_rule.' AND `id_cart` = '.(int)$this->id);
+			Cache::store($cache_id, $result);
+		}
+		return Cache::retrieve($cache_id);
 	}

 	public function getLastProduct()
@@ -429,7 +434,7 @@ class CartCore extends ObjectModel
 						product_shop.`available_for_order`, product_shop.`price`, product_shop.`active`, product_shop.`unity`, product_shop.`unit_price_ratio`, 
 						stock.`quantity` AS quantity_available, p.`width`, p.`height`, p.`depth`, stock.`out_of_stock`, p.`weight`,
 						p.`date_add`, p.`date_upd`, IFNULL(stock.quantity, 0) as quantity, pl.`link_rewrite`, cl.`link_rewrite` AS category,
-						CONCAT(cp.`id_product`, IFNULL(cp.`id_product_attribute`, 0), IFNULL(cp.`id_address_delivery`, 0)) AS unique_id, cp.id_address_delivery,
+						CONCAT(LPAD(cp.`id_product`, 10, 0), LPAD(IFNULL(cp.`id_product_attribute`, 0), 10, 0), IFNULL(cp.`id_address_delivery`, 0)) AS unique_id, cp.id_address_delivery,
 						product_shop.`wholesale_price`, product_shop.advanced_stock_management, ps.product_supplier_reference supplier_reference');

 		// Build FROM
@@ -631,14 +636,19 @@ class CartCore extends ObjectModel

 			if (!isset($row['pai_id_image']) || $row['pai_id_image'] == 0)
 			{
-				$row2 = Db::getInstance()->getRow('
-					SELECT image_shop.`id_image` id_image, il.`legend`
-					FROM `'._DB_PREFIX_.'image` i
-					JOIN `'._DB_PREFIX_.'image_shop` image_shop ON (i.id_image = image_shop.id_image AND image_shop.cover=1 AND image_shop.id_shop='.(int)$row['id_shop'].')
-					LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (image_shop.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$this->id_lang.')
-					WHERE i.`id_product` = '.(int)$row['id_product'].' AND image_shop.`cover` = 1'
-				);
-
+				$cache_id = 'Cart::getProducts_'.'-pai_id_image-'.(int)$row['id_product'].'-'.(int)$this->id_lang.'-'.(int)$row['id_shop'];
+				if (!Cache::isStored($cache_id))
+				{ 
+					$row2 = Db::getInstance()->getRow('
+						SELECT image_shop.`id_image` id_image, il.`legend`
+						FROM `'._DB_PREFIX_.'image` i
+						JOIN `'._DB_PREFIX_.'image_shop` image_shop ON (i.id_image = image_shop.id_image AND image_shop.cover=1 AND image_shop.id_shop='.(int)$row['id_shop'].')
+						LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (image_shop.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$this->id_lang.')
+						WHERE i.`id_product` = '.(int)$row['id_product'].' AND image_shop.`cover` = 1'
+					);
+					Cache::store($cache_id, $row2);
+				}
+				$row2 = Cache::retrieve($cache_id);
 				if (!$row2)
 					$row2 = array('id_image' => false, 'legend' => false);
 				else
@@ -726,7 +736,7 @@ class CartCore extends ObjectModel
 	 *
 	 * @result integer Products quantity
 	 */
-	public	function nbProducts()
+	public function nbProducts()
 	{
 		if (!$this->id)
 			return 0;
@@ -762,10 +772,11 @@ 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 = '.(int)$this->id))
+		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
@@ -1076,9 +1087,9 @@ class CartCore extends ObjectModel
 			);
 			$id_customization = Db::getInstance()->Insert_ID();
 		}
-
+		
 		$query = 'INSERT INTO `'._DB_PREFIX_.'customized_data` (`id_customization`, `type`, `index`, `value`)
-			VALUES ('.(int)$id_customization.', '.(int)$type.', '.(int)$index.', \''.pSql($field).'\')';
+			VALUES ('.(int)$id_customization.', '.(int)$type.', '.(int)$index.', \''.pSQL($field).'\')';

 		if (!Db::getInstance()->execute($query))
 			return false;
@@ -1092,7 +1103,13 @@ class CartCore extends ObjectModel
 	 */
 	public function orderExists()
 	{
-		return (bool)Db::getInstance()->getValue('SELECT count(*) FROM `'._DB_PREFIX_.'orders` WHERE `id_cart` = '.(int)$this->id);
+		$cache_id = 'Cart::orderExists_'.(int)$this->id;
+		if (!Cache::isStored($cache_id))
+		{
+			$result = (bool)Db::getInstance()->getValue('SELECT count(*) FROM `'._DB_PREFIX_.'orders` WHERE `id_cart` = '.(int)$this->id);
+			Cache::store($cache_id, $result);
+		}
+		return Cache::retrieve($cache_id);
 	}

 	/**
@@ -1259,7 +1276,7 @@ class CartCore extends ObjectModel
 		return true;
 	}

-	public static function getTotalCart($id_cart, $use_tax_display = false, $type = CART::BOTH)
+	public static function getTotalCart($id_cart, $use_tax_display = false, $type = Cart::BOTH)
 	{
 		$cart = new Cart($id_cart);
 		if (!Validate::isLoadedObject($cart))
@@ -1675,6 +1692,7 @@ class CartCore extends ObjectModel
 				$warehouse_count_by_address[$product['id_address_delivery']][$warehouse['id_warehouse']]++;
 			}
 		}
+		unset($product);

 		arsort($warehouse_count_by_address);

@@ -1692,9 +1710,12 @@ class CartCore extends ObjectModel
 			$id_warehouse = 0;
 			foreach ($warehouse_count_by_address[$product['id_address_delivery']] as $id_war => $val)
 			{
-				$product['carrier_list'] = array_merge($product['carrier_list'], Carrier::getAvailableCarrierList(new Product($product['id_product']), $id_war, $product['id_address_delivery'], null, $this));
-				if (in_array((int)$id_war, $product['warehouse_list']) && $id_warehouse == 0)
-					$id_warehouse = (int)$id_war;
+				if (in_array((int)$id_war, $product['warehouse_list']))
+				{
+					$product['carrier_list'] = array_merge($product['carrier_list'], Carrier::getAvailableCarrierList(new Product($product['id_product']), $id_war, $product['id_address_delivery'], null, $this));
+					if (!$id_warehouse)
+						$id_warehouse = (int)$id_war;
+				}
 			}

 			if (!isset($grouped_by_warehouse[$product['id_address_delivery']]['in_stock'][$id_warehouse]))
@@ -1713,6 +1734,7 @@ class CartCore extends ObjectModel

 			$grouped_by_warehouse[$product['id_address_delivery']][$key][$id_warehouse][] = $product;
 		}
+		unset($product);

 		// Step 3 : grouped product from grouped_by_warehouse by available carriers
 		$grouped_by_carriers = array();
@@ -1731,7 +1753,6 @@ class CartCore extends ObjectModel
 				{
 					if (!isset($grouped_by_carriers[$id_address_delivery][$key][$id_warehouse]))
 						$grouped_by_carriers[$id_address_delivery][$key][$id_warehouse] = array();
-
 					foreach ($product_list as $product)
 					{
 						$package_carriers_key = implode(',', $product['carrier_list']);
@@ -1796,7 +1817,6 @@ class CartCore extends ObjectModel
 									);
 								$package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['carrier_list'] =
 									array_intersect($package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['carrier_list'], $data['carrier_list']);
-
 								$package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['product_list'] =
 									array_merge($package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['product_list'], $data['product_list']);

@@ -2272,18 +2292,23 @@ class CartCore extends ObjectModel
 	public function getAddressCollection()
 	{
 		$collection = array();
-		$result = Db::getInstance()->executeS(
-			'SELECT DISTINCT `id_address_delivery`
-			FROM `'._DB_PREFIX_.'cart_product`
-			WHERE id_cart = '.(int)$this->id
-		);
+		$cache_id = 'Cart::getAddressCollection'.(int)$this->id;
+		if (!Cache::isStored($cache_id))
+		{ 
+			$result = Db::getInstance()->executeS(
+				'SELECT DISTINCT `id_address_delivery`
+				FROM `'._DB_PREFIX_.'cart_product`
+				WHERE id_cart = '.(int)$this->id
+			);
+			Cache::store($cache_id, $result);
+		}
+		$result = Cache::retrieve($cache_id);

 		$result[] = array('id_address_delivery' => (int)$this->id_address_delivery);

 		foreach ($result as $row)
 			if ((int)$row['id_address_delivery'] != 0)
 				$collection[(int)$row['id_address_delivery']] = new Address((int)$row['id_address_delivery']);
-
 		return $collection;
 	}

@@ -3033,7 +3058,6 @@ class CartCore extends ObjectModel
 	 */
 	public function addTextFieldToProduct($id_product, $index, $type, $text_value)
 	{
-		$text_value = str_replace(array("\n", "\r"), '', nl2br($text_value));
 		if (!_PS_MAGIC_QUOTES_GPC_){
 			$text_value = str_replace('\\', '\\\\', $text_value);
 			$text_value = str_replace('\'', '\\\'', $text_value);
@@ -3214,7 +3238,7 @@ class CartCore extends ObjectModel
 	public function getWsCartRows()
 	{
 		return Db::getInstance()->executeS('
-			SELECT id_product, id_product_attribute, quantity
+			SELECT id_product, id_product_attribute, quantity, id_address_delivery
 			FROM `'._DB_PREFIX_.'cart_product`
 			WHERE id_cart = '.(int)$this->id.' AND id_shop = '.(int)Context::getContext()->shop->id
 		);
@@ -3415,6 +3439,7 @@ class CartCore extends ObjectModel
 	 */
 	public function setNoMultishipping()
 	{
+		$emptyCache = $result = false;
 		if (Configuration::get('PS_ALLOW_MULTISHIPPING'))
 		{
 			// Upgrading quantities
@@ -3433,7 +3458,9 @@ class CartCore extends ObjectModel
 						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);
+				$result = Db::getInstance()->execute($sql);
+				if ($result)
+					$emptyCache = true;
 			}

 			// Merging multiple lines
@@ -3451,15 +3478,22 @@ class CartCore extends ObjectModel
 		}
 		
 		// Update delivery address for each product line
-		Db::getInstance()->execute('
-		UPDATE `'._DB_PREFIX_.'cart_product`
+		$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 : ''));
-		
+		'.(Configuration::get('PS_ALLOW_MULTISHIPPING') ? ' AND `id_shop` = '.(int)$this->id_shop : '');
+
+		$cache_id = 'Cart::setNoMultishipping'.(int)$this->id.'-'.(int)$this->id_shop;
+		if (!Cache::isStored($cache_id))
+		{
+			if ($result = (bool)Db::getInstance()->execute($sql))
+				$emptyCache = true;
+			Cache::store($cache_id, $result);
+		}
+
 		if (Customization::isFeatureActive())
 			Db::getInstance()->execute('
 			UPDATE `'._DB_PREFIX_.'customization`
@@ -3468,6 +3502,9 @@ class CartCore extends ObjectModel
 				WHERE `id_cart` = '.(int)$this->id.'
 			)
 			WHERE `id_cart` = '.(int)$this->id);
+
+		if ($emptyCache)	
+			$this->_products = null;
 	}

 	/**
@@ -132,7 +132,12 @@ class CartRuleCore extends ObjectModel
 	public function update($null_values = false)
 	{
 		Cache::clean('getContextualValue_'.$this->id.'_*');
-		return parent::update($null_values);	
+		if (!parent::update($null_values))
+			return false;
+
+		Configuration::updateGlobalValue('PS_CART_RULE_FEATURE_ACTIVE', CartRule::isCurrentlyUsed($this->def['table'], true));
+
+		return true;
 	}

 	/**
@@ -254,6 +259,17 @@ class CartRuleCore extends ObjectModel
 			}
 			else
 				$cart_rule['quantity_for_user'] = 0;
+		unset($cart_rule);
+		
+		foreach ($result as $cart_rule)
+			if ($cart_rule['shop_restriction'])
+			{
+				$cartRuleShops = Db::getInstance()->executeS('SELECT id_shop FROM '._DB_PREFIX_.'cart_rule_shop WHERE id_cart_rule = '.(int)$cart_rule['id_cart_rule']);
+				foreach ($cartRuleShops as $cartRuleShop)
+					if (Shop::isFeatureActive() && ($cartRuleShop['id_shop'] == Context::getContext()->shop->id))
+						continue 2;
+				unset($result[$key]);
+			}

 		// Retrocompatibility with 1.4 discounts
 		foreach ($result as &$cart_rule)
@@ -464,7 +480,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)
@@ -523,6 +539,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('
@@ -550,7 +567,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();

@@ -585,6 +602,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'])
@@ -603,6 +622,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'])
@@ -1185,7 +1206,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).'%\'
 		');
 	}
 }
@@ -107,8 +107,8 @@ class CategoryCore extends ObjectModel
 			'date_upd' => 			array('type' => self::TYPE_DATE, 'validate' => 'isDate'),

 			// 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),
+			'name' => 				array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isCatalogName', 'required' => true, 'size' => 128),
+			'link_rewrite' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isLinkRewrite', 'required' => true, 'size' => 128),
 			'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),
@@ -666,9 +666,9 @@ class CategoryCore extends ObjectModel
 	  * @param boolean $active return only active categories
 	  * @return array categories
 	  */
-	public static function getHomeCategories($id_lang, $active = true)
+	public static function getHomeCategories($id_lang, $active = true, $id_shop = false)
 	{
-		return self::getChildren(Configuration::get('PS_HOME_CATEGORY'), $id_lang, $active);
+		return self::getChildren(Configuration::get('PS_HOME_CATEGORY'), $id_lang, $active, $id_shop);
 	}

 	public static function getRootCategory($id_lang = null, Shop $shop = null)
@@ -704,16 +704,22 @@ class CategoryCore extends ObjectModel
 		if (!Validate::isBool($active))
 			die(Tools::displayError());

-		$query = 'SELECT c.`id_category`, cl.`name`, cl.`link_rewrite`, category_shop.`id_shop`
-		FROM `'._DB_PREFIX_.'category` c
-		LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category`'.Shop::addSqlRestrictionOnLang('cl').')
-		'.Shop::addSqlAssociation('category', 'c').'
-		WHERE `id_lang` = '.(int)$id_lang.'
-		AND c.`id_parent` = '.(int)$id_parent.'
-		'.($active ? 'AND `active` = 1' : '').'
-		GROUP BY c.`id_category`
-		ORDER BY category_shop.`position` ASC';
-		return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
+		$cache_id = 'Category::getChildren_'.(int)$id_parent.'-'.(int)$id_lang.'-'.(bool)$active.'-'.(int)$id_shop;
+		if (!Cache::isStored($cache_id))
+		{
+			$query = 'SELECT c.`id_category`, cl.`name`, cl.`link_rewrite`, category_shop.`id_shop`
+			FROM `'._DB_PREFIX_.'category` c
+			LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category`'.Shop::addSqlRestrictionOnLang('cl').')
+			'.Shop::addSqlAssociation('category', 'c').'
+			WHERE `id_lang` = '.(int)$id_lang.'
+			AND c.`id_parent` = '.(int)$id_parent.'
+			'.($active ? 'AND `active` = 1' : '').'
+			GROUP BY c.`id_category`
+			ORDER BY category_shop.`position` ASC';
+			$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
+			Cache::store($cache_id, $result);
+		}
+		return Cache::retrieve($cache_id);
 	}

 	/**
@@ -1008,14 +1014,20 @@ class CategoryCore extends ObjectModel
 	public function getGroups()
 	{
 		$groups = array();
-		$result = Db::getInstance()->executeS('
-			SELECT cg.`id_group`
-			FROM '._DB_PREFIX_.'category_group cg
-			WHERE cg.`id_category` = '.(int)$this->id
-		);
-		foreach ($result as $group)
-			$groups[] = $group['id_group'];
-		return $groups;
+		$cache_id = 'Category::getGroups_'.(int)$this->id;
+		if (!Cache::isStored($cache_id))
+		{
+			$result = Db::getInstance()->executeS('
+				SELECT cg.`id_group`
+				FROM '._DB_PREFIX_.'category_group cg
+				WHERE cg.`id_category` = '.(int)$this->id
+			);
+			$groups = array();
+			foreach ($result as $group)
+				$groups[] = $group['id_group'];
+			Cache::store($cache_id, $groups);
+		}
+		return Cache::retrieve($cache_id);
 	}

 	public function addGroupsIfNoExist($id_group)
@@ -1036,24 +1048,23 @@ class CategoryCore extends ObjectModel
 	 */
 	public function checkAccess($id_customer)
 	{
-		if (!$id_customer)
+		$cache_id = 'Category::checkAccess_'.(int)$this->id.'-'.$id_customer.(!$id_customer ? '-'.(int)Group::getCurrent()->id : '');
+		if (!Cache::isStored($cache_id))
 		{
-			$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
+			if (!$id_customer)
+				$result = (bool)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
 				SELECT ctg.`id_group`
 				FROM '._DB_PREFIX_.'category_group ctg
-				WHERE ctg.`id_category` = '.(int)$this->id.' AND ctg.`id_group` = '.(int)Group::getCurrent()->id.'
-			');
-		} else {
-			$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
+				WHERE ctg.`id_category` = '.(int)$this->id.' AND ctg.`id_group` = '.(int)Group::getCurrent()->id);
+			else 
+				$result = (bool)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
 				SELECT ctg.`id_group`
 				FROM '._DB_PREFIX_.'category_group ctg
 				INNER JOIN '._DB_PREFIX_.'customer_group cg on (cg.`id_group` = ctg.`id_group` AND cg.`id_customer` = '.(int)$id_customer.')
-				WHERE ctg.`id_category` = '.(int)$this->id
-			);
+				WHERE ctg.`id_category` = '.(int)$this->id);
+			Cache::store($cache_id, $result);
 		}
-		if ($result && isset($result['id_group']) && $result['id_group'])
-			return true;
-		return false;
+		return Cache::retrieve($cache_id);
 	}

 	/**
@@ -1199,12 +1210,16 @@ class CategoryCore extends ObjectModel
 	 */
 	public static function getInterval($id)
 	{
-		$sql = 'SELECT nleft, nright, level_depth
-				FROM '._DB_PREFIX_.'category
-				WHERE id_category = '.(int)$id;
-		if (!$result = Db::getInstance()->getRow($sql))
-			return false;
-		return $result;
+		$cache_id = 'Category::getInterval_'.(int)$id;
+		if (!Cache::isStored($cache_id))
+		{
+			$sql = 'SELECT nleft, nright, level_depth
+					FROM '._DB_PREFIX_.'category
+					WHERE id_category = '.(int)$id;
+			$result = Db::getInstance()->getRow($sql);
+			Cache::store($cache_id, $result);
+		}
+		return Cache::retrieve($cache_id);
 	}

 	/**
@@ -1386,11 +1401,17 @@ class CategoryCore extends ObjectModel

 	public static function getCategoriesWithoutParent()
 	{
-		return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
-		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');
+		$cache_id = 'Category::getCategoriesWithoutParent_'.(int)Context::getContext()->language->id;
+		if (!Cache::isStored($cache_id))
+		{
+			$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
+			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');
+			Cache::store($cache_id, $result);
+		}
+		return Cache::retrieve($cache_id);
 	}

 	public function isRootCategoryForAShop()
@@ -1409,12 +1430,17 @@ class CategoryCore extends ObjectModel
 	public static function getTopCategory($id_lang = null)
 	{
 		if (is_null($id_lang))
-			$id_lang = Context::getContext()->language->id;
-		$id_category = Db::getInstance()->getValue('
-		SELECT `id_category`
-		FROM `'._DB_PREFIX_.'category`
-		WHERE `id_parent` = 0');
-		return new Category($id_category, $id_lang);
+			$id_lang = (int)Context::getContext()->language->id;
+		$cache_id = 'Category::getTopCategory_'.(int)$id_lang;
+		if (!Cache::isStored($cache_id))
+		{
+			$id_category = (int)Db::getInstance()->getValue('
+			SELECT `id_category`
+			FROM `'._DB_PREFIX_.'category`
+			WHERE `id_parent` = 0');
+			Cache::store($cache_id, new Category($id_category, $id_lang));
+		}
+		return Cache::retrieve($cache_id);
 	}

 	public function addPosition($position, $id_shop = null)
@@ -135,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;
 	}
@@ -58,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
 		);
 	}

@@ -318,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;		
+	}
 }
@@ -97,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(
@@ -114,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))
@@ -128,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);
@@ -73,7 +73,7 @@ class CurrencyCore extends ObjectModel
 			'sign' => 			array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 8),
 			'format' => 		array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
 			'decimals' => 		array('type' => self::TYPE_BOOL, 'validate' => 'isBool', 'required' => true),
-			'conversion_rate' =>array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true, 'shop' => true),
+			'conversion_rate' =>array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat', 'required' => true, 'shop' => true),
 			'deleted' => 		array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
 			'active' => 		array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
 		),
@@ -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',
@@ -106,14 +107,23 @@ class CurrencyCore extends ObjectModel
 		$this->suffix =	$this->format % 2 == 0 ? ' '.$this->sign : '';
 	}
 	/**
-	 * Overriding check if currency with the same iso code already exists.
-	 * If it's true, currency is doesn't added.
+	 * Overriding check if currency rate is not empty and if currency with the same iso code already exists.
+	 * If it's true, currency is not added.
 	 *
 	 * @see ObjectModelCore::add()
 	 */
 	public function add($autodate = true, $nullValues = false)
 	{
-		return Currency::exists($this->iso_code, $this->iso_code_num) ? false : parent::add();
+		if ((float)$this->conversion_rate <= 0)
+			return false;
+		return Currency::exists($this->iso_code, $this->iso_code_num) ? false : parent::add($autodate, $nullValues);
+	}
+
+	public function update($autodate = true, $nullValues = false)
+	{
+		if ((float)$this->conversion_rate <= 0)
+			return false;
+		return parent::update($autodate, $nullValues);
 	}

 	/**
@@ -187,8 +197,9 @@ class CurrencyCore extends ObjectModel
 			4 => array('left' => '', 'right' => &$formated_strings['right']),
 			5 => array('left' => '', 'right' => &$formated_strings['right'])
 		);
-
-		return ($formats[$this->format][$side]);
+		if (isset($formats[$this->format][$side]))
+			return ($formats[$this->format][$side]);
+		return $this->sign;
 	}

 	/**
@@ -285,10 +296,16 @@ class CurrencyCore extends ObjectModel
 	 */
 	public static function getIdByIsoCode($iso_code, $id_shop = 0)
 	{
-		$query = Currency::getIdByQuery($id_shop);
-		$query->where('iso_code = \''.pSQL($iso_code).'\'');
-
-		return (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query->build());
+		$cache_id = 'Currency::getIdByIsoCode_'.pSQL($iso_code).'-'.(int)$id_shop;
+		if (!Cache::isStored($cache_id))
+		{
+			$query = Currency::getIdByQuery($id_shop);
+			$query->where('iso_code = \''.pSQL($iso_code).'\'');
+	
+			$result = (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query->build());
+			Cache::store($cache_id, $result);
+		}
+		return Cache::retrieve($cache_id);
 	}

    /**
@@ -414,5 +431,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);
+	}
+}
@@ -362,15 +362,18 @@ class CustomerCore extends ObjectModel
 	{
 		if (!Validate::isUnsignedId($id_customer))
 			return true;
-		$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
-		SELECT `id_customer`
-		FROM `'._DB_PREFIX_.'customer`
-		WHERE `id_customer` = \''.(int)$id_customer.'\'
-		AND active = 1
-		AND `deleted` = 0');
-		if (isset($result['id_customer']))
-			return false;
-		return true;
+		$cache_id = 'Customer::isBanned_'.(int)$id_customer;
+		if (!Cache::isStored($cache_id))
+		{
+			$result = (bool)!Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
+			SELECT `id_customer`
+			FROM `'._DB_PREFIX_.'customer`
+			WHERE `id_customer` = \''.(int)$id_customer.'\'
+			AND active = 1
+			AND `deleted` = 0');
+			Cache::store($cache_id, $result);
+		}
+		return Cache::retrieve($cache_id);
 	}

 	/**
@@ -413,7 +416,7 @@ class CustomerCore extends ObjectModel
 	public static function customerHasAddress($id_customer, $id_address)
 	{
 		$key = (int)$id_customer.'-'.(int)$id_address;
-		if (!array_key_exists($id_address, self::$_customerHasAddress))
+		if (!array_key_exists($key, self::$_customerHasAddress))
 		{
 			self::$_customerHasAddress[$key] = (bool)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
 			SELECT `id_address`
@@ -439,15 +442,22 @@ class CustomerCore extends ObjectModel
 	 */
 	public function getAddresses($id_lang)
 	{
-		$sql = 'SELECT DISTINCT a.*, cl.`name` AS country, s.name AS state, s.iso_code AS state_iso
-				FROM `'._DB_PREFIX_.'address` a
-				LEFT JOIN `'._DB_PREFIX_.'country` c ON (a.`id_country` = c.`id_country`)
-				LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country`)
-				LEFT JOIN `'._DB_PREFIX_.'state` s ON (s.`id_state` = a.`id_state`)
-				'.(Context::getContext()->shop->getGroup()->share_order ? '' : Shop::addSqlAssociation('country', 'c')).' 
-				WHERE `id_lang` = '.(int)$id_lang.' AND `id_customer` = '.(int)$this->id.' AND a.`deleted` = 0';
+		$share_order = (bool)Context::getContext()->shop->getGroup()->share_order;
+		$cache_id = 'Customer::getAddresses'.(int)$this->id.'-'.(int)$id_lang.'-'.$share_order;
+		if (!Cache::isStored($cache_id))
+		{ 
+			$sql = 'SELECT DISTINCT a.*, cl.`name` AS country, s.name AS state, s.iso_code AS state_iso
+					FROM `'._DB_PREFIX_.'address` a
+					LEFT JOIN `'._DB_PREFIX_.'country` c ON (a.`id_country` = c.`id_country`)
+					LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country`)
+					LEFT JOIN `'._DB_PREFIX_.'state` s ON (s.`id_state` = a.`id_state`)
+					'.($share_order ? '' : Shop::addSqlAssociation('country', 'c')).' 
+					WHERE `id_lang` = '.(int)$id_lang.' AND `id_customer` = '.(int)$this->id.' AND a.`deleted` = 0';

-		return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
+			$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
+			Cache::store($cache_id, $result);
+		}
+		return Cache::retrieve($cache_id);
 	}

 	/**
@@ -476,12 +486,17 @@ class CustomerCore extends ObjectModel
 	{
 		if (!Validate::isUnsignedId($id_customer) || !Validate::isMd5($passwd))
 			die (Tools::displayError());
-
-		$sql = 'SELECT `id_customer`
-				FROM `'._DB_PREFIX_.'customer`
-				WHERE `id_customer` = '.$id_customer.'
+		$cache_id = 'Customer::checkPassword'.(int)$id_customer.'-'.$passwd;
+		if (!Cache::isStored($cache_id))
+		{
+			$sql = 'SELECT `id_customer`
+					FROM `'._DB_PREFIX_.'customer`
+					WHERE `id_customer` = '.$id_customer.'
 					AND `passwd` = \''.$passwd.'\'';
-		return (bool)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql);
+			$result = (bool)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql);
+			Cache::store($cache_id, $result);
+		}
+		return Cache::retrieve($cache_id);
 	}

 	/**
@@ -574,12 +589,16 @@ class CustomerCore extends ObjectModel

 	public static function customerIdExistsStatic($id_customer)
 	{
-		$row = Db::getInstance()->getRow('
-		SELECT `id_customer`
-		FROM '._DB_PREFIX_.'customer c
-		WHERE c.`id_customer` = '.(int)$id_customer);
-
-		return isset($row['id_customer']);
+		$cache_id = 'Customer::customerIdExistsStatic'.(int)$id_customer;
+		if (!Cache::isStored($cache_id))
+		{
+			$result = (int)Db::getInstance()->getValue('
+			SELECT `id_customer`
+			FROM '._DB_PREFIX_.'customer c
+			WHERE c.`id_customer` = '.(int)$id_customer);
+			Cache::store($cache_id, $result);
+		}
+		return Cache::retrieve($cache_id);
 	}

 	/**
@@ -589,9 +608,11 @@ class CustomerCore extends ObjectModel
 	 */
 	public function updateGroup($list)
 	{
-		$this->cleanGroups();
 		if ($list && !empty($list))
+		{
+			$this->cleanGroups();
 			$this->addGroups($list);
+		}
 		else
 			$this->addGroups(array($this->id_default_group));
 	}
@@ -606,7 +627,7 @@ class CustomerCore extends ObjectModel
 		foreach ($groups as $group)
 		{
 			$row = array('id_customer' => (int)$this->id, 'id_group' => (int)$group);
-			Db::getInstance()->insert('customer_group', $row);
+			Db::getInstance()->insert('customer_group', $row, false, true, Db::INSERT_IGNORE);
 		}
 	}

@@ -46,7 +46,7 @@ class CustomerMessageCore extends ObjectModel
 		'fields' => array(
 			'id_employee' => 		array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
 			'id_customer_thread' => array('type' => self::TYPE_INT),
-			'ip_address' => 		array('type' => self::TYPE_INT, 'validate' => 'isIp2Long'),
+			'ip_address' => 		array('type' => self::TYPE_STRING, 'validate' => 'isIp2Long', 'size' => 15),
 			'message' => 			array('type' => self::TYPE_STRING, 'validate' => 'isCleanHtml', 'required' => true, 'size' => 65000),
 			'file_name' => 			array('type' => self::TYPE_STRING),
 			'user_agent' => 		array('type' => self::TYPE_STRING),
@@ -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);
@@ -549,6 +549,9 @@ class DispatcherCore
 		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;

@@ -591,14 +594,14 @@ class DispatcherCore
 		if ($id_shop === null)
 			$id_shop = (int)Context::getContext()->shop->id;
 		
-		if ($this->use_routes && !isset($this->routes[$id_shop]))
+		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_shop][$id_lang][$route_id];
 		// Check required fields
@@ -248,8 +248,8 @@ class EmployeeCore extends ObjectModel
 		{
 			/* 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, $this->passwd)
-				&& (!isset($this->remote_addr) || $this->remote_addr == ip2long(Tools::getRemoteAddr()) || !Configuration::get('PS_COOKIE_CHECKIP'))
+				$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);
@@ -261,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;
 	}

@@ -312,16 +312,37 @@ class FeatureCore extends ObjectModel
 	 */
 	public static function cleanPositions()
 	{
-		return Db::getInstance()->execute('
-		UPDATE `'._DB_PREFIX_.'feature` f
-		LEFT JOIN (
-			SELECT @i := @i +1 AS rank, id_feature, position 
-			FROM `'._DB_PREFIX_.'feature`
-			JOIN (SELECT @i :=1) dummy
-			ORDER by position
-		) AS f2
-		USING (id_feature)
-		SET f.position = f2.rank - 1');
+		//Reordering positions to remove "holes" in them (after delete for instance)
+		$sql = "SELECT id_feature, position FROM "._DB_PREFIX_."feature ORDER BY id_feature";
+		$db = Db::getInstance();
+		$r = $db->executeS($sql, false);
+		$shiftTable = array(); //List of update queries (one query is necessary for each "hole" in the table)
+		$currentDelta = 0;
+		$minId = 0;
+		$maxId = 0;
+		$futurePosition = 1;
+		while ($line = $db->nextRow($r)) {
+			$delta = $futurePosition - $line['position']; //Difference between current position and future position
+			if ($delta != $currentDelta) {
+				$shiftTable[] = array('minId' => $minId, 'maxId' => $maxId, 'delta' => $currentDelta);
+				$currentDelta = $delta;
+				$minId = $line['id_feature'];
+			}
+			$maxId = $line['id_feature'];
+			$futurePosition++;
+		}
+		$shiftTable[] = array('minId' => $minId, 'maxId' => $maxId, 'delta' => $currentDelta);
+		
+		//Executing generated queries
+		foreach ($shiftTable as $line) {
+			$delta = $line['delta'];
+			if ($delta == 0) continue;
+			$delta = $delta > 0 ? '+' . (int)$delta : (int)$delta;
+			$minId = (int)$line['minId'];
+			$maxId = (int)$line['maxId'];
+			$sql = "UPDATE "._DB_PREFIX_."feature SET position = position $delta WHERE id_feature >= $minId AND id_feature <= $maxId";
+			Db::getInstance()->execute($sql);
+		}
 	}

 	/**
@@ -128,34 +128,50 @@ class FeatureValueCore extends ObjectModel
 				return $tab['value'];
 	}

-	public static function addFeatureValueImport($id_feature, $name)
+	public static function addFeatureValueImport($id_feature, $value, $id_product = null, $id_lang = null, $custom = false)
 	{
-		$rq = Db::getInstance()->executeS('
-			SELECT fv.`id_feature_value`
-			FROM '._DB_PREFIX_.'feature_value fv
-			LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl
-				ON (fvl.`id_feature_value` = fv.`id_feature_value`)
-			WHERE `value` = \''.pSQL($name).'\'
-				AND fv.`id_feature` = '.(int)$id_feature.'
-			GROUP BY fv.`id_feature_value` LIMIT 1
-		');
-
-		if (!isset($rq[0]['id_feature_value']) || !$id_feature_value = (int)$rq[0]['id_feature_value'])
+		$id_feature_value = false;
+		if (!is_null($id_product) && $id_product)
 		{
-			// Feature doesn't exist, create it
-			$feature_value = new FeatureValue();
+			$id_feature_value = Db::getInstance()->getValue('
+				SELECT fp.`id_feature_value`
+				FROM '._DB_PREFIX_.'feature_product fp
+				INNER JOIN '._DB_PREFIX_.'feature_value fv USING (`id_feature_value`)
+				WHERE fp.`id_feature` = '.(int)$id_feature.'
+				AND fv.`custom` = '.(int)$custom.'
+				AND fp.`id_product` = '.(int)$id_product);

-			$languages = Language::getLanguages();
-			foreach ($languages as $language)
-				$feature_value->value[$language['id_lang']] = strval($name);
-
-			$feature_value->id_feature = (int)$id_feature;
-			$feature_value->custom = 1;
-			$feature_value->add();
-
-			return (int)$feature_value->id;
+			if ($custom && $id_feature_value && !is_null($id_lang) && $id_lang)
+				Db::getInstance()->execute('
+				UPDATE '._DB_PREFIX_.'feature_value_lang 
+				SET `value` = \''.pSQL($value).'\' 
+				WHERE `id_feature_value` = '.(int)$id_feature_value.' 
+				AND `value` != \''.pSQL($value).'\' 
+				AND `id_lang` = '.(int)$id_lang);
 		}
-		return (int)$id_feature_value;
+		
+		if (!$custom)		
+			$id_feature_value = Db::getInstance()->getValue('
+				SELECT fv.`id_feature_value`
+				FROM '._DB_PREFIX_.'feature_value fv
+				LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl ON (fvl.`id_feature_value` = fv.`id_feature_value` AND fvl.`id_lang` = '.(int)$id_lang.')
+				WHERE `value` = \''.pSQL($value).'\'
+				AND fv.`id_feature` = '.(int)$id_feature.'
+				AND fv.`custom` = 0
+				GROUP BY fv.`id_feature_value`');
+
+		if ($id_feature_value)
+			return (int)$id_feature_value;
+
+		// Feature doesn't exist, create it
+		$feature_value = new FeatureValue();
+		$feature_value->id_feature = (int)$id_feature;
+		$feature_value->custom = (bool)$custom;
+		foreach (Language::getLanguages() as $language)
+			$feature_value->value[$language['id_lang']] = $value;
+		$feature_value->add();
+
+		return (int)$feature_value->id;
 	}

 	public function add($autodate = true, $nullValues = false)
@@ -102,6 +102,13 @@ class QqUploadedFileForm
 			$image = new Image();
 			$image->id_product = (int)$product->id;
 			$image->position = Image::getHighestPosition($product->id) + 1;
+			$legends = Tools::getValue('legend');
+			if (is_array($legends))
+				foreach ($legends as $key => $legend)
+					if (!empty($legend) && Validate::isGenericName($legend))
+						$image->legend[(int)$key] = $legend;
+					else
+						return array('error' => sprintf(Tools::displayError('Error on image legend "%1s." is not a valid legend.'), Tools::safeOutput($legend)));
 			if (!Image::getCover($image->id_product))
 				$image->cover = 1;
 			else
@@ -136,7 +143,7 @@ class QqUploadedFileForm

 		if (!$image->update())
 			return array('error' => Tools::displayError('Error while updating status'));
-		$img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover, 'name' => $this->getName());
+		$img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover, 'name' => $this->getName(), 'legend' => $image->legend);
 		return array('success' => $img);
 	}

@@ -184,6 +191,13 @@ class QqUploadedFileXhr
 			$image = new Image();
 			$image->id_product = (int)($product->id);
 			$image->position = Image::getHighestPosition($product->id) + 1;
+			$legends = Tools::getValue('legend');
+			if (is_array($legends))
+				foreach ($legends as $key => $legend)
+					if (!empty($legend) && Validate::isGenericName($legend))
+						$image->legend[(int)$key] = $legend;
+					else
+						return array('error' => sprintf(Tools::displayError('Error on image legend "%1s." is not a valid legend.'), Tools::safeOutput($legend)));
 			if (!Image::getCover($image->id_product))
 				$image->cover = 1;
 			else
@@ -223,7 +237,7 @@ class QqUploadedFileXhr

 		if (!$image->update())
 			return array('error' => Tools::displayError('Error while updating status'));
-		$img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover, 'name' => $this->getName());
+		$img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover, 'name' => $this->getName(), 'legend' => $image->legend);
 		return array('success' => $img);
 	}

@@ -305,17 +305,43 @@ class GroupCore extends ObjectModel
 	public static function getCurrent()
 	{
 		static $groups = array();
+
 		$customer = Context::getContext()->customer;
 		if (Validate::isLoadedObject($customer))
+		{
 			$id_group = (int)$customer->id_default_group;
+			$group = new Group((int)$id_group);
+			if (!$group->isAssociatedToShop(Context::getContext()->shop->id))
+				$group = new Group((int)Configuration::get('PS_CUSTOMER_GROUP'));
+		}
 		else
 			$id_group = (int)Configuration::get('PS_UNIDENTIFIED_GROUP');
-		
+
+		if (!isset($groups[$id_group]) && isset($group))
+			$groups[$id_group] = $group;
+
 		if (!isset($groups[$id_group]))
 			$groups[$id_group] = new Group($id_group);

 		return $groups[$id_group];
 	}
-}
-

+	/**
+	  * Light back office search for Group
+	  *
+	  * @param integer $id_lang Language ID
+	  * @param string $query Searched string
+	  * @param boolean $unrestricted allows search without lang and includes first group and exact match
+	  * @return array Corresponding groupes
+	  */
+	public static function searchByName($query)
+	{
+		return Db::getInstance()->getRow('
+			SELECT g.*, gl.*
+			FROM `'._DB_PREFIX_.'group` g
+			LEFT JOIN `'._DB_PREFIX_.'group_lang` gl
+				ON (g.`id_group` = gl.`id_group`)
+			WHERE `name` LIKE \''.pSQL($query).'\'
+		');
+	}
+}
@@ -137,6 +137,7 @@ class GroupReductionCore extends ObjectModel
 			SELECT `reduction`
 			FROM `'._DB_PREFIX_.'product_group_reduction_cache`
 			WHERE `id_product` = '.(int)$id_product.' AND `id_group` = '.(int)$id_group);
+		// Should return string (decimal in database) and not a float
 		return self::$reduction_cache[$id_product.'-'.$id_group];
 	}

@@ -56,6 +56,8 @@ class HookCore extends ObjectModel
 	 */
 	public static $executed_hooks = array();

+	public static $native_module;
+
 	/**
 	 * @see ObjectModel::$definition
 	 */
@@ -110,6 +112,7 @@ class HookCore extends ObjectModel
 	 */
 	public static function getIdByName($hook_name)
 	{
+		$hook_name = strtolower($hook_name);
 		if (!Validate::isHookName($hook_name))
 			return false;

@@ -126,9 +129,7 @@ class HookCore extends ObjectModel
 			FROM `'._DB_PREFIX_.'hook_alias` ha
 			INNER JOIN `'._DB_PREFIX_.'hook` h ON ha.name = h.name');
 			foreach ($result as $row)
-			{
-				$hook_ids[$row['name']] = $row['id_hook'];
-			}				
+				$hook_ids[strtolower($row['name'])] = $row['id_hook'];
 			Cache::store($cache_id, $hook_ids);
 		}
 		else
@@ -317,7 +318,7 @@ class HookCore extends ObjectModel
 				if (Validate::isLoadedObject($context->country))
 					$sql->where('(h.name = "displayPayment" AND (SELECT id_country FROM '._DB_PREFIX_.'module_country mc WHERE mc.id_module = m.id_module AND id_country = '.(int)$context->country->id.' AND id_shop = '.(int)$context->shop->id.' LIMIT 1) = '.(int)$context->country->id.')');
 				if (Validate::isLoadedObject($context->currency))
-					$sql->where('(h.name = "displayPayment" AND (SELECT id_currency FROM '._DB_PREFIX_.'module_currency mcr WHERE mcr.id_module = m.id_module AND id_currency IN ('.(int)$context->currency->id.', -2) LIMIT 1) IN ('.(int)$context->currency->id.', -2))');
+					$sql->where('(h.name = "displayPayment" AND (SELECT id_currency FROM '._DB_PREFIX_.'module_currency mcr WHERE mcr.id_module = m.id_module AND id_currency IN ('.(int)$context->currency->id.', -1, -2) LIMIT 1) IN ('.(int)$context->currency->id.', -1, -2))');
 			}
 			if (Validate::isLoadedObject($context->shop))
 				$sql->where('hm.id_shop = '.(int)$context->shop->id);
@@ -325,7 +326,10 @@ class HookCore extends ObjectModel
 			if ($frontend)
 			{
 				$sql->leftJoin('module_group', 'mg', 'mg.`id_module` = m.`id_module`');
-				$sql->where('mg.`id_group` IN ('.implode(', ', $groups).')');
+				if (Validate::isLoadedObject($context->shop))
+					$sql->where('mg.id_shop = '.((int)$context->shop->id).' AND  mg.`id_group` IN ('.implode(', ', $groups).')');
+				else
+					$sql->where('mg.`id_group` IN ('.implode(', ', $groups).')');
 				$sql->groupBy('hm.id_hook, hm.id_module');
 			}

@@ -389,6 +393,10 @@ class HookCore extends ObjectModel
 	 */
 	public static function exec($hook_name, $hook_args = array(), $id_module = null, $array_return = false, $check_exceptions = true)
 	{
+		static $disable_non_native_modules = null;
+		if ($disable_non_native_modules === null)
+			$disable_non_native_modules = (bool)Configuration::get('PS_DISABLE_NON_NATIVE_MODULE');
+
 		// Check arguments validity
 		if (($id_module && !is_numeric($id_module)) || !Validate::isHookName($hook_name))
 			throw new PrestaShopException('Invalid id_module or hook_name');
@@ -417,12 +425,19 @@ class HookCore extends ObjectModel
 		// Look on modules list
 		$altern = 0;
 		$output = '';
-						
+
+		if ($disable_non_native_modules && !isset(Hook::$native_module))
+			Hook::$native_module = Module::getNativeModuleList();
+
 		foreach ($module_list as $array)
 		{
 			// Check errors
 			if ($id_module && $id_module != $array['id_module'])
 				continue;
+
+			if ((bool)$disable_non_native_modules && Hook::$native_module && count(Hook::$native_module) && !in_array($array['module'], self::$native_module))
+				continue;
+
 			if (!($moduleInstance = Module::getInstanceByName($array['module'])))
 				continue;

@@ -40,6 +40,9 @@ class ImageCore extends ObjectModel
 	/** @var boolean Image is cover */
 	public $cover;

+	/** @var string Legend */
+	public $legend;
+
 	/** @var string image extension */
 	public $image_format = 'jpg';

@@ -66,6 +69,7 @@ class ImageCore extends ObjectModel
 			'id_product' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
 			'position' => 	array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
 			'cover' => 		array('type' => self::TYPE_BOOL, 'validate' => 'isBool', 'shop' => true),
+			'legend' => 	array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 128),
 		),
 	);

@@ -120,16 +124,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 +654,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/';
@@ -127,16 +127,20 @@ class ImageTypeCore extends ObjectModel
 	 * @param string $name
 	 * @param string $type
 	 */
-	public static function getByNameNType($name, $type = null)
+	public static function getByNameNType($name, $type = null, $order = null)
 	{
-		if (!isset(self::$images_types_name_cache[$name.'_'.$type]))
+		if (!isset(self::$images_types_name_cache[$name.'_'.$type.'_'.$order]))
 		{
-			self::$images_types_name_cache[$name.'_'.$type] = Db::getInstance()->getRow('
+			self::$images_types_name_cache[$name.'_'.$type.'_'.$order] = Db::getInstance()->getRow('
 				SELECT `id_image_type`, `name`, `width`, `height`, `products`, `categories`, `manufacturers`, `suppliers`, `scenes` 
 				FROM `'._DB_PREFIX_.'image_type` 
-				WHERE `name` = \''.pSQL($name).'\' '.(!is_null($type) ? 'AND `'.pSQL($type).'` = 1' : ''));
+				WHERE 
+				`name` LIKE \''.pSQL($name).'\''
+				.(!is_null($type) ? ' AND `'.pSQL($type).'` = 1' : '')
+				.(!is_null($order) ? ' ORDER BY `'.bqSQL($order).'` ASC' : '')
+			);
 		}
-		return self::$images_types_name_cache[$name.'_'.$type];
+		return self::$images_types_name_cache[$name.'_'.$type.'_'.$order];
 	}
 	
 	public static function getFormatedName($name)
@@ -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.';
 ?>');
@@ -460,7 +464,8 @@ class LanguageCore extends ObjectModel
 				}
 			closedir($handle);
 		}
-		rmdir($dir);
+		if (is_writable($dir))
+			rmdir($dir);
 	}

 	public function delete()
@@ -519,7 +524,7 @@ class LanguageCore extends ObjectModel
 				'-default-'.ImageType::getFormatedName('medium').'.jpg',
 				'-default-'.ImageType::getFormatedName('small').'.jpg'
 			);
-			$image_directories = array(_PS_CAT_IMG_DIR_, _PS_MANU_IMG_DIR_, _PS_PROD_IMG_DIR_, _PS_SUPP_IMG_DIR_);
+			$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)
 				{
@@ -614,6 +619,35 @@ class LanguageCore extends ObjectModel
 		return Db::getInstance()->getValue('SELECT `language_code` FROM `'._DB_PREFIX_.'lang` WHERE `iso_code` = \''.pSQL(strtolower($iso_code)).'\'');
 	}

+	public static function getLanguageByIETFCode($code)
+	{
+		if (!Validate::isLanguageCode($code))
+			die(sprintf(Tools::displayError('Fatal error: IETF code %s is not correct'), $code));
+
+		// $code is in the form of 'xx-YY' where xx is the language code
+		// and 'YY' a country code identifying a variant of the language.
+		$lang_country = explode('-', $code);
+		// Get the language component of the code
+		$lang = $lang_country[0];
+
+		// Find the id_lang of the language.
+		// We look for anything with the correct language code
+		// and sort on equality with the exact IETF code wanted.
+		// That way using only one query we get either the exact wanted language
+		// or a close match.
+		$id_lang = Db::getInstance()->getValue(
+			'SELECT `id_lang` FROM ' 
+			.'`'._DB_PREFIX_.'lang` WHERE LEFT(`language_code`,2) = \''.pSQL($lang).'\' '
+			.'ORDER BY language_code = \''.pSQL($code).'\' DESC'
+		);
+
+		// Instantiate the Language object if we found it.
+		if ($id_lang)
+			return new Language($id_lang);
+		else
+			return false;
+	}
+
 	/**
 	  * Return array (id_lang, iso_code)
 	  *
@@ -683,26 +717,28 @@ class LanguageCore extends ObjectModel
 		if (Language::getIdByIso($iso_code))
 			return true;

+		// Initialize the language
 		$lang = new Language();
 		$lang->iso_code = $iso_code;
+		$lang->language_code = $iso_code;
 		$lang->active = true;

+		// If the language pack has not been provided, retrieve it from prestashop.com
 		if (!$lang_pack)
 			$lang_pack = Tools::jsonDecode(Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/get_language_pack.php?version='._PS_VERSION_.'&iso_lang='.$iso_code));

+		// If a language pack has been found or provided, prefill the language object with the value
 		if ($lang_pack)
-		{
-			if (isset($lang_pack->name)
-				&& isset($lang_pack->version)
-				&& isset($lang_pack->iso_code))
-					$lang->name = $lang_pack->name;
-		}
-		elseif ($params_lang !== null && is_array($params_lang))
+			foreach (get_object_vars($lang_pack) as $key => $value)
+				if ($key != 'iso_code' && isset(Language::$definition['fields'][$key]))
+					$lang->$key = $value;
+
+		// Use the values given in parameters to override the data retrieved automatically
+		if ($params_lang !== null && is_array($params_lang))
 			foreach ($params_lang as $key => $value)
-				$lang->$key = $value;
-		else
-			return false;
-		
+				if ($key != 'iso_code' && isset(Language::$definition['fields'][$key]))
+					$lang->$key = $value;
+
 		if (!$lang->add(true, false, $only_add))
 			return false;

@@ -720,7 +756,7 @@ class LanguageCore extends ObjectModel
 		}
 		else
 			Language::_copyNoneFlag((int)$lang->id);
-	
+
 		$files_copy = array(
 			'/en.jpg',
 			'/en-default-'.ImageType::getFormatedName('thickbox').'.jpg',
@@ -730,7 +766,7 @@ class LanguageCore extends ObjectModel
 			'/en-default-'.ImageType::getFormatedName('small').'.jpg',
 			'/en-default-'.ImageType::getFormatedName('scene').'.jpg'
 		);
-		
+
 		foreach (array(_PS_CAT_IMG_DIR_, _PS_MANU_IMG_DIR_, _PS_PROD_IMG_DIR_, _PS_SUPP_IMG_DIR_) as $to)
 			foreach ($files_copy as $file)
 				@copy(dirname(__FILE__).'/../img/l'.$file, $to.str_replace('/en', '/'.$iso_code, $file));
@@ -756,15 +792,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)
@@ -780,13 +819,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);
@@ -819,8 +867,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 (Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE') && $id_shop !== null)
-			$shop = new Shop($id_shop);
-		else
-			$shop = Context::getContext()->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);
+				$product = new Product($product['id_product'], false, $id_lang, $id_shop);
 			elseif ((int)$product)
-				$product = new Product((int)$product, false, $id_lang);
+				$product = new Product((int)$product, false, $id_lang, $id_shop);
 			else
 				throw new PrestaShopException('Invalid product vars');
 		}
@@ -163,11 +159,7 @@ class LinkCore
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;
 		
-		if ($id_shop === null)
-			$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($category))
 			$category = new Category($category, $id_lang);
@@ -206,11 +198,7 @@ class LinkCore
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;

-		if ($id_shop === null)
-			$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);

 		$dispatcher = Dispatcher::getInstance();
 		if (!is_object($cms_category))
@@ -239,19 +227,12 @@ class LinkCore
 	 * @param int $id_lang
 	 * @return string
 	 */
-	public function getCMSLink($cms, $alias = null, $ssl = false, $id_lang = null, $id_shop = null)
+	public function getCMSLink($cms, $alias = null, $ssl = null, $id_lang = null, $id_shop = null)
 	{
-		$base = (($ssl && $this->ssl_enable) ? 'https://' : 'http://');
-
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;
-		
-		if ($id_shop === null)
-			$shop = Context::getContext()->shop;
-		else
-			$shop = new Shop($id_shop);
-		$url = $base.$shop->domain.$shop->getBaseURI().$this->getLangLink($id_lang);

+		$url = $this->getBaseLink($id_shop, $ssl).$this->getLangLink($id_lang, null, $id_shop);

 		$dispatcher = Dispatcher::getInstance();
 		if (!is_object($cms))
@@ -290,11 +271,8 @@ class LinkCore
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;

-		if ($id_shop === null)
-			$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);
 		
 		$dispatcher = Dispatcher::getInstance();
 		if (!is_object($supplier))
@@ -327,11 +305,7 @@ class LinkCore
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;

-		if ($id_shop === null)
-			$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);

 		$dispatcher = Dispatcher::getInstance();
 		if (!is_object($manufacturer))
@@ -360,28 +334,23 @@ class LinkCore
 	 * @param int $id_lang
 	 * @return string
 	 */
-	public function getModuleLink($module, $controller = 'default', array $params = array(), $ssl = false, $id_lang = null, $id_shop = null)
+	public function getModuleLink($module, $controller = 'default', array $params = array(), $ssl = null, $id_lang = null, $id_shop = null)
 	{
-		$base = (($ssl && $this->ssl_enable) ? 'https://' : 'http://');
-
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;

-		if ($id_shop === null)
-			$shop = Context::getContext()->shop;
-		else
-			$shop = new Shop($id_shop);
-		$url = $base.$shop->domain.$shop->getBaseURI().$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, $id_shop))
 			return $this->getPageLink('module-'.$module.'-'.$controller, $ssl, $id_lang, $params);
 		else
+		{
+			// Set available keywords
+			$params['module'] = $module;
+			$params['controller'] = $controller ? $controller : 'default';		
 			return $url.Dispatcher::getInstance()->createUrl('module', $id_lang, $params, $this->allow, '', $id_shop);
+		}
 	}

 	/**
@@ -452,10 +421,18 @@ class LinkCore
 	 *
 	 * @return string Page link
 	 */
-	public function getPageLink($controller, $ssl = false, $id_lang = null, $request = null, $request_url_encode = false, $id_shop = null)
+	public function getPageLink($controller, $ssl = null, $id_lang = null, $request = null, $request_url_encode = false, $id_shop = null)
 	{
+		
+		//If $controller contains '&' char, it means that $controller contains request data and must be parsed first
+		$p = strpos($controller, '&');
+		if ($p !== false) {
+			$request = substr($controller, $p + 1);
+			$request_url_encode = false;
+			$controller = substr($controller, 0, $p);
+		}
+		
 		$controller = Tools::strReplaceFirst('.php', '', $controller);
-
 		if (!$id_lang)
 			$id_lang = (int)Context::getContext()->language->id;

@@ -468,16 +445,9 @@ class LinkCore
 			parse_str($request, $request);
 		}

-		if ($id_shop === null)
-			$shop = Context::getContext()->shop;
-		else
-			$shop = new Shop($id_shop);
-
 		$uri_path = Dispatcher::getInstance()->createUrl($controller, $id_lang, $request, false, '', $id_shop);
-		$url = ($ssl && $this->ssl_enable) ? 'https://' : 'http://';
-		$url .= $shop->domain.$shop->getBaseURI().$this->getLangLink($id_lang).ltrim($uri_path, '/');

-		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)
@@ -509,6 +479,7 @@ class LinkCore
 			unset($params['id_lang']);

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

@@ -524,12 +495,22 @@ 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);
 	}

 	public function goPage($url, $p)
 	{
+		$url = rtrim(str_replace('?&', '?', $url), '?');
 		return $url.($p == 1 ? '' : (!strstr($url, '?') ? '?' : '&amp;').'p='.(int)$p);
 	}

@@ -618,12 +599,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)
@@ -631,5 +612,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();
+	}
 }

@@ -63,6 +63,7 @@ class LocalizationPackCore

 			if ($install_mode && $res && isset($this->iso_currency))
 			{
+				Cache::clean('Currency::getIdByIsoCode_*');
 				$res &= Configuration::updateValue('PS_CURRENCY_DEFAULT', (int)Currency::getIdByIsoCode($this->iso_currency));
 				Currency::refreshCurrencies();
 			}
@@ -62,7 +62,7 @@ class	LoggerCore extends ObjectModel
 		'fields' => array(
 			'severity' => 		array('type' => self::TYPE_INT, 'validate' => 'isInt', 'required' => true),
 			'error_code' => 	array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
-			'message' => 		array('type' => self::TYPE_STRING, 'validate' => 'isMessage', 'required' => true),
+			'message' => 		array('type' => self::TYPE_STRING, 'validate' => 'isString', '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'),
@@ -149,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,10 +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)
+		$template_path = _PS_MAIL_DIR_, $die = false, $id_shop = null, $bcc = null)
 	{
 		$configuration = Configuration::getMultiple(array(
 			'PS_SHOP_EMAIL',
@@ -127,43 +128,56 @@ 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;
 				$addr = trim($addr);
 				if (!Validate::isEmail($addr))
 				{
 					Tools::dieOrLog(Tools::displayError('Error: invalid e-mail address'), $die);
 					return false;
 				}
+
 				if (is_array($to_name))
 				{
 					if ($to_name && is_array($to_name) && Validate::isGenericName($to_name[$key]))
 						$to_name = $to_name[$key];
 				}
-				if ($to_name == null)
-					$to_name = $addr;
-				/* Encode accentuated chars */
-				if (function_exists('mb_encode_mimeheader'))
-					$to_list->addTo($addr, mb_encode_mimeheader($to_name, 'utf-8'));
+
+				if ($to_name == null || $to_name == $addr)
+					$to_name = '';
 				else
-					$to_list->addTo($addr, '=?UTF-8?B?'.base64_encode($to_name).'?=');
+				{
+					if (function_exists('mb_encode_mimeheader'))
+						$to_name = mb_encode_mimeheader($to_name, 'utf-8');
+					else
+						$to_name = self::mimeEncode($to_name);
+				}
+
+				$to_list->addTo($addr, $to_name);
 			}
 			$to_plugin = $to[0];
-			$to = $to_list;
 		} else {
 			/* Simple recipient, one address */
 			$to_plugin = $to;
-			if ($to_name == null)
-				$to_name = $to;
-			if (function_exists('mb_encode_mimeheader'))
-				$to = new Swift_Address($to, mb_encode_mimeheader($to_name, 'utf-8'));
+			if ($to_name == null || $to_name == $to)
+				$to_name = '';
 			else
-				$to = new Swift_Address($to, '=?UTF-8?B?'.base64_encode($to_name).'?=');
+			{
+				if (function_exists('mb_encode_mimeheader'))
+					$to_name = mb_encode_mimeheader($to_name, 'utf-8');
+				else
+					$to_name = self::mimeEncode($to_name);
+			}
+
+			$to_list->addTo($to, $to_name);
 		}
+		if(isset($bcc)) {
+			$to_list->addBcc($bcc);
+		}
+		$to = $to_list;
 		try {
 			/* Connect with the appropriate configuration */
 			if ($configuration['PS_MAIL_METHOD'] == 2)
@@ -231,8 +245,13 @@ class MailCore
 					include_once($template_path.$iso.'/lang.php');
 			else if ($module_name && file_exists($theme_path.'mails/'.$iso.'/lang.php'))
 				include_once($theme_path.'mails/'.$iso.'/lang.php');
-			else
+			else if (file_exists(_PS_MAIL_DIR_.$iso.'/lang.php'))
 				include_once(_PS_MAIL_DIR_.$iso.'/lang.php');
+			else
+			{
+				Tools::dieOrLog(Tools::displayError('Error - The lang file is missing for :').' '.$iso, $die);
+				return false;
+			}

 			/* Create mail and attach differents parts */
 			$message = new Swift_Message('['.Configuration::get('PS_SHOP_NAME', null, null, $id_shop).'] '.$subject);
@@ -353,11 +372,11 @@ class MailCore

 		$file_core = _PS_ROOT_DIR_.'/mails/'.$iso_code.'/lang.php';
 		if (Tools::file_exists_cache($file_core) && empty($_LANGMAIL))
-			include_once($file_core);
+			include($file_core);

 		$file_theme = _PS_THEME_DIR_.'mails/'.$iso_code.'/lang.php';
 		if (Tools::file_exists_cache($file_theme))
-			include_once($file_theme);
+			include($file_theme);

 		if (!is_array($_LANGMAIL))
 			return (str_replace('"', '&quot;', $string));
@@ -381,4 +400,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;
+	}
 }
@@ -79,7 +79,7 @@ class ManufacturerCore extends ObjectModel

 			// Lang fields
 			'description' => 		array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml'),
-			'short_description' => 	array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml', 'size' => 254),
+			'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'),
@@ -37,9 +37,10 @@ class MediaCore
 		'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.autocomplete' => array('fileName' => 'jquery.ui.autocomplete.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.position', 'ui.menu'), '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'), 'theme' => true),
+		'ui.dialog' => array('fileName' => 'jquery.ui.dialog.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.position','ui.button'), 'theme' => true),
+		'ui.menu' => array('fileName' => 'jquery.ui.menu.min.js', 'dependencies' => array('ui.core', 'ui.widget', 'ui.position'), '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),
@@ -109,9 +110,10 @@ class MediaCore

 			// If the string is too big preg_replace return an error
 			// In this case, we don't compress the content
-			if (preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR)
+			if (function_exists('preg_last_error') && 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;
@@ -200,7 +202,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;
@@ -271,6 +273,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;
 	}

--- a/Show More
+++ b/Show More