// Development branch merged

Merge pull request #267 from dSkrbic/patch-1
// translations
2013-03-27 10:43:43 +01:00 · 2013-02-27 00:48:46 -08:00 · 2013-02-11 18:42:50 +01:00 · 2012-12-31 15:17:35 +01:00 · 2012-12-31 14:37:29 +01:00 · 2012-12-31 13:52:28 +01:00
1086 changed files with 14993 additions and 28078 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,15 +7,6 @@
 .DS_Store
 robots.txt
 sitemap.xml
-cache/cachefs/*
-!cache/cachefs/index.php
-download/*
-!download/index.php
-upload/*
-!upload/index.php
-admin-dev/autoupgrade/*
-admin-dev/backups/*
-!admin-dev/backups/index.php
 cache/smarty/cache/*
 !cache/smarty/cache/index.php
 cache/smarty/compile/*
@@ -25,7 +16,6 @@ cache/tcpdf/*
 !cache/tcpdf/index.php
 config/xml/*.xml
 config/settings.inc.php
-config/settings.old.php
 log/*.log
 img/*
 !img/index.php
@@ -37,71 +27,6 @@ tools/smarty*/compile/*.php
 override/classes/*.php
 themes/default/cache/*.js
 themes/default/cache/*.css
-themes/default/modules/*/*.php
-!themes/default/modules/*/index.php
-themes/default/lang/*.php
-!themes/default/lang/index.php
 modules/*/translations/*.php
 !modules/*/translations/index.php
-mails/*
-!mails/en
-modules/*/mails/*
-!modules/*/mails/en
-translations/*
-!translations/*.gzip
-modules/atos/*
-modules/addshoppers
-modules/alliedwallet
-modules/authorizeaim
-modules/autoupgrade
-modules/avalaratax
-modules/backwardcompatibility
-modules/canadapost
-modules/cloudcache
-modules/ebay
-modules/fedexcarrier
-modules/fianetfraud
-modules/fianetsceau
-modules/fidbag
-modules/firstdata
-modules/gadwords
-modules/gamification
-modules/ganalytics
-modules/gsitemap
-modules/hipay
-modules/iadvize
-modules/itembase
-modules/jirafe
-modules/kiala
-modules/kialasmall
-modules/klarnaprestashop
-modules/kwixo
-modules/livezilla
-modules/mailjet
-modules/merchantware
-modules/mobile_theme
-modules/mondialrelay
-modules/moneybookers
-modules/nqgatewayneteven
-modules/ogone
-modules/pagseguro
-modules/paypal
-modules/payulatam
-modules/prediggo
-modules/prestafraud
-modules/shipwire
-modules/shoppingfeedexport
-modules/shoppingfluxexport
-modules/socolissimo
-modules/stripejs
-modules/themeinstallator
-modules/tntcarrier
-modules/treepodia
-modules/trustedshops
-modules/trustly
-modules/twenga
-modules/upscarrier
-modules/uspscarrier
-modules/wexpay
-modules/yotpo
-modules/zingaya
+
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,5 +8,5 @@ All core files you commit in your pull request must have Open Software License (
 All modules files you commit in your pull request must have Academic Free License (AFL 3.0)  

 [1]: https://help.github.com/articles/using-pull-requests
-[2]: http://docs.prestashop.com/display/PS15/Coding+Standards
-[3]: http://docs.prestashop.com/display/PS15/How+to+write+a+commit+message
+[2]: http://docs.prestashop.com/display/PS15/Coding+Standard
+[3]: http://docs.prestashop.com/display/PS15/How+to+write+a+commit+message
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,140 +1,80 @@
- adonis karavokyros
- aFolletete
- Agence CINS
- aKorczak
- Alexander Otchenashev
- anat
- Andrew
- aNiassy
- antoniofr
- AntonLejon
- Arnaud Lemercier
- Axome
- Benjamin PONGY
- BigZ
- bLeveque
- bMancone
- bumbu
- Burhan
- Cédric Mouleyre
- Caleydon Media
- cam.lafit
- Captain FLAM
- Captain-FLAM
- ccauw
- ChristopheBoucaut
- cippest
- cmouleyre
- Corentin Delcourt
- Cosmin Hutanu
- Damien Metzger
- DamienMetzger
- Damon Skelhorn
- Daniel
- David Gasperoni
- Davy Rolink
- djfm
- dMetzger
- (d)oekia
- Dragan Skrbic
- DrÿSs'
- dreammeup
- DrySs
- dSevere
- Edouard Gaulué
- emily-d
- Fabio Chelly
- fBrignoli
- fram
- François Gaillard
- fSerny
- Gabriel Schwardy
- gBrunier
- gCharmes
- gPoulain
- Grégoire Bélorgey
- Gregory Roussac
- gRoussac
- Guillaume DELOINCE
- hAitmansour
- Ha!*!*y
- indesign47
- inem0o
- ivancasasempere
- Jérôme Nadaud
- jBreux
- jeromenadaud
- Jerome Nadaud
- jessylenne
- jmCollin
- jObregon
- Jonathan Danse
- joseantgv
- Kevin Granger
- kpodemski
- Krystian Podemski
- lBrieu
- lCherifi
- ldecoker
- lLefevre
- marcinsz101
- Marco Cervellin
- Mats Rynge
- MatthieuB
- Maxence
- mBertholino
- mDeflotte
- Michel Courtade
- Milow
- minic studio
- misthero
- mMarinetti
- montes
- nezenmoins
- Nicolas Sorosac
- Nils-Helge Garli Hegvik
- nPellicari
- nturato
- oleacorner
- Otto Nascarella
- Patanock
- PhpMadman
- Pierre
- Piotr Kaczor
- Piotr Moćko
- PrestaEdit
- prestarocket
- pxls
- Rémi Gaillard
- Raphaël Malié
- raulgundin
- rGaillard
- Rimas Kudelis
- rMalie
- rMontagne
- root
- runningz
- Sébastien
- Sébastien Bocahu
- Samy Rabih
- Sarah Lorenzini
- Seb
- Seynaeve
- Shagshag
- sLorenzini
- soware
- Staging
- sThiebaut
- Sylvain WITMEYER
- tDidierjean
- vAugagneur
- vChabot
- Vincent Augagneur
- Vincent Schoener
- Vincent Terenti
- vinvin27
- vKham
- vSchoener
- Xavier
- Xavier POITAU
- Yoozio
+	- (d)oekia
+	- Alexander Otchenashev
+	- Benjamin PONGY
+	- Burhan
+	- Caleydon Media
+	- Damien Metzger
+	- DamienMetzger
+	- Damon Skelhorn
+	- Daniel
+	- David Gasperoni
+	- DrySs
+	- DrÿSs'
+	- François Gaillard
+	- Gabriel Schwardy
+	- Gregory Roussac
+	- Ha!*!*y
+	- Jonathan Danse
+	- Krystian Podemski
+	- Marco Cervellin
+	- Michel Courtade
+	- Milow
+	- Patanock
+	- Pierre
+	- PrestaEdit
+	- Raphaël Malié
+	- Rémi Gaillard
+	- Samy Rabih
+	- Sarah Lorenzini
+	- Shagshag
+	- Vincent Augagneur
+	- Xavier POITAU
+	- aFolletete
+	- aKorczak
+	- aNiassy
+	- adonis karavokyros
+	- anat
+	- bLeveque
+	- bMancone
+	- bumbu
+	- cmouleyre
+	- dMetzger
+	- dSevere
+	- djfm
+	- fBrignoli
+	- fSerny
+	- fram
+	- gBrunier
+	- gCharmes
+	- gPoulain
+	- gRoussac
+	- hAitmansour
+	- ivancasasempere
+	- jBreux
+	- jObregon
+	- jessylenne
+	- jmCollin
+	- kpodemski
+	- lBrieu
+	- lCherifi
+	- lLefevre
+	- mBertholino
+	- mDeflotte
+	- mMarinetti
+	- marcinsz101
+	- montes
+	- nPellicari
+	- nezenmoins
+	- oleacorner
+	- rGaillard
+	- rMalie
+	- rMontagne
+	- root
+	- sLorenzini
+	- sThiebaut
+	- tDidierjean
+	- vAugagneur
+	- vChabot
+	- vKham
+	- vSchoener
+
--- a/address.php
+++ b/address.php
@@ -34,4 +34,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();

-Tools::redirect('index.php?controller=address'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
+Tools::redirect('index.php?controller=address'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
--- a/addresses.php
+++ b/addresses.php
@@ -34,4 +34,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();

-Tools::redirect('index.php?controller=addresses'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
+Tools::redirect('index.php?controller=addresses'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
--- a/admin-dev/ajaxfilemanager/ajax_file_upload.php
+++ b/admin-dev/ajaxfilemanager/ajax_file_upload.php
@@ -60,7 +60,7 @@
 									$tem[$k] = $v;
 								}
 								
-								$tem['path'] = addslashes(backslashToSlash($path));
+								$tem['path'] = backslashToSlash($path);		
 								$tem['type'] = "file";
 								$tem['size'] = transformFileSize($tem['size']);
 								$tem['ctime'] = date(DATE_TIME_FORMAT, $tem['ctime']);
@@ -73,7 +73,7 @@
 										$info .= sprintf(", %s:'%s'", $k, $v);									
 								}

-								$info .= sprintf(", url:'%s'",  addslashes(getFileUrl($path)));
+								$info .= sprintf(", url:'%s'",  getFileUrl($path));
 								$info .= sprintf(", tipedit:'%s'",  TIP_DOC_RENAME);		

 																				
--- a/admin-dev/ajaxfilemanager/ajax_get_file_listing.php
+++ b/admin-dev/ajaxfilemanager/ajax_get_file_listing.php
@@ -99,9 +99,9 @@
 				{
 					$v = transformFileSize($v);
 				}
-				echo (($j++ > 1)?",":'') . "'" . addslashes($k) . "':'" . addslashes($v) . "'";
+				echo (($j++ > 1)?",":'') . "'" . $k . "':'" . $v . "'";
 			}
-			echo (($j++ > 1)?",":'') . "'url':'" . addslashes(getFileUrl($file['path'])) . "'";
+			echo (($j++ > 1)?",":'') . "'url':'" . getFileUrl($file['path']) . "'";
 			echo "}\n";				
 		}
 		echo  "};</script>\n";
--- a/admin-dev/ajaxfilemanager/inc/class.file.php
+++ b/admin-dev/ajaxfilemanager/inc/class.file.php
@@ -33,15 +33,15 @@
 					$this->fileInfo['atime'] = $this->fileStat[8];
 					$this->fileInfo['ctime'] = $this->fileStat[10];	
 					$this->fileInfo['mtime'] = $this->fileStat[9];
-					$this->fileInfo['path'] = addslashes($path);
-					$this->fileInfo['name'] = addslashes(basename($path));
+					$this->fileInfo['path'] = $path;
+					$this->fileInfo['name'] = basename($path);	
 					$this->fileInfo['is_writable'] = $this->isWritable();
 					$this->fileInfo['is_readable'] = $this->isReadable();
 				}elseif(is_dir($this->filePath))
 				{
 					$this->fileStat = @stat($path);
-					$this->fileInfo['name'] = addslashes(basename($path));
-					$this->fileInfo['path'] = addslashes($path);
+					$this->fileInfo['name'] = basename($path);
+					$this->fileInfo['path'] = $path;
 					$this->fileInfo['atime'] = $this->fileStat[8];
 					$this->fileInfo['ctime'] = $this->fileStat[10];	
 					$this->fileInfo['mtime'] = $this->fileStat[9];
--- a/admin-dev/drawer.php
+++ b/admin-dev/drawer.php
@@ -37,6 +37,7 @@ $height = Tools::getValue('height');
 $id_employee = Tools::getValue('id_employee');
 $id_lang = Tools::getValue('id_lang');

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

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

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

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

-echo '				| <a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">'.Translate::getAdminTranslation('Contact').'</a>
-					| <a href="http://forge.prestashop.com" target="_blank" class="footer_link">'.Translate::getAdminTranslation('Bug Tracker').'</a>
-					| <a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">'.Translate::getAdminTranslation('Forum').'</a>	
+echo '				| <a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">'.translate('Contact').'</a>
+					| <a href="http://forge.prestashop.com" target="_blank" class="footer_link">'.translate('Bug Tracker').'</a>
+					| <a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">'.translate('Forum').'</a>	
 				</div>
 			</div>
 		</div>
--- a/admin-dev/functions.php
+++ b/admin-dev/functions.php
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
-require_once(dirname(__FILE__).'/../images.inc.php');
+
 function bindDatepicker($id, $time)
 {
 	if ($time)
@@ -223,16 +223,8 @@ function checkPSVersion()
 	return $upgrader->checkPSVersion();
 }

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

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

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


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

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

 define('_PS_ADMIN_DIR_', getcwd());
-require(_PS_ADMIN_DIR_.'/../config/config.inc.php');
+require(_PS_ADMIN_DIR_.'/config/config.inc.php');
 Controller::getController('GetFileController')->run();
--- a/admin-dev/grider.php
+++ b/admin-dev/grider.php
@@ -50,53 +50,6 @@ if (!Validate::isModuleName($module))
 if (!Tools::file_exists_cache($module_path = dirname(__FILE__).'/../modules/'.$module.'/'.$module.'.php'))
 	die(Tools::displayError());

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

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

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

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

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

-.icon {vertical-align:middle}
-.icon-top {vertical-align:top}
-
 /*BUTTON*/
 .button{
 	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;
-	border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;margin: 0;outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap; text-shadow:0 1px 0 #fff;}
+	border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;margin: 0; outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap; text-shadow:0 1px 0 #fff;}
 .button[disabled=disabled]{color:#8C8C8C}
 .button.bt-icon { display:inline-block; margin-bottom:7px;}
 .button.bt-icon span {padding-left:5px;}
@@ -121,8 +118,6 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #menu .submenu li{list-style:none;margin:0;padding:0;display:block;min-width:150px;}
 #header #menu .submenu li a{ font-size:12px;display:block;padding: 5px 15px 5px 10px; color:#666666;border-top:1px solid #fff; border-bottom:1px solid #ccc;}
 #header #menu .submenu li a:hover { background-color:#eee; text-shadow:0 1px 0 #fff;}
-#header #menu .submenu li.active a { color: #fff;}
-#header #menu .submenu li.active a:hover { color:#666666}

 /*SEPARATION*/
 .separation { background-color:#ccc;border-bottom:1px solid #fff; width:100%; height:1px; margin:10px 0;}
@@ -537,7 +532,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 	margin:0;
 	white-space: nowrap;
 	overflow: auto;
-	height: 370px;
+	height: 335px;
 }
 #modules_list_container_tab #modules_list_container_content li{display:inline-block;}
 #modules_list_container_tab table tr th { height:40px;}
@@ -553,7 +548,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #modules_list_container_tab .moduleDesc .metadata dl dd { padding-right:10px;}
 #modules_list_container_tab .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
 #modules_list_container_tab .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic;  font-size:12px; text-align: left;white-space: normal;}
-#modules_list_container_tab .setup  {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; padding:0 10px; display: inline-block; border-radius:3px;}
+#modules_list_container_tab .setup  {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; padding:2px 10px; display: inline-block; border-radius:3px;}
 #modules_list_container_tab .row-actions-module {float: right;}
 #modules_list_container_tab .setup.non-install { background-color:#ec7000;}
 #modules_list_container_tab .setup.must-have { background-color: #ec7000;}
@@ -567,8 +562,8 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #modules_list_container_tab ul.listing-grid-module li select { position:absolute; top:0; right:0px; }

 .default_modules_list_display_type #modules_list_container_content li table tr td{border: none}
-.default_modules_list_display_type #modules_list_container_content li table {border:solid 1px #ccc;height:105px;width:100%;margin-bottom:10px}
-#modules_list_container_tab ul li {height:105px}
+.default_modules_list_display_type #modules_list_container_content li table {border: solid 1px #ccc; height: 140px;width: 100%;margin-bottom:15px}
+#modules_list_container_tab ul li {height:140px}

 		/******** ie7 ******/
 		.ie7 #modules_list_container_tab #modules_list_container_content li{zoom:1;display:inline;}
@@ -669,8 +664,4 @@ ul.listForm li {padding-bottom:3px;}
 /******** CREATE AN ORDER **************/

 #carrier_form label{padding-top:0}
-#carrier_form input{margin-top:3px}
-
-/************** SCENE *****************/
-
-#large_scene_image{clear:both;border:1px solid transparent;}
+#carrier_form input{margin-top:3px}
--- a/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
@@ -49,12 +49,10 @@

 			if (perm == 'all' && $(this).parent().parent().hasClass('parent'))
 			{
-				if (enabled)
-					$(this).parent().parent().parent().find('.child-'+id_tab+' input[type=checkbox]').attr('checked', 'checked');
-				else
-					$(this).parent().parent().parent().find('.child-'+id_tab+' input[type=checkbox]').removeAttr('checked');
+				checked = enabled ? 'checked': '';
+				$(this).parent().parent().parent().find('.child-'+id_tab+' input[type=checkbox]').attr('checked', checked);
 				$.ajax({
-					url: "{$link->getAdminLink('AdminAccess')|addslashes}",
+					url: "{$link->getAdminLink('AdminAccess')}",
 					cache: false,
 					data : {
 						ajaxMode : '1',
@@ -70,12 +68,15 @@
 					},
 					success : function(res,textStatus,jqXHR)
 					{
-						try {
+						try
+						{
 							if (res == 'ok')
 								showSuccessMessage("{l s='Update successful'}");
 							else
 								showErrorMessage("{l s='Update error'}");
-						} catch(e) {
+						}
+						catch(e)
+						{
 							jAlert('Technical error');
 						}
 					}
@@ -84,7 +85,7 @@
 			perfect_access_js_gestion(this, perm, id_tab, tabsize, tabnumber, table);

 			$.ajax({
-				url: "{$link->getAdminLink('AdminAccess')|addslashes}",
+				url: "{$link->getAdminLink('AdminAccess')}",
 				cache: false,
 				data : {
 					ajaxMode : '1',
@@ -133,7 +134,7 @@
 				});

 			$.ajax({
-				url: "{$link->getAdminLink('AdminAccess')|addslashes}",
+				url: "{$link->getAdminLink('AdminAccess')}",
 				cache: false,
 				data : {
 					ajaxMode: '1',
@@ -302,7 +303,7 @@
 											{assign var=is_child value=true}
 											{assign var=result_accesses value=0}
 											<tr class="child-{$child.id_parent}">
-												<td{if !$is_child} class="bold"{/if}>{if $is_child} &raquo; {/if}{$child.name}</td>
+												<td{if !$is_child} class="bold"{/if}>{if $is_child} &raquo; {/if}<strong>{$child.name}</strong></td>
 												{foreach $perms as $perm}
 													{if $access_edit == 1}
 														<td>
--- a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
@@ -27,7 +27,13 @@

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

 	{if $input.type == 'text_customer' && !isset($customer)}
--- a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
@@ -27,10 +27,7 @@

 {block name="label"}
 	{if $input.type == 'color'}
-		<div id="colorAttributeProperties" style="display:{if $colorAttributeProperties}block{else}none{/if};">
-	{/if}
-	{if $input.type == 'closediv'}
-		</div>
+		<div id="colorAttributeProperties" style="display:{if $colorAttributeProperties}block{else}none{/if}";>
 	{/if}
 	{$smarty.block.parent}
 {/block}
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
@@ -1,58 +0,0 @@
-{*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*	@author PrestaShop SA <contact@prestashop.com>
-*	@copyright	2007-2013 PrestaShop SA
-*	@license		http://opensource.org/licenses/afl-3.0.php	Academic Free License (AFL 3.0)
-*	International Registered Trademark & Property of PrestaShop SA
-*}
-{extends file="helpers/form/form.tpl"}
-{block name="script"}
-	var string_price = '{l s='Will be applied when the price is' js=1}';
-	var string_weight = '{l s='Will be applied when the weight is' js=1}';
-{/block}
-
-{block name="field"}
-	{if $input.name == 'zones'}
-		<div class="ranges_not_follow warn" style="display:none">
-			<label>{l s="Ranges are not correctly ordered:"}</label>
-			<a href="#" onclick="checkRangeContinuity(true); return false;" class="button" style="text-decoration:none">{l s="Reordering"}</a>
-		</div>
-		{include file='controllers/carrier_wizard/helpers/form/form_ranges.tpl'}
-		<!--
-<div class="validate_range" style="display:none">
-			<a href="#" class="button" id="validate_range_button">{l s="Validate"}</a>
-		</div>
-->
-		<div class="new_range">
-			<a href="#" onclick="add_new_range();return false;" class="button" id="add_new_range">{l s='Add new range'}</a>
-		</div>
-	{/if}
-	{if $input.name == 'logo'}
-		<div class="margin-form">
-			<input id="carrier_logo_input" type="file" onchange="uploadCarrierLogo();" name="carrier_logo_input" />
-			<input type="hidden" id="logo" name="logo" value="" />
-			<p class="preference_description">
-				{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"} {l s='MB max.'}
-				<br />{l s='Current size:'} <span id="carrier_logo_size">{l s='undefined'}</span>.
-			</p>
-		</div>
-	{/if}
-	{$smarty.block.parent}
-{/block}
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
@@ -1,61 +0,0 @@
-		<script>var zones_nbr = {$zones|count +3} ; /*corresponds to the third input text (max, min and all)*/</script>
-		<div style="float:left" id="zone_ranges">
-			<table cellpadding="5" cellspacing="0" id="zones_table">
-				<tr class="range_inf">
-					<td class="range_type"></td>
-					<td class="border_left border_bottom range_sign">>=</td>
-					{foreach from=$ranges key=r item=range}
-						<td class="border_bottom center"><input name="range_inf[{$range.id_range|intval}]" type="text" value="{$range.delimiter1|string_format:"%.6f"}" /><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
-					{foreachelse}
-						<td class="border_bottom center"><input name="range_inf[{$range.id_range|intval}]" type="text" /><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
-					{/foreach}
-				</tr>
-				<tr class="range_sup">
-					<td class="center range_type"></td>
-					<td class="border_left range_sign"><</td>
-					{foreach from=$ranges key=r item=range}
-						<td class="center"><input name="range_sup[{$range.id_range|intval}]" type="text" {if isset($form_id) && !$form_id} value="" {else} value="{if isset($change_ranges) && $range.id_range == 0} {else}{$range.delimiter2|string_format:"%.6f"}{/if}" {/if}/><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
-					{foreachelse}
-						<td class="center"><input name="range_sup[{$range.id_range|intval}]" type="text" /><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
-					{/foreach}
-				</tr>
-				<tr class="fees_all">
-					<td class="border_top border_bottom border_bold"><span class="fees_all" {if $ranges|count == 0}style="display:none" {/if}>All</span></td>
-					<td><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>
-						</td>
-					{foreachelse}
-						<td class="center border_top border_bottom">
-							<input style="display:none" type="text"  /><span class="currency_sign" style="display:none">&nbsp; {$currency_sign}</span>
-						</td>
-					{/foreach}
-				</tr>
-				{foreach from=$zones key=i item=zone}
-				<tr class="fees {if $i is odd}alt_row{/if}" data-zoneid="{$zone.id_zone}">
-					<td><label for="zone_{$zone.id_zone}">{$zone.name}</label></td>
-					<td class="zone">
-						<input class="input_zone" id="zone_{$zone.id_zone}" name="zone_{$zone.id_zone}" value="1" type="checkbox" {if isset($fields_value['zones'][$zone.id_zone]) && $fields_value['zones'][$zone.id_zone]} checked="checked"{/if}/>
-					</td>
-					{foreach from=$ranges key=r item=range}
-						<td class="center">
-							<input name="fees[{$zone.id_zone|intval}][{$range.id_range|intval}]" type="text" 
-							{if !isset($fields_value['zones'][$zone.id_zone]) || (isset($fields_value['zones'][$zone.id_zone]) && !$fields_value['zones'][$zone.id_zone])} disabled="disabled"{/if} {if isset($price_by_range[$range.id_range][$zone.id_zone]) && $price_by_range[$range.id_range][$zone.id_zone] && isset($fields_value['zones'][$zone.id_zone]) && $fields_value['zones'][$zone.id_zone]} value="{$price_by_range[$range.id_range][$zone.id_zone]|string_format:'%.6f'}" {else} value="" {/if} /> &nbsp; {$currency_sign}
-						</td>
-					{/foreach}
-				</tr>
-				{/foreach}
-				<tr class="delete_range">
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					{foreach from=$ranges name=ranges key=r item=range}
-						{if $smarty.foreach.ranges.first}
-							<td class="center">&nbsp;</td>
-						{else}
-							<td class="center"><button class="button">{l s='Delete'}</button</td>
-						{/if}
-					{/foreach}
-				</tr>
-			</table>
-		</div>
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/index.php
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/index.php
@@ -1,35 +0,0 @@
-<?php
-/*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy 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/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../../');
-exit;
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/index.php
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/index.php
@@ -1,35 +0,0 @@
-<?php
-/*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy 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/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../');
-exit;
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/index.php
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/index.php
@@ -1,35 +0,0 @@
-<?php
-/*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy 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/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../../');
-exit;
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
@@ -1,66 +0,0 @@
-{*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*	@author PrestaShop SA <contact@prestashop.com>
-*	@copyright	2007-2013 PrestaShop SA
-*	@license		http://opensource.org/licenses/afl-3.0.php	Academic Free License (AFL 3.0)
-*	International Registered Trademark & Property of PrestaShop SA
-*}
-
-{extends file="helpers/view/view.tpl"}
-{block name="override_tpl"}
-<script>
-	var labelNext = '{$labels.next|addslashes}';
-	var labelPrevious = '{$labels.previous|addslashes}';
-	var	labelFinish = '{$labels.finish|addslashes}';
-	var	labelDelete = '{l s='Delete' js=1}';
-	var	labelValidate = '{l s='Validate' js=1}';
-	var validate_url = '{$validate_url|addslashes}';
-	var carrierlist_url = '{$carrierlist_url|addslashes}';
-	var nbr_steps = {$wizard_steps.steps|count};
-	var enableAllSteps = {if $enableAllSteps|intval == 1}true{else}false{/if};
-	var need_to_validate = '{l s='Please validate the last range before create a new one.' js=1}';
-	var delete_range_confirm = '{l s='Are you sure to delete this range ?' js=1}';
-	var currency_sign = '{$currency_sign}';
-	var PS_WEIGHT_UNIT = '{$PS_WEIGHT_UNIT}';
-	var invalid_range = '{l s='This range is not valid' js=1}';
-	var range_is_overlapping = '{l s='Ranges are overlapping' js=1}';
-	var multistore_enable = '{$multistore_enable}';
-</script>
-<div id="carrier_wizard" class="swMain">
-	<ul class="nbr_steps_{$wizard_steps.steps|count}">
-	{foreach from=$wizard_steps.steps key=step_nbr item=step}
-		<li>
-			<a href="#step-{$step_nbr + 1}">
-				<label class="stepNumber">{$step_nbr + 1}</label>
-				<span class="stepDesc">
-					{$step.title}<br />
-					{if isset($step.desc)}<small>{$step.desc}</small>{/if}
-				</span>
-			</a>
-		</li>
-	{/foreach}
-	</ul>
-	{foreach from=$wizard_contents.contents key=step_nbr item=content}
-		<div id="step-{$step_nbr + 1}" class="step_container"> 	
-			{$content}
-		</div>
-	{/foreach}
-</div>
-{/block}
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl
@@ -1,91 +0,0 @@
-{*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*	@author PrestaShop SA <contact@prestashop.com>
-*	@copyright	2007-2013 PrestaShop SA
-*	@license		http://opensource.org/licenses/afl-3.0.php	Academic Free License (AFL 3.0)
-*	International Registered Trademark & Property of PrestaShop SA
-*}
-
-<div id="carrier_logo_block">
-	<img id="carrier_logo_img" src="{if $carrier_logo}{$carrier_logo}{else}../img/admin/carrier-default.jpg{/if}" />
-	<br/>
-	<a id="carrier_logo_remove" {if !$carrier_logo}style="display:none"{/if} href="javascript:removeCarrierLogo();"><img src="../img/admin/disabled.gif" /> {l s='Remove the logo'}</a>
-</div>
-
-<script type="text/javascript">
-	var carrier_translation_undefined = '{l s='undefined' js=1}';
-
-	function removeCarrierLogo()
-	{
-		$('#carrier_logo_img').attr('src', '../img/admin/carrier-default.jpg');
-		$('#logo').val('null');
-		fixCarrierLogoDisplay();
-		$('#carrier_logo_remove').hide();
-	}
-	
-	function uploadCarrierLogo()
-	{
-		$.ajaxFileUpload({
-			url: 'ajax-tab.php?tab=AdminCarrierWizard&token={$token|addslashes}&action=uploadLogo',
-			secureuri: false,
-			fileElementId: 'carrier_logo_input',
-			dataType: 'xml',
-			success: function (data, status) {
-				data = data.getElementsByTagName('return')[0];
-				var message = data.getAttribute("message");
-				if (data.getAttribute("result") == "success")
-				{
-					$('#carrier_logo_img').attr('src', message);
-					$('#logo').val(message);
-					$('#carrier_logo_remove').show();
-					fixCarrierLogoDisplay();
-				}
-				else
-					alert(message);
-			}
-		});
-	}
-	
-	function fixCarrierLogoDisplay()
-	{
-		$('<img/>').attr('src', $('#carrier_logo_img').attr('src')).load(function(){
-			var maxHeight = 200;
-			var maxWidth = 200;
-			var res = this.width / this.height;
-			$('#carrier_logo_size').text(this.width + 'x' + this.height + ' px');
-			$('#carrier_logo_img').width(this.width);
-			$('#carrier_logo_img').height(this.height);
-			if ($('#carrier_logo_img').width() > maxWidth)
-			{
-				$('#carrier_logo_img').width(maxWidth);
-				$('#carrier_logo_img').height(maxWidth / res);
-			}
-			if ($('#carrier_logo_img').height() > maxHeight)
-			{
-				$('#carrier_logo_img').height(maxHeight);
-				$('#carrier_logo_img').width(maxHeight * res);
-			}
-			if ($('#logo').val() == 'null')
-				$('#carrier_logo_size').text(carrier_translation_undefined);
-		});
-	}
-	
-	fixCarrierLogoDisplay();
-</script>
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
@@ -1,68 +0,0 @@
-{*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*	@author PrestaShop SA <contact@prestashop.com>
-*	@copyright	2007-2013 PrestaShop SA
-*	@license		http://opensource.org/licenses/afl-3.0.php	Academic Free License (AFL 3.0)
-*	International Registered Trademark & Property of PrestaShop SA
-*}
-
-<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 delivery announced is: @s2.' js=1}';
-	var summary_translation_free = '<strong>{l s='free' js=1}</strong>';
-	var summary_translation_paid = '<strong>{l s='not free' js=1}</strong>';
-	var summary_translation_range = '<span class="is_free">{l s='This carrier can deliver orders from @s1 to @s2.' js=1}</span>';
-	var summary_translation_range_limit =  '{l s='If the order is out of range, the behavior is to @s3.' js=1}';
-	var summary_translation_shipping_cost = '{l s='The shipping cost is calculated @s1 and the tax rule @s2 will be applied.' js=1}';
-	var summary_translation_price = '<strong>{l s='according to the price' js=1}</strong>';
-	var summary_translation_weight = '<strong>{l s='according to the weight' js=1}</strong>';
-</script>
-<div class="defaultForm">
-	<fieldset>
-		{l s='Carrier name:'} <strong id="summary_name"></strong>
-		<div class="clear">&nbsp;</div>
-		<div id="summary_meta_informations"></div>
-		<div class="clear">&nbsp;</div>
-		<div id="summary_shipping_cost"></div>
-		<div class="clear">&nbsp;</div>
-		<div id="summary_range"></div>
-		<div class="clear">&nbsp;</div>
-		<div>
-			{l s='This carrier will be proposed for those delivery zones:'}
-			<ul id="summary_zones"></ul>
-		</div>
-		<div class="clear">&nbsp;</div>
-		<div>
-			{l s='And it will be proposed for those client groups:'}
-			<ul id="summary_groups"></ul>
-		</div>
-		{if $is_multishop}
-		<div class="clear">&nbsp;</div>
-		<div>
-			{l s='Finally, this carrier will be proposed in those shops:'}
-			<ul id="summary_shops"></ul>
-		</div>
-		{/if}
-		<div class="clear">&nbsp;</div>
-		{$active_form}
-	</fieldset>
-	</div>
-<div class="clear">&nbsp;</div>
-
--- a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
@@ -207,12 +207,12 @@
 <br />
 <input type="checkbox" id="product_restriction" name="product_restriction" value="1" {if $product_rule_groups|@count}checked="checked"{/if} /> <strong>{l s='Product selection'}</strong>
 <div id="product_restriction_div">
-	<table id="product_rule_group_table" style="border:1px solid #AAAAAA;margin:10px 0 10px 0;padding:10px 10px 10px 10px;background-color:#FFF5D3;width:600px;display:none" cellpadding="0" cellspacing="0">
+	<table id="product_rule_group_table" style="border:1px solid #AAAAAA;margin:10px 0 10px 0;padding:10px 10px 10px 10px;background-color:#FFF5D3;width:600px" cellpadding="0" cellspacing="0">
 		{foreach from=$product_rule_groups item='product_rule_group'}
 			{$product_rule_group}
 		{/foreach}
 	</table>
-	<a href="javascript:addProductRuleGroup();" style="margin-top:5px;display:block">
+	<a href="javascript:addProductRuleGroup();">
 		<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" /> {l s='Product selection'}
 	</a>
 </div>
--- a/admin-dev/themes/default/template/controllers/cart_rules/form.js
+++ b/admin-dev/themes/default/template/controllers/cart_rules/form.js
@@ -25,7 +25,6 @@

 function addProductRuleGroup()
 {
-	$('#product_rule_group_table').show();
 	product_rule_groups_counter += 1;
 	product_rule_counters[product_rule_groups_counter] = 0;

@@ -85,13 +84,6 @@ function addCartRuleOption(item)

 function updateProductRuleShortDescription(item)
 {
-	/******* For IE: put a product in condition on cart rules *******/
-	if(typeof String.prototype.trim !== 'function') {
-	  String.prototype.trim = function() {
-		return this.replace(/^\s+|\s+$/g, ''); 
-	  }
-	}
-
 	var id1 = $(item).attr('id').replace('_add', '').replace('_remove', '');
 	var id2 = id1.replace('_select', '');
 	var length = $('#' + id1 + '_2 option').length;
--- a/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
@@ -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}
--- a/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
@@ -33,9 +33,9 @@
 			&nbsp;<img src="../img/admin/home.gif" alt="" />
 			{assign var=params_url value=""}
 		{else}
-			{assign var=params_url value="&id_category={$category.id_category|intval}&viewcategory"}
+			{assign var=params_url value="&id_category={$category.id_category}&viewcategory"}
 		{/if}
-		{if $category.id_category == $categories_tree_current_id}
+		{if $key == 0}
 			{$category.name}
 		{else}
 			<a href="{$currentIndex}{$params_url}&token={$token}">{$category.name}</a>&nbsp;>&nbsp;
@@ -43,7 +43,7 @@
 	{/foreach}
 </div>
 	{if isset($delete_category) && $delete_category}
-		<form action="{$REQUEST_URI|escape:'htmlall':'UTF-8'}" method="post">
+		<form action="{$REQUEST_URI}" method="post">
 			<div class="warn">
 				<h2>
 					{if $need_delete_mode}
@@ -74,10 +74,10 @@
 					{if $key != 'deleteMode'}
 						{if is_array($value)}
 							{foreach $value as $val}
-								<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}[]" value="{$val|escape:'htmlall':'UTF-8'}" />
+								<input type="hidden" name="{$key}[]" value="{$val}" />
 							{/foreach}
 						{else}
-							<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}" value="{$value|escape:'htmlall':'UTF-8'}" />
+							<input type="hidden" name="{$key}" value="{$value}" />
 						{/if}
 					{/if}
 				{/foreach}
--- a/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
@@ -48,21 +48,6 @@
 		</div>
 	{else}
 		{$smarty.block.parent}
-	{/if}		
-{/block}
-{block name="label"}
-	{if $input.name == 'standardization'}
-		<div id="TAASC" style="display: none;">{$smarty.block.parent}
-	{else}
-		{$smarty.block.parent}
-	{/if}
-{/block}
-
-{block name="input"}
-	{if $input.name == 'standardization'}
-		{$smarty.block.parent}</div>
-	{else}
-		{$smarty.block.parent}
 	{/if}
 {/block}

@@ -100,11 +85,7 @@
 		$('#need_zip_code_on, #need_zip_code_off').change(function() {
 			disableZipFormat();
 		});
-		
-		$('#iso_code').change(function() {
-			disableTAASC();
-		});				
-		disableTAASC();
+
 	});

 	function switchExplanationText(text) {
--- a/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
@@ -35,7 +35,7 @@
 {/block}
 {block name=leadin}
 	{if isset($delete_customer) && $delete_customer}
-		<form action="{$REQUEST_URI|escape:'htmlall':'UTF-8'}" method="post">
+		<form action="{$REQUEST_URI}" method="post">
 			<div class="warn">
 				<h2>{l s='How do you want to delete these customer(s)?'}</h2>
 				<p>{l s='There are two ways of deleting a customer. Please choose your preferred method.'}</p>
@@ -52,10 +52,10 @@
 				{foreach $POST as $key => $value}
 					{if is_array($value)}
 						{foreach $value as $val}
-							<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}[]" value="{$val|escape:'htmlall':'UTF-8'}" />
+							<input type="hidden" name="{$key}[]" value="{$val}" />
 						{/foreach}
 					{else}
-						<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}" value="{$value|escape:'htmlall':'UTF-8'}" />
+						<input type="hidden" name="{$key}" value="{$value}" />
 					{/if}
 				{/foreach}
 				<br /><input type="submit" class="button" value="{l s='Delete'}" />
--- a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
@@ -149,7 +149,7 @@
 	</div>
 	
 	<div style="width:50%;float:left;">
-		<div style="margin-left:15px;">
+		<div style="margin-left:15px;"
 			<h2>{l s='Vouchers'} ({count($discounts)})</h2>
 			{if count($discounts)}
 				<table cellspacing="0" cellpadding="0" class="table">
@@ -488,4 +488,4 @@
 	</div>
 {/block}
 </div>	
-<div class="clear">&nbsp;</div>
+<div class="clear">&nbsp;</div>
--- a/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
@@ -60,7 +60,7 @@
 			ifSuperAdmin($(this));

 			$.ajax({
-				url: "{$link->getAdminLink('AdminEmployees')|addslashes}",
+				url: "{$link->getAdminLink('AdminEmployees')}",
 				cache: false,
 				data : {
 					ajax : '1',
--- a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
@@ -106,61 +106,63 @@
 				if ($(this).attr('name') == 'category_reduction['+$('[name="id_category"]:checked').val()+']')
 				{
 					exist = true;
-					jAlert('{l s='This category already exists for this group.' js=1}');
+					jAlert('{l s='This category already exists for this group.'}');
 					return false;
 				}
+				
 			});
 			
 			if (exist)
 				return;
 			$.ajax({
-				type:"POST",
-				url: "ajax-tab.php",
-				async: true,
-				dataType: "json",
-				data : {
-					ajax: "1",
-					token: "{getAdminToken tab='AdminGroups'}",
-					controller: "AdminGroups",
-					action: "addCategoryReduction",
-					category_reduction: $('#category_reduction_fancybox').val() ,
-					id_category: $('[name="id_category"]:checked').val()
-				},
-				success : function(jsonData) {
-					if (jsonData.hasError)
+					type:"POST",
+					url: "ajax-tab.php",
+					async: true,
+					dataType: "json",
+					data : {
+						ajax: "1",
+						token: "{getAdminToken tab='AdminGroups'}",
+						controller: "AdminGroups",
+						action: "addCategoryReduction",
+						category_reduction: $('#category_reduction_fancybox').val() ,
+						id_category: $('[name="id_category"]:checked').val()
+						},
+					success : function(jsonData)
 					{
-						var errors = '';
-						for (error in jsonData.errors)
-							//IE6 bug fix
-							if (error != 'indexOf')
-								errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
-						jAlert(errors);
+						if (jsonData.hasError)
+						{
+							var errors = '';
+							for(error in jsonData.errors)
+								//IE6 bug fix
+								if(error != 'indexOf')
+									errors += jsonData.errors[error] + "\n";
+							jAlert(errors);
+						}
+						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>');
+							
+							var input_hidden = document.createElement("input");
+							input_hidden.setAttribute('type', 'hidden');
+							input_hidden.setAttribute('value', jsonData.discount);
+							input_hidden.setAttribute('name', 'category_reduction['+jsonData.id_category+']');
+							input_hidden.setAttribute('class', 'category_reduction');
+							
+							$('#group_discount_category_table tr#'+jsonData.id_category+' > td:last').append(input_hidden);
+							$.fancybox.close();
+						}
 					}
-					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>');
-						
-						var input_hidden = document.createElement("input");
-						input_hidden.setAttribute('type', 'hidden');
-						input_hidden.setAttribute('value', jsonData.discount);
-						input_hidden.setAttribute('name', 'category_reduction['+jsonData.id_category+']');
-						input_hidden.setAttribute('class', 'category_reduction');
-						
-						$('#group_discount_category_table tr#'+jsonData.id_category+' > td:last').append(input_hidden);
-						$.fancybox.close();
-					}
-				}
-			});
+				});
 			
 			return false;
 		}
 			
-		function initFancyBox()
-		{
-			$('[name="id_category"]:checked').removeAttr('checked');
-			collapseAllCategories();
-			$('#category_reduction_fancybox').val('0.00');
-		}
+			function initFancyBox()
+			{
+				$('[name="id_category"]:checked').removeAttr('checked');
+				collapseAllCategories();
+				$('#category_reduction_fancybox').val('0.00');
+			}
 		</script>
 		<div class="margin-form">
 			<a class="button" href="#group_discount_category_fancybox" id="group_discount_category">{l s='Add a category discount'}</a>
@@ -268,4 +270,4 @@
 	{else}
 		{$smarty.block.parent}
 	{/if}
-{/block}
+{/block}
--- a/admin-dev/themes/default/template/controllers/home/content.tpl
+++ b/admin-dev/themes/default/template/controllers/home/content.tpl
@@ -223,7 +223,7 @@ $(document).ready(function() {
 		$.fancybox(
 			this.href,
 			{
-				'width'				: 	920,
+				'width'				: 	660,
 				'height'			: 	384,
 				'transitionIn'		: 'none',
 				'transitionOut'		: 'none',
--- a/admin-dev/themes/default/template/controllers/images/content.tpl
+++ b/admin-dev/themes/default/template/controllers/images/content.tpl
@@ -76,7 +76,7 @@
 	</form>
 {/if}

-{if isset($display_move) && $display_move}
+{if isset($display_move)}
 	<br /><h2 class="space">{l s='Move images'}</h2>
 	{l s='PrestaShop now uses a new storage system for product images. It offers better performance if your shop has a large number of products.'}<br />
 	<br />
--- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
@@ -50,14 +50,14 @@
 				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()) + '?'))
+					if (!confirm('{l s='Are you sure that you would like to delete this' js=1}' + ' ' + $.trim($('#entity > option:selected').text().toLowerCase()) + '{l s='?' js=1}'))
 					{
 						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}');
+					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.'}');
 					return false;
 				}
 			}
--- a/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
@@ -58,7 +58,7 @@
 	</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'}
+		{l s='Skip'} <input type="text" size="2" name="skip" value="0" /> {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="entity" value="{$fields_value.entity}" />
--- a/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
@@ -32,7 +32,7 @@
 		{
 			$.ajax({
 				type: 'GET',
-				url: '{$link->getAdminLink('AdminInformation')|addslashes}',
+				url: '{$link->getAdminLink('AdminInformation')}',
 				data: {
 					'action': 'checkFiles',
 					'ajax': 1
--- a/admin-dev/themes/default/template/controllers/login/content.tpl
+++ b/admin-dev/themes/default/template/controllers/login/content.tpl
@@ -22,79 +22,91 @@
 *  @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">
-				var there_are = '{l s='There are'}';
-				var there_is = '{l s='There is'}';
-				var label_errors = '{l s='errors'}';
-				var label_error = '{l s='error'}';
-			</script>
-			<div id="container">	
-				<div id="error" {if !isset($errors)}class="hide"{/if}>
-{if isset($errors)}
-					<h3>{if $nbErrors > 1}{l s='There are %d errors.' sprintf=$nbErrors}{else}{l s='There is %d error.' sprintf=$nbErrors}{/if}</h3>
-					<ol style="margin: 0 0 0 20px;">
-					{foreach from=$errors item="error"}
-						<li>{$error}</li>
-					{/foreach}
-					</ol>
-{/if}
-				</div>
-				<br />
-{if isset($warningSslMessage)}
-				<div class="warn">{$warningSslMessage}</div>
-{/if}
-				<div id="login">
-					<h1>{$shop_name}</h1>
-{if !isset($wrong_folder_name) && !isset($wrong_install_name)}
-						<form action="#" id="login_form" method="post">
-							<div class="field">
-								<label for="email">{l s='Email address:'}</label>
-								<input type="text" id="email" name="email" class="input email_field" tabindex="1" value="{if isset($email)}{$email|escape:'htmlall':'UTF-8'}{/if}" />
-							</div>					
-							<div class="field">
-								<label for="passwd">{l s='Password:'}</label>
-								<input id="passwd" type="password" name="passwd" class="input password_field" tabindex="2" value="{if isset($password)}{$password}{/if}"/>
-							</div>					
-							<div class="field">
-								<input type="submit" name="submitLogin" value="{l s='Log in'}" tabindex="3" class="button fl margin-right-5" />					
-								<p class="fl no-margin hide ajax-loader">
-									<img src="../img/loader.gif" alt="" />
-								</p>					
-								<p class="fr no-margin">
-									<a href="#" class="show-forgot-password">{l s='Lost password?'}</a>
-								</p>
-								<div class="clear"></div>
-							</div>
-							<input type="hidden" name="redirect" id="redirect" value="{$redirect}"/>
-						</form>					
-						<form action="#" id="forgot_password_form" method="post" class="hide">
-							<h2 class="no-margin">{l s='Forgot your password?'}</h2>
-							<p class="bold">{l s='In order to receive your access code by email, please enter the address you provided during the registration process.'}</p>					
-							<div class="field">
-								<label>{l s='Email address:'}</label>
-								<input type="text" name="email_forgot" id="email_forgot" class="input email_field" />
-							</div>					
-							<div class="field">
-								<input type="submit" name="submit" value="{l s='Send'}" class="button fl margin-right-5" />					
-								<p class="fl no-margin hide ajax-loader">
-									<img src="../img/loader.gif" alt=""  />
-								</p>					
-								<p class="fr no-margin">
-									<a href="#" class="show-login-form">{l s='Back to login'}</a>
-								</p>
-								<div class="clear"></div>
-							</div>
-						</form>
-{else}
-						<div class="padding-30">
-							<p>{l s='For security reasons, you cannot connect to the Back Office until after you have:'}</p>
-							<ul>
-								{if isset($wrong_install_name) && $wrong_install_name == true}<li>{l s='deleted the /install folder'}</li>{/if}
-								{if isset($wrong_folder_name) && $wrong_folder_name == true}<li>{l s='renamed the /admin folder (e.g. %s)' sprintf=$randomNb}</li>{/if}
-							</ul>
-							<p><a href="{$adminUrl|escape:'htmlall':'UTF-8'}">{l s='Please then access this page by the new URL (e.g. %s)' sprintf=$adminUrl}</a></p>
-						</div>
-{/if}
-				</div>
-				<h2><a href="http://www.prestashop.com">&copy; 2005 - {$smarty.now|date_format:"%Y"} Copyright by PrestaShop. all rights reserved.</a></h2>
-			</div>
+<script type="text/javascript">
+	var there_are = '{l s='There are'}';
+	var there_is = '{l s='There is'}';
+	var label_errors = '{l s='errors'}';
+	var label_error = '{l s='error'}';
+</script>
+
+<div id="container">	
+	<div id="error" {if !isset($errors)}class="hide"{/if}>
+		{if isset($errors)}
+			<h3>{if $nbErrors > 1}{l s='There are %d errors.' sprintf=$nbErrors}{else}{l s='There is %d error.' sprintf=$nbErrors}{/if}</h3>
+			<ol style="margin: 0 0 0 20px;">
+			{foreach from=$errors item="error"}
+				<li>{$error}</li>
+			{/foreach}
+			</ol>
+		{/if}
+	</div>
+	<br />
+	{if isset($warningSslMessage)}
+		<div class="warn">
+			{$warningSslMessage}
+		</div>
+	{/if}
+	<div id="login">
+		<h1>{$shop_name}</h1>
+	{if !isset($wrong_folder_name) && !isset($wrong_install_name)}
+		<form action="#" id="login_form" method="post">
+			<div class="field">
+				<label for="email">{l s='Email address:'}</label>
+				<input type="text" id="email" name="email" class="input email_field" value="{if isset($email)}{$email|escape:'htmlall':'UTF-8'}{/if}" />
+			</div>
+
+			<div class="field">
+				<label for="passwd">{l s='Password:'}</label>
+				<input id="passwd" type="password" name="passwd" class="input password_field" value="{if isset($password)}{$password}{/if}"/>
+			</div>
+
+			<div class="field">
+				<input type="submit" name="submitLogin" value="{l s='Log in'}" class="button fl margin-right-5" />
+
+				<p class="fl no-margin hide ajax-loader">
+					<img src="../img/loader.gif" alt="" />
+				</p>
+
+				<p class="fr no-margin">
+					<a href="#" class="show-forgot-password">{l s='Lost password?'}</a>
+				</p>
+				<div class="clear"></div>
+			</div>
+			<input type="hidden" name="redirect" id="redirect" value="{$redirect}"/>
+		</form>
+
+		<form action="#" id="forgot_password_form" method="post" class="hide">
+			<h2 class="no-margin">{l s='Forgot your password?'}</h2>
+			<p class="bold">{l s='In order to receive your access code by email, please enter the address you provided during the registration process.'}</p>
+
+			<div class="field">
+				<label>{l s='Email address:'}</label>
+				<input type="text" name="email_forgot" id="email_forgot" class="input email_field" />
+			</div>
+
+			<div class="field">
+				<input type="submit" name="submit" value="{l s='Send'}" class="button fl margin-right-5" />
+
+				<p class="fl no-margin hide ajax-loader">
+					<img src="../img/loader.gif" alt=""  />
+				</p>
+
+				<p class="fr no-margin">
+					<a href="#" class="show-login-form">{l s='Back to login'}</a>
+				</p>
+				<div class="clear"></div>
+			</div>
+		</form>
+	{else}
+		<div class="padding-30">
+			<p>{l s='For security reasons, you cannot connect to the Back Office until after you have:'}</p>
+			<ul>
+				{if isset($wrong_install_name) && $wrong_install_name == true}<li>{l s='deleted the /install folder'}</li>{/if}
+				{if isset($wrong_folder_name) && $wrong_folder_name == true}<li>{l s='renamed the /admin folder (e.g. /admin%d)' sprintf=$randomNb}</li>{/if}
+			</ul>
+			{if isset($wrong_folder_name) && $wrong_folder_name == true}<p>{l s='Please then access this page by the new URL (e.g. http://www.yoursite.com/admin%d)' sprintf=$randomNb}</p>{/if}
+		</div>
+	{/if}
+	</div>
+	<h2><a href="http://www.prestashop.com">&copy; 2005 - {$smarty.now|date_format:"%Y"} Copyright by PrestaShop. all rights reserved.</a></h2>
+</div>
--- a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl
@@ -38,7 +38,7 @@
 		{foreach $addresses AS $addresse}
 			<table border="0" cellpadding="0" cellspacing="0" class="table" style="width: 600px;">
 				<tr>
-					<th><strong>{$addresse.firstname} {$addresse.lastname} <a href="{$link->getAdminLink('AdminManufacturers')}&id_address={$addresse.id_address}&editaddresses=1"><img src="../img/admin/edit.gif"></a></strong></th>
+					<th><strong>{$addresse.firstname} {$addresse.lastname}</strong></th>
 				</tr>
 				<tr>
 					<td>
--- a/admin-dev/themes/default/template/controllers/modules/js.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/js.tpl
@@ -321,46 +321,6 @@
 			catch(e){}
 			return false;
 		});
-		
-		$('.toggle_favorite').live('click', function(event)
-	    {
-	      var el = $(this);
-	      var value_pref = el.data('value');
-	      var module_pref = el.data('module');
-	      var action_pref = 'f';
-	      try
-	      {
-	        resAjax = $.ajax({
-	            type:"POST",
-	            url : ajaxCurrentIndex,
-	            async: true,
-	            data : {
-	              ajax : "1",
-	              token : token,
-	              controller : "AdminModules",
-	              action : "saveFavoritePreferences",
-	              action_pref : action_pref,
-	              module_pref : module_pref,
-	              value_pref : value_pref
-	            },
-	            success : function(data)
-	            {
-	              // res.status  = cache or refresh
-	              if (data == 'OK')
-	              {
-	                el.parent('div').find('.toggle_favorite').toggle();
-	              }
-	                
-	            },
-	            error: function(res,textStatus,jqXHR)
-	            {
-	              //jAlert("TECHNICAL ERROR"+res);
-	            }
-	        });
-	      }
-	      catch(e){}
-	      return false;
-	    });
 	});

 	{/literal}
--- a/admin-dev/themes/default/template/controllers/modules/list.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/list.tpl
@@ -77,20 +77,9 @@
 							</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)}<div class="conf">{$module->message}</div>{/if}
 						<div class="row-actions-module">
-							{if !isset($module->not_on_disk)}
-								{$module->optionsHtml}
-								{if isset($module->preferences) && $module->preferences['favorite'] == 1}
-									<a class="action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#">{l s='Remove from Favorites'}</a>
-									<a class="action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#" style="display: none;">{l s='Mark as Favorite'}</a>
-								{else}
-									<a class="action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#" style="display: none;">{l s='Remove from Favorites'}</a>
-									<a class="action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#">{l s='Mark as Favorite'}</a>
-								{/if}
-							{else}
-								&nbsp;
-							{/if}
+							{if !isset($module->not_on_disk)}{$module->optionsHtml}{else}&nbsp;{/if}
 						</div>
 					</div>
 				</td>
--- a/admin-dev/themes/default/template/controllers/modules/page.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/page.tpl
@@ -26,16 +26,7 @@
 <div id="productBox">
 	{include file='controllers/modules/header.tpl'}
 	{include file='controllers/modules/filters.tpl'}
-	{if $upgrade_available|@count}
-		<div class="hint" style="display:block;">
-			{l s='An upgrade is available for some of your modules!'}
-			<ul>
-			{foreach from=$upgrade_available item='module'}
-				<li> &raquo; <a href="{$currentIndex|escape:htmlall}&token={$token|escape:htmlall}&anchor=anchor{$module.anchor|escape:htmlall}"><b>{$module.name|escape:htmlall}</b></a></li>
-			{/foreach}
-			</ul>
-		</div>
-	{/if}
+
 	<ul class="view-modules">
 		<li class="button normal-view-disabled"><img src="themes/default/img/modules_view_layout_sidebar.png" alt="{l s='Normal view'}" border="0" /><span>{l s='Normal view'}</span></li>
 		<li class="button favorites-view"><a  href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites"><img src="themes/default/img/modules_view_table_select_row.png" alt="{l s='Favorites view'}" border="0" /><span>{l s='Favorites view'}</span></a></li>
@@ -58,7 +49,7 @@
 					</li>
 					{foreach from=$list_modules_categories item=module_category key=module_category_key}
 						<li {if isset($categoryFiltered[$module_category_key])}style="background-color:#EBEDF4"{/if} class="categoryModuleFilterLink">
-							<div class="categorieWidth"><a href="{$currentIndex}&token={$token}&filterCategory={$module_category_key}"><span>{$module_category.name}</span></a></div>
+							<div class="categorieWidth"><a href="{$currentIndex}&token={$token}&{if isset($categoryFiltered[$module_category_key])}un{/if}filterCategory={$module_category_key}"><span>{$module_category.name}</span></a></div>
 							<div class="count">{$module_category.nb}</div>
 						</li>
 					{/foreach}
--- a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
@@ -31,10 +31,10 @@
 				<td valign="top" width="32" align="center">
 					<img class="imgm" alt="" src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}">
 				</td>
-				<td valign="top">
+				<td height="60" valign="top">
 					<div class="moduleDesc" id="anchor{$module->name|ucfirst}">
 						<h3>
-							{$module->displayName|truncate:36:'…'} {$module->version}
+							{$module->displayName|truncate:40:'…'} {$module->version}
 							{if isset($module->id) && $module->id gt 0 }
 								{if $module->active}
 									<span class="setup">{l s='Enabled'}</span>
@@ -52,7 +52,7 @@
 						</h3>
 						<p class="desc">
 							{if isset($module->description) && $module->description ne ''}
-								{$module->description|truncate:86:'…'}
+								{$module->description|truncate:100:'…'}
 							{else}
 								&nbsp;
 							{/if}
@@ -66,7 +66,7 @@
 					{else if !isset($module->not_on_disk)}
 						{$module->optionsHtml}
 						<div class="clear">&nbsp;</div>
-						<a href="#" class="button action_tab_module" data-option="select_{$module->name}" class="button">{l s='Submit'}</a>
+						<a href="#" class="button action_tab_module" data-option="select_{$module->name}" class="button">Valider</a>
 					{else}
 						<a href="{$module->options.install_url}" class="button">{l s='Install'}</a>
 					{/if}
--- a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl
+++ b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl
@@ -26,7 +26,7 @@
 {include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
 <div class="leadin">{block name="leadin"}{/block}</div>

-<form action="{$url_submit}" id="{$table}_form" method="post">
+<form action="{$url_submit}" id={$table}_form method="post">
 	{if $display_key}
 		<input type="hidden" name="show_modules" value="{$display_key}" />
 	{/if}
@@ -49,10 +49,38 @@
 			</select><sup> *</sup>
 		</div>
 	
+		<script type="text/javascript">
+			//<![CDATA
+			function position_exception_add(shopID)
+			{
+				var listValue = $('#em_list_'+shopID).val();
+				var inputValue = $('#em_text_'+shopID).val();
+				var r = new RegExp('(^|,) *'+listValue+' *(,|$)');
+				if (!r.test(inputValue))
+					$('#em_text_'+shopID).val(inputValue + ((inputValue.trim()) ? ', ' : '') + listValue);
+			}
+		
+			function position_exception_remove(shopID)
+			{
+				var listValue = $('#em_list_'+shopID).val();
+				var inputValue = $('#em_text_'+shopID).val();
+				var r = new RegExp('(^|,) *'+listValue+' *(,|$)');
+				if (r.test(inputValue))
+				{
+					var rep = '';
+					if (new RegExp(', *'+listValue+' *,').test(inputValue))
+						$('#em_text_'+shopID).val(inputValue.replace(r, ','));
+					else if (new RegExp(listValue+' *,').test(inputValue))
+						$('#em_text_'+shopID).val(inputValue.replace(r, ''));
+					else
+						$('#em_text_'+shopID).val(inputValue.replace(r, ''));
+				}
+			}
+			//]]>
+		</script>
+	
 		<label>{l s='Exceptions'} :</label>
 		<div class="margin-form">
-			{l s='Please specify the files for which you do not want the module to be displayed.'}<br />
-			{l s='Please input each filename, separated by a comma.'}<br />
 			{if !$except_diff}
 				{$exception_list}
 			{else}
@@ -60,6 +88,9 @@
 					{$value}
 				{/foreach}
 			{/if}
+			{l s='Please specify the files for which you do not want the module to be displayed.'}.<br />
+			{l s='Please input each filename, separated by a comma.'}.
+			<br /><br />
 		</div>
 	
 		<div class="margin-form">
@@ -71,40 +102,4 @@
 		</div>
 		<div class="small"><sup>*</sup> {l s='Required field'}</div>
 	</fieldset>
-</form>
-<script type="text/javascript">
-	//<![CDATA
-	function position_exception_textchange()
-	{
-		// TODO : Add & Remove automatically the "custom pages" in the "em_list_x"
-		var obj = $(this);
-		var shopID = obj.attr('id').replace(/\D/g, '');
-		var list = obj.parent().find('#em_list_' + shopID);
-		var values = obj.val().split(',');
-		var len = values.length;
-		
-		list.find('option').prop('selected', false);
-		for (var i = 0; i < len; i++)
-			list.find('option[value="' + $.trim(values[i]) + '"]').prop('selected', true);
-	}
-
-	function position_exception_listchange()
-	{
-		var obj = $(this);
-		var shopID = obj.attr('id').replace(/\D/g, '');
-		var str = obj.val().join(', ');
-		
-		obj.parent().find('#em_text_' + shopID).val(str);
-	}
-	
-	$(document).ready(function(){
-		$('form[id="hook_module_form"] input[id^="em_text_"]').each(function(){
-			$(this).change(position_exception_textchange).change();
-		});
-
-		$('form[id="hook_module_form"] select[id^="em_list_"]').each(function(){
-			$(this).change(position_exception_listchange);
-		});
-	});
-	//]]>
-</script>
+</form>
--- a/admin-dev/themes/default/template/controllers/not_found/content.tpl
+++ b/admin-dev/themes/default/template/controllers/not_found/content.tpl
@@ -22,9 +22,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{if isset($controller) && !empty($controller) && $controller != 'adminnotfound'}
 <h1>{l s='The controller %s is missing or invalid.' sprintf=$controller}</h1>
-{/if}
 <ul>
 <li><a href="index.php">{l s='Go to the dashboard.'}</a></li>
 <li><a href="#" onclick="window.history.back();">{l s='Back to the previous page.'}</a></li>
--- a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
@@ -22,66 +22,59 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{if $product['customizedDatas']}
-	<tr class="customized customized-{$product['id_order_detail']|intval}">
-		<td align="center">
-			<input type="hidden" class="edit_product_id_order_detail" value="{$product['id_order_detail']|intval}" />
-			{if isset($product['image']) && $product['image']->id|intval}{$product['image_tag']}{else}--{/if}</td>
+{if $product.customizedDatas}
+	<tr class="customized customized-{$product.id_order_detail}">
+		<input type="hidden" class="edit_product_id_order_detail" value="{$product.id_order_detail}" />
+		<td align="center">{if isset($product.image) && $product.image->id}{$product.image_tag}{else}--{/if}</td>
 		<td>
-			<a href="index.php?controller=adminproducts&id_product={$product['product_id']|intval}&updateproduct&token={getAdminToken tab='AdminProducts'}">
+			<a href="index.php?controller=adminproducts&id_product={$product['product_id']}&updateproduct&token={getAdminToken tab='AdminProducts'}">
 			<span class="productName">{$product['product_name']} - {l s='Customized'}</span><br />
 			{if ($product['product_reference'])}{l s='Ref:'} {$product['product_reference']}<br />{/if}
 			{if ($product['product_supplier_reference'])}{l s='Ref Supplier:'} {$product['product_supplier_reference']}{/if}
 			</a>
 		</td>
 		<td align="center">
-			<span class="product_price_show">{displayPrice price=$product['product_price_wt'] currency=$currency->id|intval}</span>
+			<span class="product_price_show">{displayPrice price=$product['product_price_wt'] currency=$currency->id}</span>
 			{if $can_edit}
 			<span class="product_price_edit" style="display:none;">
-				<input type="hidden" name="product_id_order_detail" class="edit_product_id_order_detail" value="{$product['id_order_detail']|intval}" />
+				<input type="hidden" name="product_id_order_detail" class="edit_product_id_order_detail" value="{$product['id_order_detail']}" />
 				{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="product_price_tax_excl" class="edit_product_price_tax_excl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_excl'], 2)}" size="5" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax excl.'}<br />
 				{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="product_price_tax_incl" class="edit_product_price_tax_incl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_incl'], 2)}" size="5" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax incl.'}
 			</span>
 			{/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}
 		<td align="center" class="total_product">
 		{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
-			{displayPrice price=Tools::ps_round($product['product_price'] * $product['customizationQuantityTotal'], 2) currency=$currency->id|intval}
+			{displayPrice price=Tools::ps_round($product['product_price'] * $product['customizationQuantityTotal'], 2) currency=$currency->id}
 		{else}
-			{displayPrice price=Tools::ps_round($product['product_price_wt'] * $product['customizationQuantityTotal'], 2) currency=$currency->id|intval}
+			{displayPrice price=Tools::ps_round($product['product_price_wt'] * $product['customizationQuantityTotal'], 2) currency=$currency->id}
 		{/if}
 		</td>
-		<td class="cancelQuantity standard_refund_fields current-edit" style="display:none" colspan="2">
-			&nbsp;
-		</td>
 		<td class="edit_product_fields" colspan="2" style="display:none">&nbsp;</td>
 		<td class="partial_refund_fields current-edit" style="text-align:left;display:none"></td>
-		{if ($can_edit && !$order->hasBeenDelivered())}
-			<td class="product_action" style="text-align:right">
-				<a href="#" class="edit_product_change_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a>
-				<input type="submit" class="button" name="submitProductChange" value="{l s='Update'}"  style="display: none;" />
-				<a href="#" class="cancel_product_change_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a>
-				<a href="#" class="delete_product_line"><img src="../img/admin/delete.gif" alt="{l s='Delete'}" /></a>
-			</td>
-		{/if}
+		<td class="product_action" style="text-align:right">
+			<a href="#" class="edit_product_change_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a>
+			<input type="submit" class="button" name="submitProductChange" value="{l s='Update'}"  style="display: none;" />
+			<a href="#" class="cancel_product_change_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a>
+			<a href="#" class="delete_product_line"><img src="../img/admin/delete.gif" alt="{l s='Delete'}" /></a>
+		</td>
 	</tr>
-	{foreach $product['customizedDatas'] as $customizationPerAddress}
+	{foreach $product.customizedDatas as $customizationPerAddress}
 		{foreach $customizationPerAddress as $customizationId => $customization}
-			<tr class="customized customized-{$product['id_order_detail']|intval}">
+			<tr class="customized customized-{$product.id_order_detail}">
+				<input type="hidden" class="edit_product_id_order_detail" value="{$product.id_order_detail}" />
 				<td colspan="2">
-				<input type="hidden" class="edit_product_id_order_detail" value="{$product['id_order_detail']|intval}" />
 			{foreach $customization.datas as $type => $datas}
 				{if ($type == Product::CUSTOMIZE_FILE)}
 					<ul style="margin: 4px 0px 4px 0px; padding: 0px; list-style-type: none;">
 					{foreach from=$datas item=data}
 						<li style="margin: 2px;">
 							<span>{if $data['name']}{$data['name']}{else}{l s='Picture #'}{$data@iteration}{/if}{l s=':'}</span>&nbsp;
-								<a href="displayImage.php?img={$data['value']}&name={$order->id|intval}-file{$data@iteration}" target="_blank"><img src="{$smarty.const._THEME_PROD_PIC_DIR_}{$data['value']}_small" alt="" /></a>
+								<a href="displayImage.php?img={$data['value']}&name={$order->id}-file{$data@iteration}" target="_blank"><img src="{$smarty.const._THEME_PROD_PIC_DIR_}{$data['value']}_small" alt="" /></a>
 						</li>
 					{/foreach}
 					</ul>
@@ -100,11 +93,10 @@
 					<span class="product_quantity_show{if (int)$customization['quantity'] > 1} red bold{/if}">{$customization['quantity']}</span>
 					{if $can_edit}
 					<span class="product_quantity_edit" style="display:none;">
-						<input type="text" name="product_quantity[{$customizationId|intval}]" class="edit_product_quantity" value="{$customization['quantity']|htmlentities}" size="2" />
+						<input type="text" name="product_quantity[{$customizationId}]" class="edit_product_quantity" value="{$customization['quantity']|htmlentities}" size="2" />
 					</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">
@@ -112,38 +104,36 @@
 				</td>
 				<td align="center" class="total_product">
 					{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
-						{displayPrice price=Tools::ps_round($product['product_price'] * $customization['quantity'], 2) currency=$currency->id|intval}
+						{displayPrice price=Tools::ps_round($product['product_price'] * $customization['quantity'], 2) currency=$currency->id}
 					{else}
-						{displayPrice price=Tools::ps_round($product['product_price_wt'] * $customization['quantity'], 2) currency=$currency->id|intval}
+						{displayPrice price=Tools::ps_round($product['product_price_wt'] * $customization['quantity'], 2) currency=$currency->id}
 					{/if}
 				</td>				
 				<td align="center" class="cancelCheck standard_refund_fields current-edit" style="display:none">
-					<input type="hidden" name="totalQtyReturn" id="totalQtyReturn" value="{$customization['quantity_returned']|intval}" />
-					<input type="hidden" name="totalQty" id="totalQty" value="{$customization['quantity']|intval}" />
+					<input type="hidden" name="totalQtyReturn" id="totalQtyReturn" value="{$customization['quantity_returned']}" />
+					<input type="hidden" name="totalQty" id="totalQty" value="{$customization['quantity']}" />
 					<input type="hidden" name="productName" id="productName" value="{$product['product_name']}" />
 					{if ((!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN')) AND (int)($customization['quantity_returned']) < (int)($customization['quantity']))}
-						<input type="checkbox" name="id_customization[{$customizationId|intval}]" id="id_customization[{$customizationId|intval}]" value="{$product['id_order_detail']|intval}" onchange="setCancelQuantity(this, {$customizationId|intval}, {$customization['quantity'] - $product['customizationQuantityTotal'] - $product['product_quantity_reinjected']})" {if ($product['product_quantity_return'] + $product['product_quantity_refunded'] >= $product['product_quantity'])}disabled="disabled" {/if}/>
+						<input type="checkbox" name="id_order_detail[{$product['id_order_detail']}]" id="id_order_detail[{$product['id_order_detail']}]" value="{$product['id_order_detail']}" onchange="setCancelQuantity(this, {$product['id_order_detail']}, {$customization['quantity'] - $product['customizationQuantityTotal'] - $product['product_quantity_reinjected']})" {if ($product['product_quantity_return'] + $product['product_quantity_refunded'] >= $product['product_quantity'])}disabled="disabled" {/if}/>
 					{else}
 					--
 				{/if}
 				</td>
 				<td class="cancelQuantity standard_refund_fields current-edit" style="display:none">
 				{if ($customization['quantity_returned'] + $customization['quantity_refunded'] >= $customization['quantity'])}
-					<input type="hidden" name="cancelCustomizationQuantity[{$customizationId|intval}]" value="0" />
+					<input type="hidden" name="cancelQuantity[{$product['id_order_detail']}]" value="0" />
 				{elseif (!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN'))}
-					<input type="text" id="cancelQuantity_{$customizationId|intval}" name="cancelCustomizationQuantity[{$customizationId|intval}]" size="2" onclick="selectCheckbox(this);" value="" />0/{$customization['quantity']-$customization['quantity_refunded']}
+					<input type="text" id="cancelQuantity_{$product['id_order_detail']}" name="cancelQuantity[{$product['id_order_detail']}]" size="2" onclick="selectCheckbox(this);" value="" />0/{$customization['quantity']-$customization['quantity_refunded']}
 				{/if}
 				</td>
 				<td class="partial_refund_fields current-edit" style="text-align:left;display:none">
-					<div style="width:40%;margin-top:5px;float:left">{l s='Quantity:'}</div> <div style="width:60%;margin-top:2px;float:left"><input type="text" size="3" name="partialRefundProductQuantity[{$product['id_order_detail']|intval}]" value="0" />		
+					<div style="width:40%;margin-top:5px;float:left">{l s='Quantity:'}</div> <div style="width:60%;margin-top:2px;float:left"><input type="text" size="3" name="partialRefundProductQuantity[{$product['id_order_detail']}]" value="0" />		
 					0/{$customization['quantity']-$customization['quantity_refunded']}
 					</div>
-					<div style="width:40%;margin-top:5px;float:left">{l s='Amount:'}</div> <div style="width:60%;margin-top:2px;float:left">{$currency->prefix}<input type="text" size="3" name="partialRefundProduct[{$product['id_order_detail']|intval}]" />{$currency->suffix}</div>
+				<div style="width:40%;margin-top:5px;float:left">{l s='Amount:'}</div> <div style="width:60%;margin-top:2px;float:left">{$currency->prefix}<input type="text" size="3" name="partialRefundProduct[{$product['id_order_detail']}]" />{$currency->suffix}</div>				
+				<td class="edit_product_fields" colspan="2" style="display:none"></td>
+				<td class="product_action" style="text-align:right">
 				</td>
-				{if ($can_edit && !$order->hasBeenDelivered())}
-					<td class="edit_product_fields" colspan="2" style="display:none"></td>
-					<td class="product_action" style="text-align:right"></td>
-				{/if}
 			</tr>
 		{/foreach}
 	{/foreach}
--- a/admin-dev/themes/default/template/controllers/orders/_documents.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_documents.tpl
@@ -68,9 +68,9 @@
 			{/if}
 			{if get_class($document) eq 'OrderInvoice'}
 				{if isset($document->is_delivery)}
-					#{Configuration::get('PS_DELIVERY_PREFIX', $current_id_lang, null, $order->id_shop)}{'%06d'|sprintf:$document->delivery_number}
+					#{Configuration::get('PS_DELIVERY_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->delivery_number}
 				{else}
-					{$document->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)}
+					{$document->getInvoiceNumberFormatted($current_id_lang)}
 				{/if}
 			{elseif get_class($document) eq 'OrderSlip'}
 				#{Configuration::get('PS_CREDIT_SLIP_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->id}
@@ -110,7 +110,7 @@
 		{if !isset($document->is_delivery)}
 	<tr id="invoiceNote{$document->id}" style="display:none" class="current-edit">
 		<td colspan="5">
-			<form action="{$current_index}&viewOrder&id_order={$order->id}{if isset($smarty.get.token)}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}{/if}" method="post">
+			<form action="{$current_index}&viewOrder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}" method="post">
 				<p>
 					<label for="editNote{$document->id}" class="t">{l s='Note'}</label>
 					<input type="hidden" name="id_order_invoice" value="{$document->id}" />
@@ -130,7 +130,7 @@
 		<td colspan="5" class="center">
 			<h3>{l s='No documents are available'}</h3>
 			{if isset($invoice_management_active) && $invoice_management_active}
-			<p><a class="button" href="{$current_index}&viewOrder&submitGenerateInvoice&id_order={$order->id}{if isset($smarty.get.token)}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}{/if}">{l s='Generate invoice'}</a></p>
+			<p><a class="button" href="{$current_index}&viewOrder&submitGenerateInvoice&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">{l s='Generate invoice'}</a></p>
 			{/if}
 		</td>
 	</tr>
--- a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl
@@ -40,7 +40,6 @@
 	</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>
--- a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
@@ -56,7 +56,6 @@
 		</span>
 		{/if}
 	</td>
-	{if $display_warehouse}<td>{$product.warehouse_name|escape:'htmlall':'UTF-8'}</td>{/if}
 	{if ($order->hasBeenPaid())}
 		<td align="center" class="productQuantity">
 			{$product['product_quantity_refunded']}
--- a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
@@ -24,11 +24,11 @@
 *}
 <table class="table" width="100%" cellspacing="0" cellpadding="0" id="shipping_table">
 <colgroup>
-	<col width="15%"/>
-	<col width="15%"/>
-	<col width=""/>
-	<col width="10%"/>
-	<col width="20%"/>
+	<col width="15%">
+	<col width="15%">
+	<col width="">
+	<col width="10%">
+	<col width="20%">
 </colgroup>
 	<thead>
 	<tr>
@@ -46,7 +46,7 @@
 		<td>{dateFormat date=$line.date_add full=true}</td>
 		<td>{$line.type}</td>
 		<td>{$line.carrier_name}</td>
-		<td class="weight">{$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}</td>
+		<td>{$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}</td>
 		<td>
 			{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}
 				{displayPrice price=$line.shipping_cost_tax_incl currency=$currency->id}
@@ -55,7 +55,7 @@
 			{/if}
 		</td>
 		<td>
-			<span id="shipping_number_show">{if $line.url && $line.tracking_number}<a target="_blank" href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span>
+			<span id="shipping_number_show">{if $line.url && $line.tracking_number}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span>
 			{if $line.can_edit}
 				<form style="display: inline;" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id|escape:'htmlall':'UTF-8'}">
 					<span class="shipping_number_edit" style="display:none;">
--- a/admin-dev/themes/default/template/controllers/orders/form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -24,17 +24,17 @@
 *}
 <script type="text/javascript">
 	var id_cart = {$cart->id|intval};
-	var id_customer = 0;
+	var id_customer = '';
 	var changed_shipping_price = false;
 	var shipping_price_selected_carrier = '';
 	var current_index = '{$current}&token={$token}';
-	var admin_cart_link = '{$link->getAdminLink('AdminCarts')|addslashes}';
+	var admin_cart_link = '{$link->getAdminLink('AdminCarts')}';
 	var cart_quantity = new Array();
 	var currencies = new Array();
 	var id_currency = '';
 	var id_lang = '';
-	var txt_show_carts = '{l s='Show carts and orders for this customer.' js=1}';
-	var txt_hide_carts = '{l s='Hide carts and orders for this customer.' js=1}';
+	var txt_show_carts = '{l s='Show carts and orders for this customer.'}';
+	var txt_hide_carts = '{l s='Hide carts and orders for this customer.'}';
 	var defaults_order_state = new Array();
 	var customization_errors = false;
 	var pic_dir = '{$pic_dir}';
@@ -100,7 +100,7 @@
 		$('#show_old_carts').click();
 		$('#payment_module_name').change();
 		$.ajaxSetup({ type:"post" });
-		$("#voucher").autocomplete('{$link->getAdminLink('AdminCartRules')|addslashes}', {
+		$("#voucher").autocomplete('{$link->getAdminLink('AdminCartRules')}', {
 					minChars: 3,
 					max: 15,
 					width: 250,
@@ -157,7 +157,7 @@
 				free_shipping = 1;
 			$.ajax({
 				type:"POST",
-				url: "{$link->getAdminLink('AdminCarts')|addslashes}",
+				url: "{$link->getAdminLink('AdminCarts')}",
 				async: true,
 				dataType: "json",
 				data : {
@@ -217,7 +217,7 @@
 			e.preventDefault();
 			$.ajax({
 				type:"POST",
-				url: "{$link->getAdminLink('AdminCarts')|addslashes}",
+				url: "{$link->getAdminLink('AdminCarts')}",
 				async: true,
 				dataType: "json",
 				data : {
@@ -254,7 +254,7 @@
 	{
 		$.ajax({
 			type:"POST",
-			url: "{$link->getAdminLink('AdminCarts')|addslashes}",
+			url: "{$link->getAdminLink('AdminCarts')}",
 			async: true,
 			dataType: "json",
 			data : {
@@ -288,7 +288,7 @@
 	{
 		$.ajax({
 			type:"POST",
-			url: "{$link->getAdminLink('AdminCarts')|addslashes}",
+			url: "{$link->getAdminLink('AdminCarts')}",
 			async: true,
 			dataType: "json",
 			data : {
@@ -324,7 +324,7 @@
 	{
 		$.ajax({
 			type:"POST",
-			url: "{$link->getAdminLink('AdminCarts')|addslashes}",
+			url: "{$link->getAdminLink('AdminCarts')}",
 			async: true,
 			dataType: "json",
 			data : {
@@ -351,7 +351,7 @@
 		$('#id_cart').val(id_cart);
 		$.ajax({
 			type:"POST",
-			url: "{$link->getAdminLink('AdminCarts')|addslashes}",
+			url: "{$link->getAdminLink('AdminCarts')}",
 			async: false,
 			dataType: "json",
 			data : {
@@ -378,7 +378,7 @@
 	{
 		$.ajax({
 			type:"POST",
-			url: "{$link->getAdminLink('AdminCarts')|addslashes}",
+			url: "{$link->getAdminLink('AdminCarts')}",
 			async: true,
 			dataType: "json",
 			data : {
@@ -401,7 +401,7 @@
 	{
 		$.ajax({
 			type:"POST",
-			url: "{$link->getAdminLink('AdminCarts')|addslashes}",
+			url: "{$link->getAdminLink('AdminCarts')}",
 			async: true,
 			dataType: "json",
 			data : {
@@ -426,7 +426,7 @@
 	{
 		$.ajax({
 			type:"POST",
-			url : "{$link->getAdminLink('AdminOrders')|escape:'html'}",
+			url : "{$link->getAdminLink('AdminOrders')}",
 			async: true,
 			dataType: "json",
 			data : {
@@ -464,11 +464,10 @@
 		$('#summary_part').show();
 		var address_link = $('#new_address').attr('href');
 		id_customer = idCustomer;
-		id_cart = 0;
 		$('#new_address').attr('href', address_link.replace(/id_customer=[0-9]+/, 'id_customer='+id_customer));
 		$.ajax({
 			type:"POST",
-			url : "{$link->getAdminLink('AdminCarts')|addslashes}",
+			url : "{$link->getAdminLink('AdminCarts')}",
 			async: false,
 			dataType: "json",
 			data : {
@@ -534,7 +533,7 @@
 		$('#products_part').show();
 		$.ajax({
 			type:"POST",
-			url: "{$link->getAdminLink('AdminOrders')|addslashes}",
+			url: "{$link->getAdminLink('AdminOrders')}",
 			async: true,
 			dataType: "json",
 			data : {
@@ -661,17 +660,17 @@
 			{
 				$.each(this.customized_datas[this.id_product][this.id_product_attribute][id_address_delivery], function() {
 					var customized_desc = '';
-					if (this.datas[1].length)
+					if(this.datas[1].length)
 					{
 						$.each(this.datas[1],function() {
-							customized_desc += this.name + ': ' + this.value + '<br />';
+							customized_desc += this.name+':'+this.value+'<br />';
 							id_customization = this.id_customization;
 						});
 					}
-					if (this.datas[0] && this.datas[0].length)
+					if(this.datas[0] && this.datas[0].length)
 					{
 						$.each(this.datas[0],function() {
-							customized_desc += this.name + ': <img src="' + pic_dir + this.value + '_small" /><br />';
+							customized_desc += this.name+':<img src="'+pic_dir+this.value+'_small" /><br />';
 							id_customization = this.id_customization;
 						});
 					}
@@ -766,7 +765,7 @@
 	{
 		$.ajax({
 			type:"POST",
-			url: "{$link->getAdminLink('AdminCarts')|addslashes}",
+			url: "{$link->getAdminLink('AdminCarts')}",
 			async: true,
 			dataType: "json",
 			data : {
@@ -822,7 +821,7 @@
 	{
 		$.ajax({
 			type:"POST",
-			url: "{$link->getAdminLink('AdminCarts')|addslashes}",
+			url: "{$link->getAdminLink('AdminCarts')}",
 			async: true,
 			dataType: "json",
 			data : {
@@ -845,7 +844,7 @@
 	{
 		$.ajax({
 			type:"POST",
-			url: "{$link->getAdminLink('AdminCarts')|addslashes}",
+			url: "{$link->getAdminLink('AdminCarts')}",
 			async: true,
 			dataType: "json",
 			data : {
@@ -868,7 +867,7 @@
 	{
 		$.ajax({
 			type:"POST",
-			url: "{$link->getAdminLink('AdminCarts')|addslashes}",
+			url: "{$link->getAdminLink('AdminCarts')}",
 			async: true,
 			dataType: "json",
 			data : {
@@ -899,7 +898,7 @@
 	{
 		$.ajax({
 			type:"POST",
-			url: "{$link->getAdminLink('AdminOrders')|addslashes}",
+			url: "{$link->getAdminLink('AdminOrders')}",
 			async: true,
 			dataType: "json",
 			data : {
@@ -957,7 +956,7 @@
 	{
 		$.ajax({
 			type:"POST",
-			url: "{$link->getAdminLink('AdminCarts')|addslashes}",
+			url: "{$link->getAdminLink('AdminCarts')}",
 			async: true,
 			dataType: "json",
 			data : {
--- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -27,7 +27,7 @@

 {block name="override_tpl"}
 	<script type="text/javascript">
-	var admin_order_tab_link = "{$link->getAdminLink('AdminOrders')|addslashes}";
+	var admin_order_tab_link = "{$link->getAdminLink('AdminOrders')}";
 	var id_order = {$order->id};
 	var id_lang = {$current_id_lang};
 	var id_currency = {$order->id_currency};
@@ -59,7 +59,7 @@

 	{assign var="hook_invoice" value={hook h="displayInvoice" id_order=$order->id}}
 	{if ($hook_invoice)}
-	<div style="float: right; margin: -40px 40px 10px 0;">{$hook_invoice}</div><br class="clear" />
+	<div style="float: right; margin: -40px 40px 10px 0;">{$hook_invoice}</div><br class="clear" />';
 	{/if}

 <div class="bloc-command">
@@ -113,7 +113,9 @@
 			<form action="{$currentIndex}&vieworder&token={$smarty.get.token}" method="post">
 				<select id="id_order_state" name="id_order_state">
 				{foreach from=$states item=state}
-					<option value="{$state['id_order_state']}"{if $state['id_order_state'] == $currentState->id} selected="selected" disabled="disabled"{/if}>{$state['name']|stripslashes}</option>
+					{if $state['id_order_state'] != $currentState->id}
+					<option value="{$state['id_order_state']}">{$state['name']|stripslashes}</option>
+					{/if}
 				{/foreach}
 				</select>
 				<input type="hidden" name="id_order" value="{$order->id}" />
@@ -170,9 +172,9 @@
 					{l s='Account registered:'} <b>{dateFormat date=$customer->date_add full=true}</b><br />
 					{l s='Valid orders placed:'} <b>{$customerStats['nb_orders']}</b><br />
 					{l s='Total spent since registration:'} <b>{displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_orders'], $currency), 2) currency=$currency->id}</b><br />
+			</fieldset>
 				{/if}
 			{/if}
-			</fieldset>

 			<!-- Sources block -->
 			{if (sizeof($sources))}
@@ -264,8 +266,8 @@

 				{if (!$order->valid && sizeof($currencies) > 1)}
 				<form method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
-					<p class="warn">{l s='Do not forget to update your exchange rate before making this change.'}</p>
-					<label>{l s='Do not forget to update your exchange rate before making this change.'}</label>
+					<p class="warn">{l s='Don\'t forget to update your conversion rate before making this change.'}</p>
+					<label>{l s='Don\'t forget to update your conversion rate before making this change.'}</label>
 					<select name="new_currency">
 						{foreach from=$currencies item=currency_change}
 							{if $currency_change['id_currency'] != $order->id_currency}
@@ -325,7 +327,7 @@
 								<td>{displayPrice price=$payment->amount currency=$payment->id_currency}</td>
 								<td>
 								{if $invoice = $payment->getOrderInvoice($order->id)}
-									{$invoice->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)}
+									{$invoice->getInvoiceNumberFormatted($current_id_lang)}
 								{else}
 									{l s='No invoice'}
 								{/if}
@@ -404,7 +406,7 @@
 								<td>
 									<select name="payment_invoice" id="payment_invoice">
 									{foreach from=$invoices_collection item=invoice}
-										<option value="{$invoice->id}" selected="selected">{$invoice->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)}</option>
+										<option value="{$invoice->id}" selected="selected">{$invoice->getInvoiceNumberFormatted($current_id_lang)}</option>
 									{/foreach}
 									</select>
 								</td>
@@ -592,7 +594,6 @@
 						<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}
--- a/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
@@ -25,20 +25,15 @@

 {extends file="helpers/view/view.tpl"}
 {block name="override_tpl"}
-	{if !$shop_context}
-		<div class="warn">{l s='You have more than one shop and must select one to configure payment.'}</div>
-	{else}
+{if !$shop_context}
+	<div class="warn">{l s='You have more than one shop and must select one to configure payment.'}</div>
+{else}
 		{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>
+	
+		<br />
+	
 		{if $display_restrictions}
 			<br /><h2 class="space">{l s='Payment module restrictions'}</h2>
 			{foreach $lists as $list}
@@ -49,5 +44,5 @@
 			<br />
 			<div class='warn'>{l s='No payment module installed'}</div>
 		{/if}
-	{/if}
+{/if}
 {/block}
--- a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl
+++ b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl
@@ -34,10 +34,10 @@
 					{if $module->active}
 						<th>
 							{if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
-								<input type="hidden" id="checkedBox_{$list['name_id']}_{$module->name}" value="checked"/>
+								<input type="hidden" id="checkedBox_{$list['name_id']}_{$module->name}" value="checked">
 								<a href="javascript:checkPaymentBoxes('{$list['name_id']}', '{$module->name}')" style="text-decoration:none;">
 							{/if}
-							&nbsp;<img src="{$ps_base_uri}modules/{$module->name}/logo.gif" alt="{$module->name}" title="{$module->displayName}"/>
+							&nbsp;<img src="{$ps_base_uri}modules/{$module->name}/logo.gif" alt="{$module->name}" title="{$module->displayName}" />
 							{if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
 								</a>
 							{/if}
@@ -64,9 +64,11 @@
 								{$type = 'checkbox'}
 							{/if}
 							{if $type != 'null'}
-								<input type="{$type}" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}" {if $item['check_list'][$key_module] == 'checked'}checked="checked"{/if}/>
+								<input type="checkbox" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}"
+									{if $item['check_list'][$key_module] == 'checked'}checked="checked"{/if} 
+								/>
 							{else}
-                                <input type="hidden" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}"/>--
+								--
 							{/if}
 						</td>
 					{/if}
@@ -94,4 +96,4 @@
 		</table>
 		<div><input type="submit" class="button space" name="submitModule{$list['name_id']}" value="{l s='Save restrictions'}" /></div>
 	</fieldset>
-</form>
+</form>
--- a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
@@ -40,9 +40,6 @@
 		</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'}</a>
-	{/if}		
 {/block}

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

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

--- a/admin-dev/themes/default/template/controllers/products/images.tpl
+++ b/admin-dev/themes/default/template/controllers/products/images.tpl
@@ -78,7 +78,7 @@
 		<tr id="image_id">
 			<td style="padding: 4px;">
 				<a href="{$smarty.const._THEME_PROD_DIR_}image_path.jpg" class="fancybox">
-					<img src="{$smarty.const._THEME_PROD_DIR_}{$iso_lang}-default-small_default.jpg" alt="image_id" title="image_id" />
+					<img src="{$smarty.const._THEME_PROD_DIR_}en-default-small_default.jpg" alt="image_id" title="image_id" />
 				</a>
 			</td>
 			<td id="td_image_id" class="pointer dragHandle center positionImage">
@@ -313,13 +313,12 @@
 			{
 				line = $("#lineType").html();
 				line = line.replace(/image_id/g, id);
-				line = line.replace(/[a-z]{2}-default/g, path);
-				line = line.replace(/image_path/g, path);
+			line = line.replace(/en-default/g, path);
+			line = line.replace(/image_path/g, path);
 				line = line.replace(/image_position/g, position);
 				line = line.replace(/blank/g, cover);
-				line = line.replace(/<tbody>/gi, "");
-				line = line.replace(/<\/tbody>/gi, "");
-
+				line = line.replace("<tbody>", "");
+				line = line.replace("</tbody>", "");
 				if (shops != false)
 				{
 					$.each(shops, function(key, value){
@@ -327,10 +326,8 @@
 							line = line.replace('id="' + key + '' + id + '"','id="' + key + '' + id + '" checked=checked');
 					});
 				}
-
 				$("#imageList").append(line);
 			}
-
 			$('.fancybox').fancybox();
 		});
 		{/literal}
--- a/admin-dev/themes/default/template/controllers/products/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/informations.tpl
@@ -43,7 +43,7 @@
 				$('document').ready( function() {
 					$(".check_product_name")
 						.autocomplete(
-							'{$link->getAdminLink('AdminProducts', true)|addslashes}', {
+							'{$link->getAdminLink('AdminProducts', true)}', {
 								minChars: 3,
 								max: 10,
 								width: $(".check_product_name").width(),
--- a/admin-dev/themes/default/template/controllers/products/pack.tpl
+++ b/admin-dev/themes/default/template/controllers/products/pack.tpl
@@ -24,8 +24,8 @@
 *}

 <script type="text/javascript">
-	var msg_select_one = "{l s='Please select at least one product.' js=1}";
-	var msg_set_quantity = "{l s='Please set a quantity to add a product.' js=1}";
+	var msg_select_one = "{l s="Please select at least one product." js=1}";
+	var msg_set_quantity = "{l s="Please set a quantity to add a product." js=1}";
 </script>
 <input type="hidden" name="submitted_tabs[]" value="Pack" />
 <h4>{l s='Pack'}</h4>
--- a/admin-dev/themes/default/template/controllers/products/prices.tpl
+++ b/admin-dev/themes/default/template/controllers/products/prices.tpl
@@ -25,7 +25,7 @@

 <script type="text/javascript">
 var Customer = new Object();
-var product_url = '{$link->getAdminLink('AdminProducts', true)|addslashes}';
+var product_url = '{$link->getAdminLink('AdminProducts', true)}';
 var ecotax_tax_excl = parseFloat({$ecotax_tax_excl});
 $(document).ready(function () {
 	Customer = {
@@ -56,7 +56,7 @@ $(document).ready(function () {
 			Customer.showLoader();
 			jQuery.ajax({
 				"type": "POST",
-				"url": "{$link->getAdminLink('AdminCustomers')|addslashes}",
+				"url": "{$link->getAdminLink('AdminCustomers')}",
 				"async": true,
 				"dataType": "json",
 				"data": {
--- a/admin-dev/themes/default/template/controllers/products/shipping.tpl
+++ b/admin-dev/themes/default/template/controllers/products/shipping.tpl
@@ -71,7 +71,7 @@
 			<label>{l s='Carriers:'}</label>
 		</td>
 		<td class="padding-bottom:5px;">
-			<select name="carriers[]" id="carriers_restriction" multiple="multiple" size="4" style="height:100px;width:300px;">
+			<select name="carriers[]" id="carriers_restriction" multiple="multiple" size="4" style="height:100px;width:200px;">
 				{foreach $carrier_list as $carrier}
 					<option value="{$carrier.id_reference}" {if isset($carrier.selected) && $carrier.selected}selected="selected"{/if}>{$carrier.name}</option>
 				{/foreach}
@@ -88,4 +88,4 @@
 		$('#carriers_restriction option').each(function () { $(this).removeAttr('selected')});
 		return false;
 	}
-</script>
+</script>
--- a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+++ b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
@@ -159,10 +159,7 @@
 								<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="{$up_filename}" />
 							{/if}
 							<div class="conf">
-							<script>
-								delete_this_file = '{l s='Delete this file'}';
-							</script>
-								<a class="delete_virtual_product" id="delete_downloadable_product" href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="red">
+								<a class="delete_virtual_product" id="delete_downloadable_product" onclick="return confirm('{l s='Delete this file'}')" href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="red">
 									<img src="../img/admin/delete.gif" alt="{l s='Delete this file'}"/>
 								</a>
 							</div>
@@ -176,7 +173,7 @@
 							</td>
 							 <td class="col-right">
 								{$product->productDownload->getHtmlLink(false, true)}
-								<a href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="red delete_virtual_product">
+								<a onclick="return confirm('{l s='Delete this file'})')" href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="red delete_virtual_product">
 									<img src="../img/admin/delete.gif" alt="{l s='Delete this file'}"/>
 								</a>
 							</td>
@@ -230,7 +227,7 @@
 				{else}
 					<div class="hint clear" style="display: block;width: 70%;">{l s='You cannot edit your file here because you used combinations. Please edit this file in the Combinations tab.'}</div>
 					<br />
-					{if isset($error_product_download)}{$error_product_download}{/if}
+					{$error_product_download}
 				{/if}
 			</table>
 		</div>
--- a/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl
@@ -90,7 +90,7 @@
 			var table = $('#selectTables select').val();

 			if (!table)
-				jAlert("{l s='Please choose a table.' js=1}");
+				jAlert("{l s='Please choose a table.'}");
 			else
 				AddRequestSql(table);
 		});
--- a/admin-dev/themes/default/template/controllers/shipping/content.tpl
+++ b/admin-dev/themes/default/template/controllers/shipping/content.tpl
@@ -0,0 +1,105 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+{$content}
+<br /><br />
+<h2>{l s='Fees by carrier, geographical zone and ranges'}</h2>
+<form action="{$action_fees}" id="fees" name="fees" method="post">
+	<fieldset>
+		<legend><img src="../img/admin/delivery.gif" />{l s='Fees'}</legend>
+		{if empty($carriers)}
+			{l s='If you only have free carriers, there\'s no need to configure delivery prices.'}
+		{else}
+			<b>{l s='Carrier:'} </b>
+			<select name="id_carrier2" onchange="$('#fees').attr('action', $('#fees').attr('action')+'&id_carrier='+$(this).attr('value')+'#fees'); $('#fees').submit();">
+				{foreach $carriers AS $carrier}
+					<option value="{$carrier['id_carrier']|intval}" {if $carrier['id_carrier'] == $id_carrier} selected="selected"{/if}>{$carrier['name']}</option>
+				{/foreach}
+			</select><br />
+
+			<table class="table space" cellpadding="0" cellspacing="0">
+				<tr>
+					<th>{l s='Zone / Range'}</th>
+					{if !$carrierSelected->is_free}
+						{foreach $ranges AS $range}
+							<th style="font-size: 11px;">{$range['delimiter1']|floatval}{$suffix} {l s='to'} {$range['delimiter2']|floatval}{$suffix}</th>
+						{/foreach}
+					{/if}
+				</tr>
+				{if sizeof($ranges) && !$carrierSelected->is_free}
+					{if sizeof($zones) > 1}
+						<tr>
+							<th style="height: 30px;">{l s='All'}</th>
+							{foreach $ranges AS $range}
+								<td class="center">
+									{$currency->getSign('left')}
+									<input type="text" id="fees_all_{$range[$rangeIdentifier]}" onchange="this.value = this.value.replace(/,/g, '.');" onkeyup="if ((event.keyCode||event.which) != 9){ spreadFees({$range[$rangeIdentifier]})}" style="width: 45px;" />
+									{$currency->getSign('right')} {l s='(tax excl.)'}
+								</td>
+							{/foreach}
+						</tr>
+					{/if}
+		
+					{foreach $zones AS $zone}
+						<tr>
+							<th style="height: 30px;">{$zone['name']}</th>
+							{foreach $ranges AS $range}
+								{if isset($deliveryArray[$zone['id_zone']][$id_carrier][$range[$rangeIdentifier]])}
+									{$price = $deliveryArray[$zone['id_zone']][$id_carrier][$range[$rangeIdentifier]]}
+								{else}
+									{$price = '0.00'}
+								{/if}
+								<td class="center">
+									{$currency->getSign('left')}
+									<input 
+										type="text" 
+										class="fees_{$range[$rangeIdentifier]}" 
+										onchange="this.value = this.value.replace(/,/g, '.');" name="fees_{$zone['id_zone']}_{$range[$rangeIdentifier]}" onkeyup="clearAllFees({$range[$rangeIdentifier]})" 
+										value="{$price|string_format:"%.6f"}"
+										style="width: 45px;" 
+									/>
+									{$currency->getSign('right')} {l s='(tax excl.)'}
+								</td>
+							{/foreach}
+						</tr>
+					{/foreach}
+				{/if}
+				<tr>
+					<td colspan="{$ranges|sizeof + 1}" class="center" style="border-bottom: none; height: 40px;">
+						<input type="hidden" name="submitFees{$table}" value="1" />
+					{if sizeof($ranges) && !$carrierSelected->is_free}
+						<input type="submit" value="{l s='   Save   '}" class="button" />
+					{else if $carrierSelected->is_free}
+						{l s='This is a free carrier'}
+					{else}
+						{l s='No ranges is set for this carrier'}
+					{/if}
+					</td>
+				</tr>
+			</table>
+		{/if}
+		<input type="hidden" name="id_carrier" value="{$id_carrier}" />
+	</fieldset>
+</form>
--- a/admin-dev/themes/default/template/controllers/shipping/index.php
+++ b/admin-dev/themes/default/template/controllers/shipping/index.php
--- a/admin-dev/themes/default/template/controllers/shop/helpers/list/list_action_delete.tpl
+++ b/admin-dev/themes/default/template/controllers/shop/helpers/list/list_action_delete.tpl
@@ -24,9 +24,9 @@
 *}
 <a href="{$href}" class="delete"
 	{if in_array($id_shop, $shops_having_dependencies)}
-		onclick="jAlert('{l s='You cannot delete this shop\'s (customer and/or order dependency)' js=1}'); return false;"
+		onclick="jAlert('{l s='You cannot delete this shop\'s (customer and/or order dependency)'}'); return false;"
 	{elseif isset($confirm)}
-		onclick="if (confirm('{$confirm}')){ return true; } else { event.stopPropagation(); event.preventDefault();};"
+		onclick="if (confirm('{$confirm}')){ return true; }else{ event.stopPropagation(); event.preventDefault();};"
 	{/if} title="{$action}">
 	<img src="../img/admin/delete.gif" alt="{$action}" />
 </a>
--- a/admin-dev/themes/default/template/controllers/shop/tree.tpl
+++ b/admin-dev/themes/default/template/controllers/shop/tree.tpl
@@ -186,7 +186,7 @@ $("#multishop-tree").jstree({
 	'plugins': ["themes","json_data","cookies","contextmenu"],
 	'json_data': {
 		'ajax': {
-			'url': "{$link->getAdminLink('AdminShop')|addslashes}",
+			'url': "{$link->getAdminLink('AdminShop')}",
 			'data': function(n)
 			{
 				return {
--- a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
@@ -161,13 +161,6 @@ 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;
 }
@@ -185,7 +178,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" class="btn_delete_condition" colspan="3"><b>{l s='AND' js=1}</b></td></tr>');
+		$('#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(html);
 }

@@ -291,7 +284,7 @@ $(document).ready(function() {
 				$('#id_attribute_group option[value="{$condition.id_attribute_group}"]').attr('selected', true);
 				$('#id_attribute_{$condition.id_attribute_group} option[value="{$condition.value}"]').attr('selected', true);
 			{elseif $condition.type == 'feature'}
-				$('#id_feature option[value="{$condition.id_feature}"]').attr('selected', true);
+				$('#id_feature[value="{$condition.id_feature}"]').attr('selected', true);
 				$('#id_feature_{$condition.id_feature} option[value="{$condition.value}"]').attr('selected', true);
 			{else}
 				$('#id_{$condition.type} option[value="{$condition.value}"]').attr('selected', true);
--- a/admin-dev/themes/default/template/controllers/stats/calendar.tpl
+++ b/admin-dev/themes/default/template/controllers/stats/calendar.tpl
@@ -25,7 +25,7 @@

 <div id="statsContainer">
 	<div id="calendar">
-				<form action="{$current}&token={$token}{if $action && $table}&{$action|escape}{$table|escape}{/if}{if $identifier && $id}&{$identifier|escape}={$id|escape}{/if}{if isset($smarty.get.module)}&module={$smarty.get.module|escape}{/if}{if isset($smarty.get.id_product)}&id_product={$smarty.get.id_product|escape}{/if}" method="post" id="calendar_form" name="calendar_form">
+				<form action="{$current}&token={$token}{if $action && $table}&{$action}{$table}{/if}{if $identifier && $id}&{$identifier}={$id}{/if}" method="post" id="calendar_form" name="calendar_form">
 					<input type="submit" name="submitDateDay" class="button submitDateDay" value="{$translations.Day}">
 					<input type="submit" name="submitDateMonth" class="button submitDateMonth" value="{$translations.Month}">
 					<input type="submit" name="submitDateYear" class="button submitDateYear" value="{$translations.Year}">
@@ -51,4 +51,4 @@
 							});
 					});
 				</script>
-	</div>
+	</div>
--- a/admin-dev/themes/default/template/controllers/stats/engines.tpl
+++ b/admin-dev/themes/default/template/controllers/stats/engines.tpl
@@ -25,7 +25,7 @@

 <br/>
 <div class="blocEngine">
-	<form action="{$smarty.server.REQUEST_URI|escape}" method="post" id="settings_form" name="settings_form">
+	<form action="{$current}&token={$token}" method="post" id="settings_form" name="settings_form">
 		<h3 class="icon-{l s='Settings'}">{l s='Settings'}</h3>

 		<div class="rowForm">
--- a/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl
@@ -38,7 +38,7 @@
 	    if (html == 'false')
 	    {
 		$("#conf_id_PS_SHOP_STATE_ID").fadeOut();
-		$('#PS_SHOP_STATE_ID option[value=0]').attr("selected", "selected");
+		$('#id_state option[value=0]').attr("selected", "selected");
 	    }
 	    else
 	    {
--- a/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl
@@ -30,44 +30,55 @@
 <h2>{$supplier->name}</h2>

 <h3>{l s='Number of products:'} {count($products)}</h3>
-<table border="0" cellpadding="0" cellspacing="0" class="table" width="100%">
-	<tr>
-		<th>{l s='Product name'}</th>
-		<th>{l s='Attribute name'}</th>
-		<th>{l s='Supplier Reference'}</th>
-		<th>{l s='Wholesale price'}</th>
-		<th>{l s='Reference'}</th>
-		<th>{l s='EAN13'}</th>
-		<th>{l s='UPC'}</th>
-		{if $stock_management && $shopContext != Shop::CONTEXT_ALL}<th class="right">{l s='Available Quantity'}</th>{/if}
-	</tr>
 {foreach $products AS $product}
+	<hr />
 	{if !$product->hasAttributes()}
-		<tr>
-			<td><a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}">{$product->name}</a></td>
-			<td>{l s='N/A'}</td>
-			<td>{if empty($product->product_supplier_reference)}{l s='N/A'}{else}{$product->product_supplier_reference}{/if}</td>
-			<td>{if empty($product->product_supplier_price_te)}0{else}{$product->product_supplier_price_te}{/if}</td>
-			<td>{if empty($product->reference)}{l s='N/A'}{else}{$product->reference}{/if}</td>
-			<td>{if empty($product->ean13)}{l s='N/A'}{else}{$product->ean13}{/if}</td>
-			<td>{if empty($product->upc)}{l s='N/A'}{else}{$product->upc}{/if}</td>
-			{if $stock_management && $shopContext != Shop::CONTEXT_ALL}<td class="right" width="150">{$product->quantity}</td>{/if}
-		</tr>
-	{else}
-		{foreach $product->combination AS $id_product_attribute => $product_attribute}
-			<tr {if $id_product_attribute %2}class="alt_row"{/if} >
-				<td><a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}">{$product->name}</a></td>
-				<td>{if empty($product_attribute.attributes)}{l s='N/A'}{else}{$product_attribute.attributes}{/if}</td>
-				<td>{if empty($product_attribute.product_supplier_reference)}{l s='N/A'}{else}{$product_attribute.product_supplier_reference}{/if}</td>
-				<td>{if empty($product_attribute.product_supplier_price_te)}0{else}{$product_attribute.product_supplier_price_te}{/if}</td>
-				<td>{if empty($product_attribute.reference)}{l s='N/A'}{else}{$product_attribute.reference}{/if}</td>
-				<td>{if empty($product_attribute.ean13)}{l s='N/A'}{else}{$product_attribute.ean13}{/if}</td>
-				<td>{if empty($product_attribute.upc)}{l s='N/A'}{else}{$product_attribute.upc}{/if}</td>
-				{if $stock_management && $shopContext != Shop::CONTEXT_ALL}<td class="right">{$product_attribute.quantity}</td>{/if}
+		<table border="0" cellpadding="0" cellspacing="0" class="table" style="">
+			<tr>
+				<th  width="450">{l s='Name'} {$product->name}</th>
+				{if !empty($product->product_supplier_reference)}<th width="190">{l s='Supplier Reference:'} {$product->product_supplier_reference}</th>{/if}
+				{if !empty($product->product_supplier_price_te)}<th width="190">{l s='Wholesale price:'} {$product->product_supplier_price_te}</th>{/if}
+				{if !empty($product->reference)}<th width="150">{l s='Reference:'} {$product->reference}</th>{/if}
+				{if !empty($product->ean13)}<th width="120">{l s='EAN13:'} {$product->ean13}</th>{/if}
+				{if !empty($product->upc)}<th width="120">{l s='UPC:'} {$product->upc}</th>{/if}
+				{if $stock_management}<th class="right" width="150">{l s='Available Quantity:'} {$product->quantity}</th>{/if}
 			</tr>
-		{/foreach}
+		</table>
+	{else}
+		<h3><a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}">{$product->name}</a></h3>
+		<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:100%;">
+			<colgroup>
+				<col>
+				<col width="190">
+				<col width="190">
+				<col width="80">
+				<col width="80">
+				<col width="80">
+				<col width="80">
+			</colgroup>
+			<tr>
+				<th style="height:40px;">{l s='Attribute name'}</th>
+				<th>{l s='Supplier Reference'}</th>
+				<th >{l s='Wholesale price'}</th>
+				<th>{l s='Reference'}</th>
+				<th>{l s='EAN13'}</th>
+				<th>{l s='UPC'}</th>
+				{if $stock_management && $shopContext != Shop::CONTEXT_ALL}<th class="right">{l s='Available Quantity'}</th>{/if}
+			</tr>
+			{foreach $product->combination AS $id_product_attribute => $product_attribute}
+				<tr {if $id_product_attribute %2}class="alt_row"{/if} >
+					<td>{$product_attribute.attributes}</td>
+					<td>{$product_attribute.product_supplier_reference}</td>
+					<td>{$product_attribute.product_supplier_price_te}</td>
+					<td>{$product_attribute.reference}</td>
+					<td>{$product_attribute.ean13}</td>
+					<td>{$product_attribute.upc}</td>
+					{if $stock_management && $shopContext != Shop::CONTEXT_ALL}<td class="right">{$product_attribute.quantity}</td>{/if}
+				</tr>
+			{/foreach}
+		</table>
 	{/if}
 {/foreach}
-</table>
+
 {/block}

--- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl
@@ -138,7 +138,7 @@
 			// check if it's possible to add the product
 			if (product_infos == null || $('#cur_product_name').val() == '')
 			{
-				jAlert('{l s='Please select at least one product.' js=1}');
+				jAlert('{l s='Please select at least one product.'}');
 				return false;
 			}

--- a/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
@@ -33,29 +33,22 @@
 			document.getElementById('typeTranslationForm').submit();
 		}

-		function addThemeSelect()
+		function addThemeSelect(el)
 		{
-			var list_type_for_theme = ['front', 'modules', 'pdf', 'mails'];
-			var type = $('select[name=type]').val();
+			var list_type_for_theme = [{foreach $translations_type_for_theme as $type}'{$type}', {/foreach}];
+			var type = el.value;

 			$('select[name=theme]').hide();
 			for (i=0; i < list_type_for_theme.length; i++)
 				if (list_type_for_theme[i] == type)
-				{
 					$('select[name=theme]').show();
-					if (type == 'front')
-						$('select[name=theme]').children('option[value=""]').attr('disabled', true)
-					else
-						$('select[name=theme]').children('option[value=""]').attr('disabled', false)
-				}
 				else
 					$('select[name=theme]').val('{$theme_default}');
 		}

 		$(document).ready(function(){
-			addThemeSelect();
 			$('select[name=type]').change(function() {
-				addThemeSelect();
+				addThemeSelect(this);
 			});
 		});
 	</script>
@@ -67,15 +60,15 @@
 		<form method="get" action="index.php" id="typeTranslationForm">
 			<input type="hidden" name="controller" value="AdminTranslations" />
 			<input type="hidden" name="lang" id="translation_lang" value="0" />
-			<select name="type" style="float:left;margin-right:10px">
+			<select name="type" style="float:left; margin-right:10px;">
 				{foreach $translations_type as $type => $array}
-					<option value="{$type}">{$array.name}</option>
+					<option value="{$type}">{$array.name} &nbsp;</option>
 				{/foreach}
 			</select>
-			<select name="theme" style="float:left;margin-right:10px">
-				<option value="">{l s='Core (no theme selected)'}</option>
+			<select name="theme" style="float:left; margin-right:10px;">
 				{foreach $themes as $theme}
-					<option value="{$theme->directory}" {if $id_theme_current == $theme->id}selected=selected{/if}>{$theme->name}</option>
+
+					<option value="{$theme->directory}" {if $id_theme_current == $theme->id}selected=selected{/if}>{$theme->name} &nbsp;</option>
 				{/foreach}
 			</select>
 			{foreach $languages as $language}
--- a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
@@ -92,7 +92,7 @@
 		<br />

 		{foreach $modules_translations as $theme_name => $theme}
-			{if $theme_name}<h2>&gt;{l s='Theme:'} <a name="{$theme_name}">{$theme_name}</h2>{/if}
+			<h2>&gt;{l s='Theme:'} <a name="{$theme_name}">{if $theme_name === $default_theme_name}{l s='default'}{else}{$theme_name}{/if} </h2>
 			{foreach $theme as $module_name => $module}
 				<h3>{l s='Module:'} <a name="{$module_name}" style="font-style:italic">{$module_name}</a></h3>
 				{foreach $module as $template_name => $newLang}
@@ -107,7 +107,7 @@
 							{$missing_translations_module = 0}
 						{/if}
 						<fieldset>
-							<legend style="cursor : pointer" onclick="$('#{$theme_name}_{$module_name}_{$template_name|replace:'.':'_'}').slideToggle();">{if $theme_name}{$theme_name} - {/if}{$template_name}
+							<legend style="cursor : pointer" onclick="$('#{$theme_name}_{$module_name}_{$template_name|replace:'.':'_'}').slideToggle();">{if $theme_name === 'default'}{l s='default'}{else}{$theme_name}{/if} - {$template_name}
 								<font color="blue">{$newLang|count}</font> {l s='expressions'} (<font color="red">{$missing_translations_module}</font>)
 							</legend>
 							<div name="{$type}_div" id="{$theme_name}_{$module_name}_{$template_name|replace:'.':'_'}" style="display:{if $missing_translations_module}block{else}none{/if}">
@@ -117,7 +117,7 @@
 											<td style="width: 40%">{$key|stripslashes}</td>
 											<td>= 
 												{* Prepare name string for md5() *}
-												{capture assign="name"}{strtolower($module_name)}{if $theme_name}_{strtolower($theme_name)}{/if}_{strtolower($template_name)}_{md5($key)}{/capture}
+												{capture assign="name"}{strtolower($module_name)}_{strtolower($theme_name)}_{strtolower($template_name)}_{md5($key)}{/capture}
 												{if $key|strlen < $textarea_sized}
 													<input type="text" 
 														style="width: 450px{if empty($value.trad)};background:#FBB{/if}"
--- a/admin-dev/themes/default/template/footer.tpl
+++ b/admin-dev/themes/default/template/footer.tpl
@@ -22,32 +22,33 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-			<div style="clear:both;height:0;line-height:0">&nbsp;</div>
-		</div>
-		<div style="clear:both;height:0;line-height:0">&nbsp;</div>
-	</div>
-{if $display_footer}
-{hook h="displayBackOfficeFooter"}
-			<div id="footer">
-				<div class="footerLeft">
-					<a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a><br />
-					<span>{l s='Load time: '}{number_format(microtime(true) - $timer_start, 3, '.', '')}s</span>
+
+					<div style="clear:both;height:0;line-height:0">&nbsp;</div>
+					</div>
+					<div style="clear:both;height:0;line-height:0">&nbsp;</div>
 				</div>
-				<div class="footerRight">
-					{if $iso_is_fr}
-						<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?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>
+		{if $display_footer}
+				{hook h="displayBackOfficeFooter"}
+				<div id="footer">
+					<div class="footerLeft">
+						<a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a><br />
+						<span>{l s='Load time: '}{number_format(microtime(true) - $timer_start, 3, '.', '')}s</span>
+					</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
+						{/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>	
+					</div>
 				</div>
 			</div>
 		</div>
-	</div>
-	<div id="ajax_confirmation" style="display:none"></div>
-{* ajaxBox allows*}	<div id="ajaxBox" style="display:none"></div>
-{/if}
-	<div id="scrollTop"><a href="#top"></a></div>
-</body>
-</html>
+		<div id="ajax_confirmation" style="display:none"></div>
+		{* ajaxBox allows*}
+		<div id="ajaxBox" style="display:none"></div>
+		{/if}
+		<div id="scrollTop"><a href="#top"></a></div>
+	</body>
+</html>
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -69,7 +69,6 @@
 		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 }";
 	</script>
 {/if}

@@ -83,6 +82,7 @@
 		<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" />
 {if isset($displayBackOfficeHeader)}
@@ -91,15 +91,16 @@
 	<!--[if IE]>
 	<link type="text/css" rel="stylesheet" href="{$base_url}css/admin-ie.css" />
 	<![endif]-->
-{if isset($brightness)}
+	{if isset($brightness)}
 	<style type="text/css">
 		div#header_infos, div#header_infos a#header_shopname, div#header_infos a#header_logout, div#header_infos a#header_foaccess {ldelim}color:{$brightness}{rdelim}
 	</style>
-{/if}
+	{/if}
 </head>
 <body style="{if isset($bo_color) && $bo_color}background:{$bo_color};{/if}{if isset($bo_width) && $bo_width > 0}text-align:center;{/if}">
 {if $display_header}
 <div id="ajax_running"><img src="../img/admin/ajax-loader-yellow.gif" alt="" /> {l s='Loading...'}</div>
+
 <div id="top_container" {if $bo_width > 0}style="margin:auto;width:{$bo_width}px"{/if}>
 <div id="container">
 {* begin  HEADER *}
@@ -107,7 +108,7 @@
 		<div id="header_infos">
 			<a id="header_shopname" href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}"><span>{$shop_name}</span></a>
 			<div id="notifs_icon_wrapper">
-{if {$show_new_orders} == 1}
+				{if {$show_new_orders} == 1}
 					<div id="orders_notif" class="notifs">
 							<span id="orders_notif_number_wrapper" class="number_wrapper">
 								<span id="orders_notif_value">0</span>
@@ -119,8 +120,8 @@
 							<p><a href="index.php?controller=AdminOrders&amp;token={getAdminToken tab='AdminOrders'}">{l s='Show all orders'}</a></p>
 						</div>
 					</div>
-{/if}
-{if ($show_new_customers == 1)}
+				{/if}
+				{if ($show_new_customers == 1)}
 					<div id="customers_notif" class="notifs notifs_alternate">
 							<span id="customers_notif_number_wrapper" class="number_wrapper">
 								<span id="customers_notif_value">0</span>
@@ -132,8 +133,8 @@
 							<p><a href="index.php?controller=AdminCustomers&amp;token={getAdminToken tab='AdminCustomers'}">{l s='Show all customers'}</a></p>
 						</div>
 					</div>
-{/if}
-{if {$show_new_messages} == 1}
+				{/if}
+				{if {$show_new_messages} == 1}
 					<div id="customer_messages_notif" class="notifs">
 							<span id="customer_messages_notif_number_wrapper" class="number_wrapper">
 								<span id="customer_messages_notif_value">0</span>
@@ -145,8 +146,9 @@
 							<p><a href="index.php?tab=AdminCustomerThreads&amp;token={getAdminToken tab='AdminCustomerThreads'}">{l s='Show all messages'}</a></p>
 						</div>
 					</div>
-{/if}
+				{/if}
 			</div>
+		
 			<div id="employee_box">
 				<div id="employee_infos">
 					<div class="employee_name">{l s='Welcome,'} <strong>{$first_name}&nbsp;{$last_name}</strong></div>
@@ -155,13 +157,14 @@
 						<li><a href="{$link->getAdminLink('AdminEmployees')|escape:'htmlall':'UTF-8'}&id_employee={$employee->id}&amp;updateemployee">{l s='My preferences'}</a></li>
 						<li class="separator">&nbsp;</li>
 						<li><a id="header_logout" href="index.php?logout">{l s='logout'}</a></li>
-{if {$base_url}}
-						<li class="separator">&nbsp;</li>
-						<a href="{$base_url}" id="header_foaccess" target="_blank" title="{l s='View my shop'}">{l s='View my shop'}</a>
-{/if}
+						{if {$base_url}}
+							<li class="separator">&nbsp;</li>
+							<a href="{$base_url}" id="header_foaccess" target="_blank" title="{l s='View my shop'}">{l s='View my shop'}</a>
+						{/if}
 					</ul>
 				</div>
 			</div>
+			
 			<div id="header_search">
 				<form method="post" action="index.php?controller=AdminSearch&amp;token={getAdminToken tab='AdminSearch'}">
 					<input type="text" name="bo_query" id="bo_query" value="{$bo_query}" />
@@ -180,7 +183,8 @@
 					<input type="submit" id="bo_search_submit" class="button" value="{l s='Search'}"/>
 				</form>
 			</div>
-{if count($quick_access) > 0}
+
+			{if count($quick_access) > 0}
 			<div id="header_quick">
 				<select onchange="quickSelect(this);" id="quick_select" class="chosen no-search">
 					<option value="0">{l s='Quick Access'}</option>
@@ -189,15 +193,19 @@
 					{/foreach}
 				</select>
 			</div>
-{/if}
-{if isset($displayBackOfficeTop)}{$displayBackOfficeTop}{/if}
+			{/if}
+			{if isset($displayBackOfficeTop)}
+				{$displayBackOfficeTop}
+			{/if}
 		</div>{* end header_infos*}
+
 		<ul id="menu">
-{if !$tab}
-				<div class="mainsubtablist" style="display:none"></div>
-{/if}
-{foreach $tabs AS $t}
-{if $t.active}
+			{if !$tab}
+				<div class="mainsubtablist" style="display:none">
+				</div>
+			{/if}
+			{foreach $tabs AS $t}
+				{if $t.active}
 					<li class="submenu_size maintab {if $t.current}active{/if}" id="maintab{$t.id_tab}">
 						<a href="#" class="title">
 							<img src="{$t.img}" alt="" />{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}
@@ -205,25 +213,28 @@
 						<ul class="submenu">
 							{foreach from=$t.sub_tabs item=t2}
 								{if $t2.active}
-									<li{if $t2.current} class="active"{/if}><a href="{$t2.href|escape:'htmlall':'UTF-8'}">{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}</a></li>
+									<li><a href="{$t2.href|escape:'htmlall':'UTF-8'}">{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}</a></li>
 								{/if}
 							{/foreach}
 						</ul>
 					</li>
-{/if}
-{/foreach}
+				{/if}
+			{/foreach}
 		</ul>
-	</div>{* end header*}	
-{/if}
+	{/if}
+	</div>{* end header*}
+	
 	<div id="main">
 		<div id="content">
-{if $display_header && $install_dir_exists}
-		<div style="background-color: #FFEBCC;border: 1px solid #F90;line-height: 20px;margin: 0px 0px 10px;padding: 10px 20px;">
-			{l s='For security reasons, you must also:'}&nbsp;{l s='delete the /install folder'}
-		</div>
-{/if}
-{if $display_header && $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
-		<div class="multishop_toolbar">
-			<span class="text_multishop">{l s='Multistore configuration for'}</span> {$shop_list}
-		</div>
-{/if}
+		{if $display_header && $install_dir_exists}
+			<div style="background-color: #FFEBCC;border: 1px solid #F90;line-height: 20px;margin: 0px 0px 10px;padding: 10px 20px;">
+				{l s='For security reasons, you must also:'}  {l s='delete the /install folder'}
+			</div>
+		{/if}
+
+		{if $display_header && $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
+			<div class="multishop_toolbar">
+				<span class="text_multishop">{l s='Multistore configuration for'}</span>
+				{$shop_list}
+			</div>
+		{/if}
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -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="{$table}_form" class="defaultForm {$name_controller}" action="{$current}&{if !empty($submit_action)}{$submit_action}=1{/if}&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
 	{if $form_id}
 		<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
 	{/if}
@@ -234,29 +234,17 @@
 									{/foreach}
 								{elseif $input.type == 'file'}
 									{if isset($input.display_image) && $input.display_image}
-										{if isset($fields_value[$input.name].image) && $fields_value[$input.name].image}
+										{if isset($fields_value.image) && $fields_value.image}
 											<div id="image">
-												{$fields_value[$input.name].image}
-												<p align="center">{l s='File size'} {$fields_value[$input.name].size}kb</p>
+												{$fields_value.image}
+												<p align="center">{l s='File size'} {$fields_value.size}kb</p>
 												<a href="{$current}&{$identifier}={$form_id}&token={$token}&deleteImage=1">
 													<img src="../img/admin/delete.gif" alt="{l s='Delete'}" /> {l s='Delete'}
 												</a>
 											</div><br />
 										{/if}
 									{/if}
-									
-									{if isset($input.lang) AND $input.lang}
-										<div class="translatable">
-											{foreach $languages as $language}
-												<div class="lang_{$language.id_lang}" id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
-													<input type="file" name="{$input.name}_{$language.id_lang}" {if isset($input.id)}id="{$input.id}_{$language.id_lang}"{/if} />
-									
-												</div>
-											{/foreach}
-										</div>
-									{else}
-										<input type="file" name="{$input.name}" {if isset($input.id)}id="{$input.id}"{/if} />
-									{/if}
+									<input type="file" name="{$input.name}" {if isset($input.id)}id="{$input.id}"{/if} />
 									{if !empty($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
 								{elseif $input.type == 'password'}
 									<input type="password"
@@ -314,6 +302,7 @@
 										{if isset($input.class)}class="{$input.class}"
 										{else}class="color mColorPickerInput"{/if}
 										name="{$input.name}"
+										class="{if isset($input.class)}{$input.class}{/if}"
 										value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
 								{elseif $input.type == 'date'}
 									<input type="text"
@@ -354,13 +343,13 @@
 							{/if}
 						{/if}
 					{/foreach}
-					{hook h='displayAdminForm' fieldset=$f}
+					{hook h='displayAdminForm'}
 					{if isset($name_controller)}
 						{capture name=hookName assign=hookName}display{$name_controller|ucfirst}Form{/capture}
-						{hook h=$hookName fieldset=$f}
+						{hook h=$hookName}
 					{elseif isset($smarty.get.controller)}
 						{capture name=hookName assign=hookName}display{$smarty.get.controller|ucfirst|htmlentities}Form{/capture}
-						{hook h=$hookName fieldset=$f}
+						{hook h=$hookName}
 					{/if}
 				{elseif $key == 'submit'}
 					<div class="margin-form">
--- a/admin-dev/themes/default/template/helpers/form/form_category.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form_category.tpl
@@ -35,33 +35,39 @@
 			buildTreeView(use_context);
 		});
 	</script>
+
 	<div class="category-filter">
-		<span><a href="#" id="collapse_all">{$categories.trads['Collapse All']}</a>|&nbsp;</span>
-	 	<span><a href="#" id="expand_all">{$categories.trads['Expand All']}</a>|&nbsp;</span>		 
+		<span><a href="#" id="collapse_all" >{$categories.trads['Collapse All']}</a>
+		 |</span>
+		 <span><a href="#" id="expand_all" >{$categories.trads['Expand All']}</a>
 		{if !$categories.use_radio}
-		<span><a href="#" id="check_all">{$categories.trads['Check All']}</a>|&nbsp;</span>
-		<span><a href="#" id="uncheck_all">{$categories.trads['Uncheck All']}</a>|&nbsp;</span>
-		{/if}
+		 |</span>
+		 <span></span><a href="#" id="check_all" >{$categories.trads['Check All']}</a>
+		 |</span>
+		 <span></span><a href="#" id="uncheck_all" >{$categories.trads['Uncheck All']}</a></span>
+		 {/if}
 		{if $categories.use_search}
 			<span style="margin-left:20px">
-				{$categories.trads.search}:&nbsp;
+				{$categories.trads.search} :
 				<form method="post" id="filternameForm">
-					<input type="text" name="search_cat" id="search_cat"/>
+					<input type="text" name="search_cat" id="search_cat">
 				</form>
 			</span>
 		{/if}
 	</div>
+
 	{assign var=home_is_selected value=false}
+
 	{foreach $categories.selected_cat AS $cat}
 		{if is_array($cat)}
 			{if $cat.id_category != $categories.trads.Root.id_category}
-				<input {if in_array($cat.id_category, $categories.disabled_categories)}disabled="disabled"{/if} type="hidden" name="{$categories.input_name}" value="{$cat.id_category}"/>
+				<input {if in_array($cat.id_category, $categories.disabled_categories)}disabled="disabled"{/if} type="hidden" name="{$categories.input_name}" value="{$cat.id_category}" >
 			{else}
 				{assign var=home_is_selected value=true}
 			{/if}
 		{else}
 			{if $cat != $categories.trads.Root.id_category}
-				<input {if in_array($cat, $categories.disabled_categories)}disabled="disabled"{/if} type="hidden" name="{$categories.input_name}" value="{$cat}"/>
+				<input {if in_array($cat, $categories.disabled_categories)}disabled="disabled"{/if} type="hidden" name="{$categories.input_name}" value="{$cat}" >
 			{else}
 				{assign var=home_is_selected value=true}
 			{/if}
@@ -74,8 +80,8 @@
 					<input type="{if !$categories.use_radio}checkbox{else}radio{/if}"
 							name="{$categories.input_name}"
 							value="{$categories.trads.Root.id_category}"
-							{if $home_is_selected}checked="checked"{/if}
-							onclick="clickOnCategoryBox($(this));"/>
+							{if $home_is_selected}checked{/if}
+							onclick="clickOnCategoryBox($(this));" />
 						<span class="category_label">{$categories.trads.Root.name}</span>
 				{else}
 					&nbsp;
@@ -91,4 +97,4 @@
 		searchCategory();
 	</script>
 	{/if}
-{/if}
+{/if}
--- a/admin-dev/themes/default/template/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl
@@ -59,7 +59,7 @@
 			{block name="td_content"}
 				{if isset($params.prefix)}{$params.prefix}{/if}
 				{if isset($params.color) && isset($tr[$params.color])}
-					<span class="color_field" style="background-color:{$tr[$params.color]};color:{if Tools::getBrightness($tr[$params.color]) < 128}white{else}#383838{/if}">
+					<span class="color_field" style="background-color:{$tr.color};color:{if Tools::getBrightness($tr.color) < 128}white{else}#383838{/if}">
 				{/if}
 				{if isset($tr.$key)}
 					{if isset($params.active)}
@@ -116,8 +116,6 @@
 				{if isset($params.color) && isset($tr.color)}
 					</span>
 				{/if}
-			{/block}
-			{block name="close_td"}
 				</td>
 			{/block}
 		{/foreach}
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -27,8 +27,8 @@

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

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

 {if !$simple_header}
 <form method="post" action="{$action}" class="form">
-
-	{block name="override_form_extra"}{/block}
-
-	<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
+	<input type="hidden" id="submitFilter{$table}" name="submitFilter{$table}" value="0"/>
 {/if}
 	<table class="table_grid" name="list_table">
 		{if !$simple_header}
@@ -91,16 +88,16 @@
 				<td style="vertical-align: bottom;">
 					<span style="float: left;">
 						{if $page > 1}
-							<input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$list_id}').value=1"/>&nbsp;
-							<input type="image" src="../img/admin/list-prev.gif" onclick="getE('submitFilter{$list_id}').value={$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}"/>
 						{/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{$list_id}').value={$page + 1}"/>&nbsp;
-							<input type="image" src="../img/admin/list-next2.gif" onclick="getE('submitFilter{$list_id}').value={$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}"/>
 						{/if}
 						| {l s='Display'}
-						<select name="{$list_id}_pagination" onchange="submit()">
+						<select name="pagination" onchange="submit()">
 							{* Choose number of results per page *}
 							{foreach $pagination AS $value}
 								<option value="{$value|intval}"{if $selected_pagination == $value} selected="selected" {elseif $selected_pagination == NULL && $value == $pagination[1]} selected="selected2"{/if}>{$value|intval}</option>
@@ -109,8 +106,8 @@
 						/ {$list_total} {l s='result(s)'}
 					</span>
 					<span style="float: right;">
-						<input type="submit" id="submitFilterButton{$list_id}" name="submitFilter" value="{l s='Filter'}" class="button" />					
-						<input type="submit" name="submitReset{$list_id}" value="{l s='Reset'}" class="button" />
+						<input type="submit" name="submitReset{$table}" value="{l s='Reset'}" class="button" />
+						<input type="submit" id="submitFilterButton{$table}" name="submitFilter" value="{l s='Filter'}" class="button" />
 					</span>
 					<span class="clear"></span>
 				</td>
@@ -120,7 +117,7 @@
 			<td{if $simple_header} style="border:none;"{/if}>
 				<table
 				{if $table_id} id={$table_id}{/if}
-				class="table {if $table_dnd}tableDnD{/if} {$list_id}"
+				class="table {if $table_dnd}tableDnD{/if} {$table}"
 				cellpadding="0" cellspacing="0"
 				style="width: 100%; margin-bottom:10px;">
 					<col width="10px" />
@@ -137,7 +134,7 @@
 						<tr class="nodrag nodrop" style="height: 40px">
 							<th class="center">
 								{if $has_bulk_actions}
-									<input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, '{$list_id}Box[]', this.checked)" />
+									<input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, '{$table}Box[]', this.checked)" />
 								{/if}
 							</th>
 							{foreach $fields_display AS $key => $params}
@@ -148,9 +145,9 @@
 									</span>
 									{if (!isset($params.orderby) || $params.orderby) && !$simple_header}
 										<br />
-										<a href="{$currentIndex}&{$list_id}Orderby={$key|urlencode}&{$list_id}Orderway=desc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
+										<a href="{$currentIndex}&{$table}Orderby={$key|urlencode}&{$table}Orderway=desc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
 										<img border="0" src="../img/admin/down{if isset($order_by) && ($key == $order_by) && ($order_way == 'DESC')}_d{/if}.gif" /></a>
-										<a href="{$currentIndex}&{$list_id}Orderby={$key|urlencode}&{$list_id}Orderway=asc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
+										<a href="{$currentIndex}&{$table}Orderby={$key|urlencode}&{$table}Orderway=asc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
 										<img border="0" src="../img/admin/up{if isset($order_by) && ($key == $order_by) && ($order_way == 'ASC')}_d{/if}.gif" /></a>
 									{elseif !$simple_header}
 										<br />&nbsp;
@@ -186,17 +183,17 @@
 										--
 									{else}
 										{if $params.type == 'bool'}
-											<select onchange="$('#submitFilterButton{$list_id}').focus();$('#submitFilterButton{$list_id}').click();" name="{$list_id}Filter_{$key}">
+											<select onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}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>
 											</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 />
-											{l s='To'} <input type="text" class="filter datepicker" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($params.value.1)}{$params.value.1}{/if}"{if isset($params.width)} style="width:70px"{/if}/>
+											{l s='From'} <input type="text" class="filter datepicker" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($value.0)}$value.0{/if}"{if isset($params.width)} style="width:70px"{/if}/><br />
+											{l s='To'} <input type="text" class="filter datepicker" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($value.1)}$value.1{/if}"{if isset($params.width)} style="width:70px"{/if}/>
 										{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}>
+												<select onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}Filter_{$params.filter_key}" {if isset($params.width)} style="width:{$params.width}px"{/if}>
 													<option value="" {if $params.value == ''} selected="selected" {/if}>--</option>
 													{if isset($params.list) && is_array($params.list)}
 														{foreach $params.list AS $option_value => $option_display}
@@ -206,7 +203,7 @@
 												</select>
 											{/if}
 										{else}
-											<input type="text" class="filter" name="{$list_id}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'htmlall':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{else}style="width:95%"{/if} />
+											<input type="text" class="filter" name="{$table}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'htmlall':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{else}style="width:95%"{/if} />
 										{/if}
 									{/if}
 								</td>
--- a/admin-dev/themes/default/template/helpers/modules_list/list.tpl
+++ b/admin-dev/themes/default/template/helpers/modules_list/list.tpl
@@ -31,7 +31,7 @@
 				{counter start=1  assign="count"}
 					{foreach from=$modules_list item=module}	
 						<div style="width:400px">{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",row alt"}}</div>
-						{if $count %3 == 0}
+						{if $count %2 == 0}
 			</li>
 			<li>
 						{/if}
--- a/admin-dev/themes/default/template/layout-export.tpl
+++ b/admin-dev/themes/default/template/layout-export.tpl
@@ -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
 *}
-{$export_precontent}{foreach from=$export_headers item=header}{$header};{/foreach}
+{foreach from=$export_headers item=header}{$header};{/foreach}
 {foreach from=$export_content item=line}

 {foreach from=$line item=content}{$content};{/foreach}
--- a/admin-dev/themes/default/template/layout.tpl
+++ b/admin-dev/themes/default/template/layout.tpl
@@ -35,7 +35,7 @@
 		</span>
 		
 		{if count($errors) == 1}
-			{reset($errors)}
+			{$errors[0]}
 		{else}
 			{l s='%d errors' sprintf=$errors|count}
 			<br/>
@@ -47,6 +47,7 @@
 		{/if}
 	</div>
 {/if}
+
 {if isset($informations) && count($informations) && $informations}
 	<div class="hint clear" style="display:block;">
 		<span id="see_more_infos">
@@ -59,6 +60,7 @@
 		</div>
 	</div><br />
 {/if}
+
 {if isset($confirmations) && count($confirmations) && $confirmations}
 	<div class="conf" style="display:block;">
 		{foreach $confirmations as $conf}
@@ -66,6 +68,7 @@
 		{/foreach}
 	</div><br />
 {/if}
+
 {if count($warnings)}
 	<div class="warn">
 		<span style="float:right">
@@ -91,5 +94,6 @@
 		{/if}
 	</div>
 {/if}
+
 {$page}
-{include file='footer.tpl'}
+{include file='footer.tpl'}
--- a/admin-dev/themes/default/template/toolbar.tpl
+++ b/admin-dev/themes/default/template/toolbar.tpl
@@ -38,7 +38,7 @@
 							<div style="float:right;margin:5px">
 								<a href="#" onclick="$('#modules_list_container').slideUp();return false;"><img alt="X" src="../img/admin/close.png"></a>
 							</div>
-							<div id="modules_list_loader"><img src="../img/loader.gif" alt="" border="0" /></div>
+							<div id="modules_list_loader"><img src="../img/loader.gif" alt="" border="0"></div>
 							<div id="modules_list_container_tab" style="display:none;"></div>
 							</div>
 						{/if}
--- a/attachment.php
+++ b/attachment.php
@@ -34,4 +34,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();

-Tools::redirect('index.php?controller=attachment'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
+Tools::redirect('index.php?controller=attachment'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
--- a/authentication.php
+++ b/authentication.php
@@ -34,4 +34,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();

-Tools::redirect('index.php?controller=authentication'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
+Tools::redirect('index.php?controller=authentication'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
--- a/best-sales.php
+++ b/best-sales.php
@@ -34,4 +34,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();

-Tools::redirect('index.php?controller=best-sales'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
+Tools::redirect('index.php?controller=best-sales'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
--- a/cache/class_index.php
+++ b/cache/class_index.php
@@ -25,8 +25,6 @@
  'AdminAttributesGroupsControllerCore' => 'controllers/admin/AdminAttributesGroupsController.php',
  'AdminBackupController' => '',
  'AdminBackupControllerCore' => 'controllers/admin/AdminBackupController.php',
-  'AdminCarrierWizardController' => '',
-  'AdminCarrierWizardControllerCore' => 'controllers/admin/AdminCarrierWizardController.php',
  'AdminCarriersController' => '',
  'AdminCarriersControllerCore' => 'controllers/admin/AdminCarriersController.php',
  'AdminCartRulesController' => '',
--- a/category.php
+++ b/category.php
@@ -34,4 +34,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();

-Tools::redirect('index.php?controller=category'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
+Tools::redirect('index.php?controller=category'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
--- a/changecurrency.php
+++ b/changecurrency.php
@@ -34,4 +34,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();

-Tools::redirect('index.php?controller=change-currency'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
+Tools::redirect('index.php?controller=change-currency'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
--- a/classes/Address.php
+++ b/classes/Address.php
@@ -222,7 +222,7 @@ class AddressCore extends ObjectModel
 	public function validateController($htmlentities = true)
 	{
 		$errors = parent::validateController($htmlentities);
-		if (!Configuration::get('VATNUMBER_MANAGEMENT') || !Configuration::get('VATNUMBER_CHECKING'))
+		if (!Configuration::get('VATNUMBER_CHECKING'))
 			return $errors;
 		include_once(_PS_MODULE_DIR_.'vatnumber/vatnumber.php');
 		if (class_exists('VatNumber', false))
@@ -237,8 +237,6 @@ class AddressCore extends ObjectModel
 	 */
 	public static function getZoneById($id_address)
 	{
-		if(!isset($id_address) || empty($id_address))
-			return false;
 		if (isset(self::$_idZones[$id_address]))
 			return self::$_idZones[$id_address];

@@ -261,9 +259,6 @@ class AddressCore extends ObjectModel
 	 */
 	public static function isCountryActiveById($id_address)
 	{
-		if(!isset($id_address) || empty($id_address))
-			return false;
-
 		if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
 		SELECT c.`active`
 		FROM `'._DB_PREFIX_.'address` a
@@ -313,10 +308,11 @@ class AddressCore extends ObjectModel
 	{
 		$key = 'address_exists_'.(int)$id_address;
 		if (!Cache::isStored($key))
-		{
-			$id_address = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT `id_address` FROM '._DB_PREFIX_.'address a WHERE a.`id_address` = '.(int)$id_address);
-			Cache::store($key, (bool)$id_address);
-		}
+				Cache::store(
+					$key, Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
+							SELECT `id_address`
+							FROM '._DB_PREFIX_.'address a
+							WHERE a.`id_address` = '.(int)$id_address));
 		return Cache::retrieve($key);
 	}

--- a/classes/AdminTab.php
+++ b/classes/AdminTab.php
@@ -1676,9 +1676,9 @@ abstract class AdminTabCore
 					elseif (isset($params['float']))
 						echo rtrim(rtrim($tr[$key], '0'), '.');
 					elseif (isset($params['type']) && $params['type'] == 'date')
-						echo Tools::displayDate($tr[$key]);
+						echo Tools::displayDate($tr[$key], $this->context->language->id);
 					elseif (isset($params['type']) && $params['type'] == 'datetime')
-						echo Tools::displayDate($tr[$key],null , true);
+						echo Tools::displayDate($tr[$key], $this->context->language->id, true);
 					elseif (isset($tr[$key]))
 					{
 						if ($key == 'price')
--- a/classes/Attribute.php
+++ b/classes/Attribute.php
@@ -71,7 +71,7 @@ class AttributeCore extends ObjectModel

 	public function delete()
 	{
-		if (!$this->hasMultishopEntries() || Shop::getContext() == Shop::CONTEXT_ALL)
+		if (!$this->hasMultishopEntries())
 		{
 			$result = Db::getInstance()->executeS('SELECT id_product_attribute FROM '._DB_PREFIX_.'product_attribute_combination WHERE id_attribute = '.(int)$this->id);
 			foreach ($result as $row)
@@ -343,4 +343,4 @@ class AttributeCore extends ObjectModel

 		return (is_numeric($position)) ? $position : -1;
 	}
-}
+}
--- a/classes/AttributeGroup.php
+++ b/classes/AttributeGroup.php
@@ -70,11 +70,6 @@ class AttributeGroupCore extends ObjectModel

 	public function add($autodate = true, $nullValues = false)
 	{
-		if ($this->group_type == 'color')
-			$this->is_color_group = 1;
-		else
-			$this->is_color_group = 0;
-		
 		if ($this->position <= 0)
 			$this->position = AttributeGroup::getHigherPosition() + 1;

@@ -85,16 +80,11 @@ class AttributeGroupCore extends ObjectModel

 	public function update($nullValues = false)
 	{
-		if ($this->group_type == 'color')
-			$this->is_color_group = 1;
-		else
-			$this->is_color_group = 0;
-		
 		$return = parent::update($nullValues);
 		Hook::exec('actionAttributeGroupSave', array('id_attribute_group' => $this->id));
 		return $return;
 	}
-	
+
 	public static function cleanDeadCombinations()
 	{
 		$attribute_combinations = Db::getInstance()->executeS('
@@ -119,7 +109,7 @@ class AttributeGroupCore extends ObjectModel

 	public function delete()
 	{
-		if (!$this->hasMultishopEntries() || Shop::getContext() == Shop::CONTEXT_ALL)
+		if (!$this->hasMultishopEntries())
 		{
 			/* Select children in order to find linked combinations */
 			$attribute_ids = Db::getInstance()->executeS('
@@ -142,15 +132,12 @@ class AttributeGroupCore extends ObjectModel
 			if (!AttributeGroup::cleanDeadCombinations())
 				return false;
 		 	/* Also delete related attributes */
-			if (count($to_remove))
-				if (!Db::getInstance()->execute('
+			if (Db::getInstance()->execute('
 				DELETE FROM `'._DB_PREFIX_.'attribute_lang`
-				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;
+				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;
 			$this->cleanPositions();
 		}
 		$return = parent::delete();
--- a/classes/Autoload.php
+++ b/classes/Autoload.php
@@ -136,17 +136,27 @@ class Autoload
 		}
 		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);
+			// Let's write index content in cache file
+			// In order to be sure that this file is correctly written, a check is done on the file content
+			$loop_protection = 0;
+			do
+			{
+				$integrity_is_ok = false;
+				file_put_contents($filename, $content, LOCK_EX);
+				if ($loop_protection++ > 10)
+					break;
+
+				// If the file content end with PHP tag, integrity of the file is ok
+				if (preg_match('#\?>\s*$#', file_get_contents($filename)))
+					$integrity_is_ok = true;
 			}
-            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);
+			while (!$integrity_is_ok);
+
+			if (!$integrity_is_ok)
+			{
+				file_put_contents($filename, '<?php return array(); ?>', LOCK_EX);
+				// Cannot use PrestaShopException in this context
+				die('Your file '.$filename.' is corrupted. Please remove this file, a new one will be regenerated automatically');
 			}
 		}

--- a/classes/Blowfish.php
+++ b/classes/Blowfish.php
@@ -42,7 +42,7 @@ class BlowfishCore extends Crypt_Blowfish
 			$piece = substr($paddedtext, $x, 8);
 			$cipher_piece = parent::encrypt($piece);
 			$encoded = base64_encode($cipher_piece); 
-			$ciphertext = $ciphertext.$encoded;
+			$ciphertext = $ciphertext.$encoded;       
 		}
 	   return $ciphertext.sprintf('%06d', $length);  
 	}
--- a/classes/CMS.php
+++ b/classes/CMS.php
@@ -53,7 +53,7 @@ class CMSCore extends ObjectModel
 			'meta_keywords' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 255),
 			'meta_title' =>			array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 128),
 			'link_rewrite' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isLinkRewrite', 'required' => true, 'size' => 128),
-			'content' => 			array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml', 'size' => 3999999999999),
+			'content' => 			array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isString', 'size' => 3999999999999),
 		),
 	);

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
François Gaillard	e3d9613abf	// Development branch merged	2013-03-27 10:43:43 +01:00
Damien Metzger	1d03f35748	Merge pull request #267 from dSkrbic/patch-1 // translations	2013-02-27 00:48:46 -08:00
dSkrbic	808fec8f4c	// translations	2013-02-11 18:42:50 +01:00
Damien Metzger	3310d7582c	// Fix upgrade	2012-12-31 15:17:35 +01:00
Damien Metzger	15b26ee239	// Changelog, readme and install_version.php	2012-12-31 14:37:29 +01:00
Rémi Gaillard	92a64c0c76	// oups....	2012-12-31 13:52:28 +01:00
Rémi Gaillard	17aed56146	// small fix	2012-12-31 13:52:28 +01:00
Rémi Gaillard	7744068783	[-] FO: Fix retrocompatibility for modules and old themes	2012-12-31 13:52:27 +01:00
Damien Metzger	41798f3d8b	// Just to be sure...	2012-12-31 13:52:27 +01:00
Damien Metzger	03101f3bab	[-] BO : fixed accentuated URLs in products	2012-12-31 13:52:27 +01:00
PrestaEdit	1986ed9fef	[-] Project: Fix bug when you want to upload (and resize) an image	2012-12-31 13:52:26 +01:00
Damien Metzger	a18eb5bebe	// Missing part of a fix	2012-12-31 13:52:26 +01:00
Rémi Gaillard	23ecbcbeaa	[-] FO: Fix PHP warning on category controller	2012-12-31 13:52:15 +01:00
Rémi Gaillard	2903ab096a	[-] Installer: Fix #PSCFV-6392 redirect_type was missing on upgrade	2012-12-31 13:52:15 +01:00
vAugagneur	d571f91e74	Merge branch 'release'	2012-12-28 16:16:40 +01:00
vAugagneur	5cfd0c6f9a	Merge branch 'release'	2012-12-28 10:40:40 +01:00
vAugagneur	e36548ad3c	//updated CONTRIBUTING.md & CONTRIBUTORS.md thanks to @all	2012-11-30 10:56:18 +01:00
François Gaillard	4f269e87a4	// .DS_Store files added to .gitignore	2012-11-26 11:21:23 +01:00
vAugagneur	3eebb2d620	//added CONTRIBUTING.md CONTRIBUTORS.md README.md	2012-11-22 14:57:18 +01:00