// CHANGELOG

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15948 b9a71923-0436-4b27-9f14-aed3839534dd

address.php

@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=address'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __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');

addresses.php

@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=addresses'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __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');

admin-dev/ajax.php

@@ -92,171 +92,6 @@ if (Tools::isSubmit('getAvailableFields') AND Tools::isSubmit('entity'))
 	die('['.implode(',', $jsonArray).']');
 }
 
-if (Tools::isSubmit('ajaxModulesPositions'))
-{
-	$id_module = (int)(Tools::getValue('id_module'));
-	$id_hook = (int)(Tools::getValue('id_hook'));
-	$way = (int)(Tools::getValue('way'));
-	$positions = Tools::getValue(strval($id_hook));
-	$position = (is_array($positions)) ? array_search($id_hook.'_'.$id_module, $positions) : null;
-	$module = Module::getInstanceById($id_module);
-	if (Validate::isLoadedObject($module))
-		if ($module->updatePosition($id_hook, $way, $position))
-			die(true);
-		else
-			die('{"hasError" : true, "errors" : "Can not update module position"}');
-	else
-		die('{"hasError" : true, "errors" : "This module can not be loaded"}');
-}
-
-if (Tools::isSubmit('ajaxCategoriesPositions'))
-{
-	$id_category_to_move = (int)(Tools::getValue('id_category_to_move'));
-	$id_category_parent = (int)(Tools::getValue('id_category_parent'));
-	$way = (int)(Tools::getValue('way'));
-	$positions = Tools::getValue('category');
-	if (is_array($positions))
-		foreach ($positions AS $key => $value)
-		{
-			$pos = explode('_', $value);
-			if ((isset($pos[1]) AND isset($pos[2])) AND ($pos[1] == $id_category_parent AND $pos[2] == $id_category_to_move))
-			{
-				$position = $key + 1;
-				break;
-			}
-		}
-
-	$category = new Category($id_category_to_move);
-	if (Validate::isLoadedObject($category))
-	{
-		if (isset($position) && $category->updatePosition($way, $position))
-		{
-			Hook::exec('actionCategoryUpdate');
-			die(true);
-		}
-		else
-			die('{"hasError" : true, errors : "Can not update categories position"}');
-	}
-	else
-		die('{"hasError" : true, "errors" : "This category can not be loaded"}');
-
-}
-
-if (Tools::isSubmit('ajaxCMSCategoriesPositions'))
-{
-	$id_cms_category_to_move = (int)(Tools::getValue('id_cms_category_to_move'));
-	$id_cms_category_parent = (int)(Tools::getValue('id_cms_category_parent'));
-	$way = (int)(Tools::getValue('way'));
-	$positions = Tools::getValue('cms_category');
-	if (is_array($positions))
-		foreach ($positions AS $key => $value)
-		{
-			$pos = explode('_', $value);
-			if ((isset($pos[1]) AND isset($pos[2])) AND ($pos[1] == $id_cms_category_parent AND $pos[2] == $id_cms_category_to_move))
-			{
-				$position = $key;
-				break;
-			}
-		}
-	$cms_category = new CMSCategory($id_cms_category_to_move);
-	if (Validate::isLoadedObject($cms_category))
-	{
-		if (isset($position) && $cms_category->updatePosition($way, $position))
-			die(true);
-		else
-			die('{"hasError" : true, "errors" : "Can not update cms categories position"}');
-	}
-	else
-		die('{"hasError" : true, "errors" : "This cms category can not be loaded"}');
-}
-
-if (Tools::isSubmit('ajaxCMSPositions'))
-{
-	$id_cms = (int)(Tools::getValue('id_cms'));
-	$id_category = (int)(Tools::getValue('id_cms_category'));
-	$way = (int)(Tools::getValue('way'));
-	$positions = Tools::getValue('cms');
-	if (is_array($positions))
-		foreach ($positions AS $key => $value)
-		{
-			$pos = explode('_', $value);
-			if ((isset($pos[1]) AND isset($pos[2])) AND ($pos[1] == $id_category AND $pos[2] == $id_cms))
-			{
-				$position = $key;
-				break;
-			}
-		}
-	$cms = new CMS($id_cms);
-	if (Validate::isLoadedObject($cms))
-	{
-		if (isset($position) && $cms->updatePosition($way, $position))
-			die(true);
-		else
-			die('{"hasError" : true, "errors" : "Can not update cms position"}');
-	}
-	else
-		die('{"hasError" : true, "errors" : "This cms can not be loaded"}');
-}
-
-/* Modify product position in catalog */
-if (Tools::isSubmit('ajaxProductsPositions'))
-{
-	$way = (int)(Tools::getValue('way'));
-	$id_product = (int)(Tools::getValue('id_product'));
-	$id_category = (int)(Tools::getValue('id_category'));
-	$positions = Tools::getValue('product');
-
-	if (is_array($positions))
-		foreach ($positions AS $position => $value)
-		{
-			// pos[1] = id_categ, pos[2] = id_product, pos[3]=old position
-			$pos = explode('_', $value);
-
-			if ((isset($pos[1]) AND isset($pos[2])) AND ($pos[1] == $id_category AND (int)$pos[2] === $id_product))
-			{
-				if ($product = new Product((int)$pos[2]))
-					if (isset($position) && $product->updatePosition($way, $position))
-						echo "ok position ".(int)$position." for product ".(int)$pos[2]."\r\n";
-					else
-						echo '{"hasError" : true, "errors" : "Can not update product '. (int)$id_product . ' to position '.(int)$position.' "}';
-				else
-					echo '{"hasError" : true, "errors" : "This product ('.(int)$id_product.') can t be loaded"}';
-
-				break;
-			}
-		}
-}
-
-if (Tools::isSubmit('ajaxProductImagesPositions'))
-{
-	$id_image = (int)(Tools::getValue('id_image'));
-	$way = (int)(Tools::getValue('way'));
-	$positions = Tools::getValue('imageTable');
-
-	if (is_array($positions))
-		foreach ($positions AS $key => $value)
-		{
-			$pos = explode('_', $value);
-			if ((isset($pos[1])) AND ($pos[1] == $id_image))
-			{
-				// +1 is added because images position range starts from 1 instead of 0 for other objects (products, categories...)
-				$position = ($key + 1);
-				break;
-			}
-		}
-	$image = new Image($id_image);
-	if (Validate::isLoadedObject($image))
-	{
-		if (isset($position) && $image->updatePosition($way, $position))
-			die(true);
-		else
-			die('{"hasError" : true, "errors" : "Cannot update image position"}');
-	}
-	else
-		die('{"hasError" : true, "errors" : "This image cannot be loaded"}');
-}
-
-
 if (Tools::isSubmit('ajaxProductPackItems'))
 {
 	$jsonArray = array();
@@ -463,7 +298,7 @@ if (Tools::isSubmit('getHookableList'))
 			if (!array_key_exists($hook_name, $hookableList))
 				$hookableList[$hook_name] = array();
 			if ($moduleInstance->isHookableOn($hook_name))
-				array_push($hookableList[$hook_name], $module);
+				array_push($hookableList[$hook_name], str_replace('_', '-', $module));
 		}
 
 	}
@@ -740,126 +575,6 @@ if (Tools::isSubmit('syncImapMail'))
 	die('{"hasError" : false, "errors" : ["'.$str_errors.$str_error_delete.'"]}');
 }
 
-/* Modify attribute position */
-if (Tools::isSubmit('ajaxAttributesPositions'))
-{
-	$way = (int)Tools::getValue('way');
-	$id_attribute = (int)Tools::getValue('id_attribute');
-	$id_attribute_group = (int)Tools::getValue('id_attribute_group');
-	$positions = Tools::getValue('attribute');
-
-	if (is_array($positions))
-		foreach ($positions as $position => $value)
-		{
-			// pos[1] = id_attribute_group, pos[2] = id_attribute, pos[3]=old position
-			$pos = explode('_', $value);
-
-			if ((isset($pos[1]) && isset($pos[2])) && ($pos[1] == $id_attribute_group && (int)$pos[2] === $id_attribute))
-			{
-				if ($attribute = new Attribute((int)$pos[2]))
-					if (isset($position) && $attribute->updatePosition($way, $position))
-						echo "ok position ".(int)$position." for attribute ".(int)$pos[2]."\r\n";
-					else
-						echo '{"hasError" : true, "errors" : "Can not update attribute '. (int)$id_attribute . ' to position '.(int)$position.' "}';
-				else
-					echo '{"hasError" : true, "errors" : "This attribute ('.(int)$id_attribute.') can t be loaded"}';
-
-				break;
-			}
-		}
-}
-
-/* Modify group attribute position */
-if (Tools::isSubmit('ajaxGroupsAttributesPositions'))
-{
-	$way = (int)Tools::getValue('way');
-	$id_attribute_group = (int)Tools::getValue('id_attribute_group');
-	$positions = Tools::getValue('attribute_group');
-
-	$new_positions = array();
-	foreach($positions as $k => $v)
-		if (count(explode('_', $v)) == 4)
-			$new_positions[] = $v;
-
-	foreach ($new_positions as $position => $value)
-	{
-		// pos[1] = id_attribute_group, pos[2] = old position
-		$pos = explode('_', $value);
-
-		if (isset($pos[2]) && (int)$pos[2] === $id_attribute_group)
-		{
-			if ($group_attribute = new AttributeGroup((int)$pos[2]))
-				if (isset($position) && $group_attribute->updatePosition($way, $position))
-					echo "ok position ".(int)$position." for group attribute ".(int)$pos[2]."\r\n";
-				else
-					echo '{"hasError" : true, "errors" : "Can not update group attribute '. (int)$id_attribute_group . ' to position '.(int)$position.' "}';
-			else
-				echo '{"hasError" : true, "errors" : "This group attribute ('.(int)$id_attribute_group.') can t be loaded"}';
-
-			break;
-		}
-	}
-}
-
-/* Modify feature position */
-if (Tools::isSubmit('ajaxFeaturesPositions'))
-{
-	$way = (int)Tools::getValue('way');
-	$id_feature = (int)Tools::getValue('id_feature');
-	$positions = Tools::getValue('feature');
-
-	$new_positions = array();
-	foreach($positions as $k => $v)
-		if (!empty($v))
-			$new_positions[] = $v;
-
-	foreach ($new_positions as $position => $value)
-	{
-		// pos[2] = id_feature, pos[3] = old position
-		$pos = explode('_', $value);
-
-		if (isset($pos[2]) && (int)$pos[2] === $id_feature)
-		{
-			if ($feature = new Feature((int)$pos[2]))
-				if (isset($position) && $feature->updatePosition($way, $position))
-					echo "ok position ".(int)$position." for feature ".(int)$pos[1]."\r\n";
-				else
-					echo '{"hasError" : true, "errors" : "Can not update feature '. (int)$id_feature . ' to position '.(int)$position.' "}';
-			else
-				echo '{"hasError" : true, "errors" : "This feature ('.(int)$id_feature.') can t be loaded"}';
-
-			break;
-		}
-	}
-}
-
-/* Modify carrier position */
-if (Tools::isSubmit('ajaxCarriersPositions'))
-{
-	$way = (int)(Tools::getValue('way'));
-	$id_carrier = (int)(Tools::getValue('id_carrier'));
-	$positions = Tools::getValue('carrier');
-
-
-	foreach ($positions as $position => $value)
-	{
-		$pos = explode('_', $value);
-
-		if (isset($pos[2]) && (int)$pos[2] === $id_carrier)
-		{
-			if ($carrier = new Carrier((int)$pos[2]))
-				if (isset($position) && $carrier->updatePosition($way, $position))
-					echo "ok position ".(int)$position." for carrier ".(int)$pos[1]."\r\n";
-				else
-					echo '{"hasError" : true, "errors" : "Can not update carrier '. (int)$id_carrier . ' to position '.(int)$position.' "}';
-			else
-				echo '{"hasError" : true, "errors" : "This carrier ('.(int)$id_carrier.') can t be loaded"}';
-
-			break;
-		}
-	}
-}
-
 if (Tools::isSubmit('searchCategory'))
 {
 	$q = Tools::getValue('q');
@@ -912,37 +627,3 @@ if (Tools::isSubmit('getZones'))
 	$array = array('hasError' => false, 'errors' => '', 'data' => $html);
 	die(Tools::jsonEncode($html));
 }
-
-/* Modify carrier position */
-if (Tools::isSubmit('ajaxTabsPositions'))
-{
-	$way = (int)(Tools::getValue('way'));
-	$id_tab = (int)(Tools::getValue('id_tab'));
-	$positions = Tools::getValue('tab');
-
-	// when changing positions in a tab sub-list, the first array value is empty and needs to be removed
-	if (!$positions[0])
-	{
-		unset($positions[0]);
-		// reset indexation from 0
-		$positions = array_merge($positions);
-	}
-
-	foreach ($positions as $position => $value)
-	{
-		$pos = explode('_', $value);
-
-		if (isset($pos[2]) && (int)$pos[2] === $id_tab)
-		{
-			if ($tab = new Tab((int)$pos[2]))
-				if (isset($position) && $tab->updatePosition($way, $position))
-					echo "ok position ".(int)$position." for tab ".(int)$pos[1]."\r\n";
-				else
-					echo '{"hasError" : true, "errors" : "Can not update tab '. (int)$id_tab . ' to position '.(int)$position.' "}';
-			else
-				echo '{"hasError" : true, "errors" : "This tab ('.(int)$id_tab.') can t be loaded"}';
-
-			break;
-		}
-	}
-}

admin-dev/ajax_send_mail_test.php

@@ -29,7 +29,8 @@ include_once(dirname(__FILE__).'/../config/config.inc.php');
 
 /* Getting cookie or logout */
 require_once(dirname(__FILE__).'/init.php');
-
+if (Tools::getValue('token') != Tools::getAdminTokenLite('AdminEmails'))
+	die(Tools::displayError());
 $smtpChecked = (trim($_POST['mailMethod']) ==  'smtp');
 $smtpServer = $_POST['smtpSrv'];
 $content = urldecode($_POST['testMsg']);

admin-dev/ajaxfilemanager/_ajax_load_folders.php

@@ -1,6 +1,7 @@
 <?php
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 ?>

admin-dev/ajaxfilemanager/ajax_create_folder.php

@@ -6,6 +6,8 @@
 	 * @since 22/May/2007
 	 *
 	 */
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_delete_file.php

@@ -6,7 +6,8 @@
 	 * @since 22/April/2007
 	 *
 	 */
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_download.php

@@ -6,7 +6,8 @@
 	 * @since 22/April/2007
 	 *
 	 */
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_editor_reset.php

@@ -6,7 +6,8 @@
 	 * @since 22/May/2007
 	 *
 	 */
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");	

admin-dev/ajaxfilemanager/ajax_file_copy.php

@@ -6,7 +6,8 @@
 	 * @since 22/May/2007
 	 *
 	 */
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_file_cut.php

@@ -6,7 +6,8 @@
 	 * @since 22/May/2007
 	 *
 	 */
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_file_paste.php

@@ -1,6 +1,7 @@
 <?
 	include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");		
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	$error = '';

admin-dev/ajaxfilemanager/ajax_file_upload.php

@@ -6,7 +6,8 @@
 	 * @since 22/May/2007
 	 *
 	 */	
-	define('_PS_ADMIN_DIR_', getcwd());	 
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	 

admin-dev/ajaxfilemanager/ajax_get_file_listing.php

@@ -1,139 +1,141 @@
-<?php 
-
-		/**
-	 * the php script used to get the list of file or folders under a specific folder
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/May/2007
-	 *
-	 */
-	require_once('../../config/config.inc.php');
-	require_once('../init.php');
-
-	if(!isset($manager))
-	{
-		/**
-		 *  this is part of  script for processing file paste 
-		 */
-		//$_GET = $_POST;
-		include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
-		include_once(CLASS_PAGINATION);
-		$pagination = new pagination(false);
-		if(!empty($_GET['search']))
-		{
-			include_once(CLASS_SEARCH);
-			
-			$search  = new Search($_GET['search_folder']);
-			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
-			$search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']);
-			$search->addSearchKeyword('mtime_to', @$_GET['search_mtime_to']);
-			$search->addSearchKeyword('size_from', @$_GET['search_size_from']);
-			$search->addSearchKeyword('size_to', @$_GET['search_size_to']);
-			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
-			$search->addSearchKeyword('name', @$_GET['search_name']);
-			$search->doSearch();
-			$fileList = $search->getFoundFiles();
-			$folderInfo = $search->getRootFolderInfo();			
-			
-		}else 
-		{
-			include_once(CLASS_MANAGER);
-			include_once(CLASS_SESSION_ACTION);
-			$sessionAction = new SessionAction();
-			include_once(DIR_AJAX_INC . "class.manager.php");
-		
-			$manager = new manager();
-			$manager->setSessionAction($sessionAction);
-		
-			$fileList = $manager->getFileList();
-			$folderInfo = $manager->getFolderInfo();	
-						
-		}
-		$pagination->setUrl(CONFIG_URL_FILEnIMAGE_MANAGER);	
-
-	}else 
-	{
-		include_once(CLASS_PAGINATION);
-		$pagination = new pagination(false);			
-	}
-
-		
-		$pagination->setTotal(sizeof($fileList));
-		$pagination->setFirstText(PAGINATION_FIRST);
-		$pagination->setPreviousText(PAGINATION_PREVIOUS);
-		$pagination->setNextText(PAGINATION_NEXT);
-		$pagination->setLastText(PAGINATION_LAST);
-		$pagination->setLimit(!empty($_GET['limit'])?(int)($_GET['limit']):CONFIG_DEFAULT_PAGINATION_LIMIT);
-		echo $pagination->getPaginationHTML();
-		echo "<script type=\"text/javascript\">\n";
-		
-        echo "parentFolder = {path:'" . getParentFolderPath($folderInfo['path']). "'};\n"; 
-		echo 'currentFolder ={'; 
-		$count =1;
-		foreach($folderInfo as $k=>$v)
-		{
-			echo ($count++ == 1?'':',') . "'" . $k . "':'" . ($k=='ctime'|| $k=='mtime'?date(DATE_TIME_FORMAT, $v):$v)  . "'";
-
-		}
-		echo "};\n";
-		$fileList = array_slice($fileList, $pagination->getPageOffset(), $pagination->getLimit());
-		echo 'numRows = ' . sizeof($fileList) . ";\n";
-		echo "files = {\n";
-		$count = 1;
-		
-		
-		foreach($fileList as $file)
-		{
-			echo (($count > 1)?",":'').$count++ . ":{";
-			$j = 1;
-			foreach($file as $k=>$v)
-			{
-				
-				if($k  == 'ctime' || $k == 'mtime')
-				{
-					$v = @date(DATE_TIME_FORMAT, $v);
-				}	
-				if($k == 'size')
-				{
-					$v = transformFileSize($v);
-				}
-				echo (($j++ > 1)?",":'') . "'" . $k . "':'" . $v . "'";
-			}
-			echo (($j++ > 1)?",":'') . "'url':'" . getFileUrl($file['path']) . "'";
-			echo "}\n";				
-		}
-		echo  "};</script>\n";
-	if(!empty($_GET['view']))
-	{
-		switch($_GET['view'])
-		{
-			case 'detail':
-			case 'thumbnail':
-			case 'text':	
-				$view = $_GET['view'];
-				break;
-			default:
-				$view = CONFIG_DEFAULT_VIEW;
-		}
-	}else 
-	{
-		$view = CONFIG_DEFAULT_VIEW;
-	}	
-	switch($view)
-	{
-		case 'text':
-			//list file name only
-			include_once(DIR_AJAX_ROOT . '_ajax_get_text_listing.php');
-			break;
-		case 'thumbnail':
-			//list file with thumbnail
-			include_once(DIR_AJAX_ROOT . '_ajax_get_thumbnail_listing.php');
-			break;
-		case 'detail':
-		default:
-			include_once(DIR_AJAX_ROOT . '_ajax_get_details_listing.php');
-	}
-
-	
-
+<?php 
+
+	/**
+	 * the php script used to get the list of file or folders under a specific folder
+	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+	 * @link www.phpletter.com
+	 * @since 22/May/2007
+	 *
+	 */
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
+	require_once('../../config/config.inc.php');
+	require_once('../init.php');
+
+	if(!isset($manager))
+	{
+		/**
+		 *  this is part of  script for processing file paste 
+		 */
+		//$_GET = $_POST;
+		include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+		include_once(CLASS_PAGINATION);
+		$pagination = new pagination(false);
+		if(!empty($_GET['search']))
+		{
+			include_once(CLASS_SEARCH);
+			
+			$search  = new Search($_GET['search_folder']);
+			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
+			$search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']);
+			$search->addSearchKeyword('mtime_to', @$_GET['search_mtime_to']);
+			$search->addSearchKeyword('size_from', @$_GET['search_size_from']);
+			$search->addSearchKeyword('size_to', @$_GET['search_size_to']);
+			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
+			$search->addSearchKeyword('name', @$_GET['search_name']);
+			$search->doSearch();
+			$fileList = $search->getFoundFiles();
+			$folderInfo = $search->getRootFolderInfo();			
+			
+		}else 
+		{
+			include_once(CLASS_MANAGER);
+			include_once(CLASS_SESSION_ACTION);
+			$sessionAction = new SessionAction();
+			include_once(DIR_AJAX_INC . "class.manager.php");
+		
+			$manager = new manager();
+			$manager->setSessionAction($sessionAction);
+		
+			$fileList = $manager->getFileList();
+			$folderInfo = $manager->getFolderInfo();	
+						
+		}
+		$pagination->setUrl(CONFIG_URL_FILEnIMAGE_MANAGER);	
+
+	}else 
+	{
+		include_once(CLASS_PAGINATION);
+		$pagination = new pagination(false);			
+	}
+
+		
+		$pagination->setTotal(sizeof($fileList));
+		$pagination->setFirstText(PAGINATION_FIRST);
+		$pagination->setPreviousText(PAGINATION_PREVIOUS);
+		$pagination->setNextText(PAGINATION_NEXT);
+		$pagination->setLastText(PAGINATION_LAST);
+		$pagination->setLimit(!empty($_GET['limit'])?(int)($_GET['limit']):CONFIG_DEFAULT_PAGINATION_LIMIT);
+		echo $pagination->getPaginationHTML();
+		echo "<script type=\"text/javascript\">\n";
+		
+        echo "parentFolder = {path:'" . getParentFolderPath($folderInfo['path']). "'};\n"; 
+		echo 'currentFolder ={'; 
+		$count =1;
+		foreach($folderInfo as $k=>$v)
+		{
+			echo ($count++ == 1?'':',') . "'" . $k . "':'" . ($k=='ctime'|| $k=='mtime'?date(DATE_TIME_FORMAT, $v):$v)  . "'";
+
+		}
+		echo "};\n";
+		$fileList = array_slice($fileList, $pagination->getPageOffset(), $pagination->getLimit());
+		echo 'numRows = ' . sizeof($fileList) . ";\n";
+		echo "files = {\n";
+		$count = 1;
+		
+		
+		foreach($fileList as $file)
+		{
+			echo (($count > 1)?",":'').$count++ . ":{";
+			$j = 1;
+			foreach($file as $k=>$v)
+			{
+				
+				if($k  == 'ctime' || $k == 'mtime')
+				{
+					$v = @date(DATE_TIME_FORMAT, $v);
+				}	
+				if($k == 'size')
+				{
+					$v = transformFileSize($v);
+				}
+				echo (($j++ > 1)?",":'') . "'" . $k . "':'" . $v . "'";
+			}
+			echo (($j++ > 1)?",":'') . "'url':'" . getFileUrl($file['path']) . "'";
+			echo "}\n";				
+		}
+		echo  "};</script>\n";
+	if(!empty($_GET['view']))
+	{
+		switch($_GET['view'])
+		{
+			case 'detail':
+			case 'thumbnail':
+			case 'text':	
+				$view = $_GET['view'];
+				break;
+			default:
+				$view = CONFIG_DEFAULT_VIEW;
+		}
+	}else 
+	{
+		$view = CONFIG_DEFAULT_VIEW;
+	}	
+	switch($view)
+	{
+		case 'text':
+			//list file name only
+			include_once(DIR_AJAX_ROOT . '_ajax_get_text_listing.php');
+			break;
+		case 'thumbnail':
+			//list file with thumbnail
+			include_once(DIR_AJAX_ROOT . '_ajax_get_thumbnail_listing.php');
+			break;
+		case 'detail':
+		default:
+			include_once(DIR_AJAX_ROOT . '_ajax_get_details_listing.php');
+	}
+
+	
+
 ?>

admin-dev/ajaxfilemanager/ajax_get_folder_listing.php

@@ -1,4 +1,6 @@
 <?php
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_image_editor.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 		/**

admin-dev/ajaxfilemanager/ajax_image_save.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/ajax_image_thumbnail.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/ajax_image_undo.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/ajax_login.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/ajax_preview.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/ajax_save_as_form.php

@@ -1,5 +1,6 @@
 <?php 
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_save_name.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/ajax_save_text.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/ajax_text_editor.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 		/**

admin-dev/ajaxfilemanager/ajaxfilemanager.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/jscripts/ajaximageeditor.js

@@ -394,7 +394,7 @@
 	
 	function disableConstraint()
 	{
-		$('#constraint').attr('disabled', 'disabled');
+		$('#constraint').attr('disabled', true);
 	};
 	function ShowHandlers()
 	{
@@ -496,7 +496,7 @@
 	*/
 	function cancelChangeMode()
 	{
-		$('#formAction input[@value=' + $('#image_mode').val() + ']').attr('checked', 'checked');	
+		$('#formAction input[@value=' + $('#image_mode').val() + ']').attr('checked', true);
 	};
 	/**
 	*	get the image element which is going to be modified
@@ -669,7 +669,7 @@ function toggleDisabledButton(buttonId, forceDisable)
 		if(forceDisable && currentClass == 'button')
 		{
 			newClass = 'disabledButton';
-			$(disabledButton).attr('disabled', 'disabled');				
+			$(disabledButton).attr('disabled', true);
 		}else if(!forceDisable && currentClass == 'disabledButton')
 		{
 			newClass = 'button';
@@ -684,7 +684,7 @@ function toggleDisabledButton(buttonId, forceDisable)
 	else if(currentClass == 'button')
 	{
 		newClass = 'disabledButton';
-		$(disabledButton).attr('disabled', 'disabled');	
+		$(disabledButton).attr('disabled', true);
 	}else
 	{
 		newClass = 'button';

admin-dev/drawer.php

@@ -38,8 +38,12 @@ $height = Tools::getValue('height');
 $id_employee = Tools::getValue('id_employee');
 $id_lang = Tools::getValue('id_lang');
 
-if (Context::getContext()->employee->id != $id_employee)
-	die;
+
+if (!isset($cookie->id_employee) || !$cookie->id_employee  || $cookie->id_employee != $id_employee)
+    die(Tools::displayError());
+    
+if (!Validate::isModuleName($module))
+	die(Tools::displayError());
 
 if (!Tools::file_exists_cache($module_path = dirname(__FILE__).'/../modules/'.$module.'/'.$module.'.php'))
 	die(Tools::displayError());

admin-dev/functions.php

@@ -466,7 +466,10 @@ function runAdminTab($tab, $ajaxMode = false)
 			{
 				echo '<div class="multishop_info">';
 				if (Shop::getContext() == Shop::CONTEXT_GROUP)
-					printf(translate('You are configuring your store for group shop %s'), '<b>'.Context::getContext()->shop->getGroup()->name.'</b>');
+				{
+					$shop_group = new ShopGroup((int)Shop::getContextShopGroupID());
+					printf(translate('You are configuring your store for group shop %s'), '<b>'.$shop_group->name.'</b>');
+				}
 				elseif (Shop::getContext() == Shop::CONTEXT_SHOP)
 					printf(translate('You are configuring your store for shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
 				echo '</div>';

admin-dev/grider.php

@@ -41,8 +41,9 @@ $dir = Tools::getValue('dir', 0); // Should be a String : Either ASC or DESC
 $id_employee = (int)(Tools::getValue('id_employee'));
 $id_lang = (int)(Tools::getValue('id_lang'));
 
-if (Context::getContext()->employee->id != $id_employee)
-	die;
+
+if (!isset($cookie->id_employee) || !$cookie->id_employee  || $cookie->id_employee != $id_employee)
+    die(Tools::displayError());
 
 if (!Validate::isModuleName($module))
 	die(Tools::displayError());

admin-dev/header.inc.php

@@ -47,7 +47,7 @@ echo '
 			var helpboxes = '.Configuration::get('PS_HELPBOX').';
 			var roundMode = '.Configuration::get('PS_PRICE_ROUND_MODE').';
 		</script>
-		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/jquery-1.4.4.min.js"></script>
+		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/jquery-'._PS_JQUERY_VERSION_.'.min.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/plugins/jquery.hoverIntent.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/plugins/cluetip/jquery.cluetip.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'admin.js"></script>
@@ -95,7 +95,7 @@ echo '
 						{
 							$("#orders_notif_number_wrapper").hide();
 						}
-						
+
 						// Add customers notifications to the list
 						html = "";
 						nb_notifs = 0;
@@ -151,8 +151,11 @@ echo '
 			{
 				if (Shop::getContext() == Shop::CONTEXT_ALL)
 					$youEditFieldFor = translate('A modification of this field will be applied for all shops');
-				else if (Shop::getContext() == Shop::CONTEXT_GROUP)
-					$youEditFieldFor = sprintf(translate('A modification of this field will be applied for all shops of group %s'), '<b>'.Context::getContext()->shop->getGroup()->name.'</b>');
+				elseif (Shop::getContext() == Shop::CONTEXT_GROUP)
+				{
+					$shop_group = new ShopGroup((int)Shop::getContextShopGroupID());
+					$youEditFieldFor = sprintf(translate('A modification of this field will be applied for all shops of group %s'), '<b>'.$shop_group->name.'</b>');
+				}
 				else
 					$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>\');';
@@ -345,3 +348,4 @@ if (Shop::isFeatureActive())
 		Helper::renderShopList();
     echo '</div>';
 }
+

admin-dev/index.php

@@ -25,7 +25,9 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
+$timer_start = microtime(true);
 define('_PS_ADMIN_DIR_', getcwd());
+
 require(dirname(__FILE__).'/../config/config.inc.php');
 require(dirname(__FILE__).'/functions.php');
 
@@ -38,4 +40,4 @@ if (!isset($_REQUEST['controller']) && isset($_REQUEST['tab']))
 	$_REQUEST['controller'] = strtolower($_REQUEST['tab']);
 
 // Prepare and trigger admin dispatcher
-Dispatcher::getInstance()->dispatch();
+Dispatcher::getInstance()->dispatch();

admin-dev/init.php

@@ -59,8 +59,10 @@ try
 	$protocol_content = (isset($useSSL) AND $useSSL AND Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
 	$link = new Link($protocol_link, $protocol_content);
 	$context->link = $link;
-	define('_PS_BASE_URL_', Tools::getShopDomain(true));
-	define('_PS_BASE_URL_SSL_', Tools::getShopDomainSsl(true));
+	if (!defined('_PS_BASE_URL_'))
+		define('_PS_BASE_URL_', Tools::getShopDomain(true));
+	if (!defined('_PS_BASE_URL_SSL_'))
+		define('_PS_BASE_URL_SSL_', Tools::getShopDomainSsl(true));
 
 	$path = dirname(__FILE__).'/themes/';
 	// if the current employee theme is not valid (check layout.tpl presence), 
@@ -96,43 +98,50 @@ try
 		$query = (isset($url['query'])) ? $url['query'] : '';
 		parse_str($query, $parseQuery);
 		unset($parseQuery['setShopContext']);
-		Tools::redirectAdmin($url['path'] . '?' . http_build_query($parseQuery));
+		Tools::redirectAdmin($url['path'] . '?' . http_build_query($parseQuery, '', '&'));
 	}
 
 	$context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
 
-	$shop_id = '';
-	Shop::setContext(Shop::CONTEXT_ALL);
-	if ($context->cookie->shopContext)
+
+	if ($context->employee->isLoggedBack())
 	{
-		$split = explode('-', $context->cookie->shopContext);
-		if (count($split) == 2)
+		$shop_id = '';
+		Shop::setContext(Shop::CONTEXT_ALL);
+		if ($context->cookie->shopContext)
 		{
-			if ($split[0] == 'g')
-				Shop::setContext(Shop::CONTEXT_GROUP, $split[1]);
-			else
+			$split = explode('-', $context->cookie->shopContext);
+			if (count($split) == 2)
 			{
-				Shop::setContext(Shop::CONTEXT_SHOP, $split[1]);
-				$shop_id = $split[1];
+				if ($split[0] == 'g')
+				{
+					if ($context->employee->hasAuthOnShopGroup($split[1]))
+						Shop::setContext(Shop::CONTEXT_GROUP, $split[1]);
+					else
+					{
+						$shop_id = $context->employee->getDefaultShopID();
+						Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
+					}
+				}
+				else if ($context->employee->hasAuthOnShop($split[1]))
+				{
+					$shop_id = $split[1];
+					Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
+				}
+				else
+				{
+					$shop_id = $context->employee->getDefaultShopID();
+					Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
+				}
 			}
 		}
-	}
-	else if ($context->employee->id_profile == _PS_ADMIN_PROFILE_)
-		$shop_id = '';
-	else if ($context->shop->getTotalShopsWhoExists() != Employee::getTotalEmployeeShopById((int)$context->employee->id))
-	{
-		$shops = Employee::getEmployeeShopById((int)$context->employee->id);
-		if (count($shops))
-			$shop_id = (int)$shops[0];
-	}
-	else
-		Employee::getEmployeeShopAccess((int)$context->employee->id);
 
-	// Replace existing shop if necessary
-	if (!$shop_id)
-		$context->shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
-	else if ($context->shop->id != $shop_id)
-		$context->shop = new Shop($shop_id);
+		// Replace existing shop if necessary
+		if (!$shop_id)
+			$context->shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
+		else if ($context->shop->id != $shop_id)
+			$context->shop = new Shop($shop_id);
+	}
 }
 catch(PrestaShopException $e)
 {

admin-dev/pdf.php

@@ -26,9 +26,14 @@
 */
 
 define('_PS_ADMIN_DIR_', getcwd());
-
 include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
 
+/**
+ * @deprecated 1.5.0
+ * This file is deprecated, please use AdminPdfController instead
+ */
+Tools::displayFileAsDeprecated();
+
 if (!Context::getContext()->employee->id)
 	Tools::redirectAdmin('index.php?controller=AdminLogin');
 
@@ -44,153 +49,12 @@ $function_array = array(
 	'id_supply_order' => 'generateSupplyOrderFormPDF'
 );
 
+$pdf_controller = new AdminPdfController();
 foreach ($function_array as $var => $function)
 	if (isset($_GET[$var]))
 	{
-		call_user_func($function);
-		die;
+		$pdf_controller->{'process'.$function}();
+		exit;
 	}
 
-function generateSupplyOrderFormPDF()
-{
-	if (!Tools::isSubmit('id_supply_order'))
-		die (Tools::displayError('Missing supply order ID'));
-
-	$id_supply_order = (int)Tools::getValue('id_supply_order');
-	$supply_order = new SupplyOrder($id_supply_order);
-
-	if (!Validate::isLoadedObject($supply_order))
-		die(Tools::displayError('Cannot find this supply order in the database'));
-
-	generatePDF($supply_order, PDF::TEMPLATE_SUPPLY_ORDER_FORM);
-}
-
-function generateInvoicePDF()
-{
-	if (Tools::isSubmit('id_order'))
-		generateInvoicePDFByIdOrder(Tools::getValue('id_order'));
-	elseif (Tools::isSubmit('id_order_invoice'))
-		generateInvoicePDFByIdOrderInvoice(Tools::getValue('id_order_invoice'));
-	else
-		die (Tools::displayError('Missing order ID or invoice order ID'));
-	exit;
-}
-
-function generateInvoicePDFByIdOrder($id_order)
-{
-	$order = new Order((int)$id_order);
-	if (!Validate::isLoadedObject($order))
-		die(Tools::displayError('Cannot find order in database'));
-
-	$order_invoice_list = $order->getInvoicesCollection();
-	Hook::exec('actionPDFInvoiceRender', array('order_invoice_list' => $order_invoice_list));
-	generatePDF($order_invoice_list, PDF::TEMPLATE_INVOICE);
-}
-
-function generateInvoicePDFByIdOrderInvoice($id_order_invoice)
-{
-	$order_invoice = new OrderInvoice((int)$id_order_invoice);
-	if (!Validate::isLoadedObject($order_invoice))
-		die(Tools::displayError('Cannot find order invoice in database'));
-
-	Hook::exec('actionPDFInvoiceRender', array('order_invoice_list' => array($order_invoice)));
-	generatePDF($order_invoice, PDF::TEMPLATE_INVOICE);
-}
-
-function generateOrderSlipPDF()
-{
-	$orderSlip = new OrderSlip((int)Tools::getValue('id_order_slip'));
-	$order = new Order((int)$orderSlip->id_order);
-	if (!Validate::isLoadedObject($order))
-		die(Tools::displayError('Cannot find order in database'));
-	$order->products = OrderSlip::getOrdersSlipProducts($orderSlip->id, $order);
-
-	generatePDF($orderSlip, PDF::TEMPLATE_ORDER_SLIP);
-}
-
-function generateDeliverySlipPDF()
-{
-	if (Tools::isSubmit('id_order'))
-		generateDeliverySlipPDFByIdOrder((int)Tools::getValue('id_order'));
-	elseif (Tools::isSubmit('id_order_invoice'))
-		generateDeliverySlipPDFByIdOrderInvoice((int)Tools::getValue('id_order_invoice'));
-	elseif (Tools::isSubmit('id_delivery'))
-	{
-		$order = Order::getByDelivery((int)Tools::getValue('id_delivery'));
-		generateDeliverySlipPDFByIdOrder((int)$order->id);
-	}
-	else
-		die (Tools::displayError('Missing order ID or invoice order ID'));
-	exit;
-}
-
-function generateDeliverySlipPDFByIdOrder($id_order)
-{
-	$order = new Order((int)$id_order);
-	if (!Validate::isLoadedObject($order))
-		throw new PrestaShopException('Can\'t load Order object');
-
-	$order_invoice_collection = $order->getInvoicesCollection();
-	generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP);
-}
-
-function generateDeliverySlipPDFByIdOrderInvoice($id_order_invoice)
-{
-	$order_invoice = new OrderInvoice((int)$id_order_invoice);
-	if (!Validate::isLoadedObject($order_invoice))
-		throw new PrestaShopException('Can\'t load Order Invoice object');
-
-	generatePDF($order_invoice, PDF::TEMPLATE_DELIVERY_SLIP);
-}
-
-function generateInvoicesPDF()
-{
-	$order_invoice_collection = OrderInvoice::getByDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'));
-
-	if (!count($order_invoice_collection))
-		die(Tools::displayError('No invoices found'));
-
-	generatePDF($order_invoice_collection, PDF::TEMPLATE_INVOICE);
-}
-
-function generateInvoicesPDF2()
-{
-	$order_invoice_collection = array();
-	foreach (explode('-', Tools::getValue('id_order_state')) as $id_order_state)
-		if (is_array($order_invoices = OrderInvoice::getByStatus((int)$id_order_state)))
-			$order_invoice_collection = array_merge($order_invoices, $order_invoice_collection);
-
-	if (!count($order_invoice_collection))
-		die(Tools::displayError('No invoices found'));
-
-	generatePDF($order_invoice_collection, PDF::TEMPLATE_INVOICE);
-}
-
-function generateOrderSlipsPDF()
-{
-	$id_order_slips_list = OrderSlip::getSlipsIdByDate(Tools::getValue('date_from'), Tools::getValue('date_to'));
-	if (!count($id_order_slips_list))
-		die (Tools::displayError('No order slips found'));
-
-	$order_slips = array();
-	foreach ($id_order_slips_list as $id_order_slips)
-		$order_slips[] = new OrderSlip((int)$id_order_slips);
-
-	generatePDF($order_slips, PDF::TEMPLATE_ORDER_SLIP);
-}
-
-function generateDeliverySlipsPDF()
-{
-	$order_invoice_collection = OrderInvoice::getByDeliveryDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'));
-
-	if (!count($order_invoice_collection))
-		die(Tools::displayError('No invoices found'));
-
-	generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP);
-}
-
-function generatePDF($object, $template)
-{
-	$pdf = new PDF($object, $template, Context::getContext()->smarty);
-	$pdf->render();
-}
+exit;

admin-dev/themes/default/css/admin.css

@@ -18,6 +18,7 @@ fieldset{background-color:#EBEDF4; border:1px solid #CCCED7; color:#585A69; font
 .Bloc {background-color:#EBEDF4; border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}
 legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left}
 input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #ccc; background-color:#fff;}
+input[type="text"]:disabled,input[type="password"]:disabled,input[type="file"]:disabled,textarea:disabled {border:1px solid #ccc; background-color:#dedede; color: #444444;}
 select { border:1px solid #ccc; font-size: 12px;}
 select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"], option[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA}
 .header_module{background:url('../img/header_module.png');padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
@@ -135,7 +136,8 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 .table tr td.last{border-right:1px solid #DEDEDE}
 .table tr.small td{height:15px}
 .table tr.last td{border-bottom:none}
-td.col-left {vertical-align:top; padding-right:10px;}
+.col-left {vertical-align:top; padding-right:10px;}
+.col-right {padding-bottom:5px;}
 #tabPane1 td.col-left { width:200px;}
 #product-tab-content-wait{display:block;background:url('../img/bg_loaderSpace.png');min-height:420px;position:absolute;width:96.5%;}
 div#loading{height:128px;width:128px;background:url('../img/ajax-loader.gif');display:block;text-indent:-9999px;margin:100px auto;}
@@ -181,9 +183,9 @@ a.module_toggle_all{color: #268CCD;}
 .multishop_toolbar select.shopList { width: 300px; }
 .multishop_toolbar a.chzn-single { background: url('../img/icon-multishop.png') no-repeat 5px 5px; padding: 1px 2px 2px 25px; font-weight: bold; }
 
-.multishop_toolbar .chzn-container .first{font-weight: bold;background-color: #408BD5;color: #ffffff;}
-.multishop_toolbar .chzn-container .group{font-weight: bold;font-style: italic;padding-left: 15px;background-color: #C6DEFC;}
-.multishop_toolbar .chzn-container .shop{padding-left: 30px;background-color: #EAF2FC;}
+.multishop_toolbar .chzn-container .chzn-results .first{font-weight: bold;background-color: #408BD5;color: #ffffff;}
+.multishop_toolbar .chzn-container .chzn-results .group{font-weight: bold;font-style: italic;padding-left: 15px;background-color: #C6DEFC;}
+.multishop_toolbar .chzn-container .chzn-results .shop{padding-left: 30px;background-color: #EAF2FC;}
 
 /*toolbarBox*/
 .toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
@@ -225,7 +227,7 @@ a.module_toggle_all{color: #268CCD;}
 .toolbarBox .process-icon-help{ background-image: url('../img/process-icon-help.png');}
 .toolbarBox .process-icon-help-new{ background-image: url('../img/process-icon-help-new.png');}
 
-div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}
+div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:500;}
 
 /*button upload files*/
 #content .qq-upload-button {
@@ -234,7 +236,6 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0
 	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
 	color:#333;
 	width:180px;
-	font-weight:bold;
 	text-shadow: 0 1px 0 #fff;
 	border-color: #CCCCCC #BBBBBB #A0A0A0;
 	border-left: 1px solid #BBBBBB;
@@ -246,6 +247,8 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0
 }
 #content .qq-upload-button:hover { border:1px solid #939393;}
 
+.file_upload_label {margin-top:5px;}
+
 /*leadin*/
 .leadin {}
 .leadin .bloc-leadin{ padding:10px 3px;}
@@ -496,7 +499,3 @@ ul.listForm li {padding-bottom:3px;}
 .selected-line {background:#fff1b5;}
 
 #changedFiles ul{list-style-type: square; padding-left: 40px;}
-
-#account_list { background-color: #EBEDF4;border: 1px solid #C2C4D9; display: block; position:relative; padding: 10px;}
-#account_list  h2 { font-weight:normal; margin:0; font-size: 1.4em; padding-bottom:10px;}
-#account_list table td, #accounting_list table th {width:100px;}

admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl

@@ -48,6 +48,41 @@
 			var tabnumber = tout[4];
 			var table = 'table#table_'+id_profile;
 
+			if (perm == 'all' && $(this).parent().parent().hasClass('parent'))
+			{
+				checked = enabled ? 'checked': '';
+				$(this).parent().parent().parent().find('.child-'+id_tab+' input[type=checkbox]').attr('checked', checked);
+				$.ajax({
+					url: "{$link->getAdminLink('AdminAccess')}",
+					cache: false,
+					data : {
+						ajaxMode : '1',
+						id_tab: id_tab,
+						id_profile: id_profile,
+						perm: perm,
+						enabled: enabled,
+						submitAddAccess: '1',
+						addFromParent: '1',
+						action: 'updateAccess',
+						ajax: '1',
+						token: '{getAdminToken tab='AdminAccess'}'
+					},
+					success : function(res,textStatus,jqXHR)
+					{
+						try
+						{
+							if (res == 'ok')
+								showSuccessMessage("{l s='Update successful'}");
+							else
+								showErrorMessage("{l s='Update error'}");
+						}
+						catch(e)
+						{
+							jAlert('Technical error');
+						}
+					}
+				});
+			}
 			perfect_access_js_gestion(this, perm, id_tab, tabsize, tabnumber, table, '{$id_tab_access}');
 
 			$.ajax({
@@ -133,18 +168,10 @@
 
 </script>
 
-
-<div class="toolbarBox">
 {if $show_toolbar}
-	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-	<div class="pageTitle">
-	<h3>{block name=pageTitle}
-		<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-		{/block}</h3>
-	</div>
-{/if}
+	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
 	<div class="leadin">{block name="leadin"}{/block}</div>
-</div>
+{/if}
 
 <div class="productTabs">
 	<ul class="tab">
@@ -158,7 +185,7 @@
 
 <form id="{$table}_form" class="defaultForm" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
 	{if $form_id}
-		<input type="hidden" name="id_{$table}" id="id_{$table}" value="{$form_id}" />
+		<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
 	{/if}
 
 	{assign var=tabsize value=count($tabs)}
@@ -236,7 +263,7 @@
 							{if !$tab.id_parent OR $tab.id_parent == -1}
 								{assign var=is_child value=false}
 								{assign var=result_accesses value=0}
-								<tr>
+								<tr{if !$is_child} class="parent"{/if}>
 									<td{if !$is_child} class="bold"{/if}>{if $is_child} &raquo; {/if}<strong>{$tab.name}</strong></td>
 									{foreach $perms as $perm}
 										{if $access_edit == 1}
@@ -275,7 +302,7 @@
 										{if isset($access[$child.id_tab])}
 											{assign var=is_child value=true}
 											{assign var=result_accesses value=0}
-											<tr>
+											<tr class="child-{$child.id_parent}">
 												<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}

admin-dev/themes/default/template/controllers/accounting_configuration/content.tpl

@@ -1,63 +0,0 @@
-{*
-* 2007-2012 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-2012 PrestaShop SA
-*  @version  Release: $Revision: 9856 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-
-<div class="toolbarBox">
-{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-	<div class="pageTitle">
-		<h3>
-				<span id="current_obj" style="font-weight: normal;">
-				{$title|default:'&nbsp;'}
-				</span>
-		</h3>
-	</div>
-</div>
-
-{if !$has_shop_selected}
-<div class="hint" style="display:block">{l s='Please select the shop you want to configure'}</div>
-{else}
-	<form action="{$current}&token={$token}" id="{$table}_form" method="post" enctype="multipart/form-data">
-		{foreach from=$input_category_list item=category key=name_category}
-		<fieldset style="margin: 20px 0;">
-			<legend>{$category['title']}</legend>
-			{foreach from=$category['fields'] item=input key=input_name}
-				<div style="clear: both; padding-top:15px;" id="conf_id_{$input_name}" >
-					<label class="conf_title">{$input['title']}</label>
-					{if $input['type'] == 'text'}
-						<input type="text" name="{$input_name|htmlentities}" {if isset($input['id'])}id="{$input['id']|htmlentities}"{/if} value="{$input['value']|htmlentities}" />
-					{/if}
-					<div class="margin-form">
-						{if isset($input['desc'])}<p class="preference_description">{$input['desc']}</p>{/if}
-					</div>
-				</div>
-				<div class="clear"></div>
-			{/foreach}
-		</fieldset>
-		{/foreach}
-		<div class="margin-form">
-			<input type="submit" class="button" id="{$table}_form_submit_btn" name="update_cfg" value="{l s='Save'}"/>
-		</div>
-	</form>
-{/if}

admin-dev/themes/default/template/controllers/accounting_export/content.tpl

@@ -1,189 +0,0 @@
-{*
-* 2007-2012 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-2012 PrestaShop SA
-*  @version  Release: $Revision: 9856 $
-*  @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">
-	
-	function validateInputDate(input, displayError)
-	{
-		{literal}
-		dateRegex = /^\d{4}-\d{1,2}-\d{1,2}$/
-  	{/literal}
-			
-  	if (!input.val().match(dateRegex))
-  	{
-			input.parent().find('span.input-error').fadeIn('fast');
-			return false;
-		}
-		input.parent().find('span.input-error').css('display','none');
-		return true;
-	}
-	
-	function validateAccountingForm()
-	{
-		validation = true;
-		
-		$('span.input-error').css('display', 'none');
-		$('.datepicker:visible').each(function() {
-			if (!(validateInputDate($(this), true)))
-				validation = false;
-		});
-    
-		return validation;
-	}
-	
-	$(document).ready(function() {
-		
-		$('.datepicker').each(function() {
-			$(this).change(function() {
-				validateInputDate($(this), true);
-			});
-			$(this).datepicker({
-	     prevText: '',
-	     nextText: '',
-	     dateFormat: 'yy-mm-dd'
-	    });			
-		});
-    
-    $('.formAccountingExport form input[type="submit"]').each(function()
-    {
-    	$(this).click(function() {
-    		return validateAccountingForm();
-    	});
-    });
-	});
-</script>
-
-<div id="export_menu">
-	<div class="toolbarBox">
-		<div class="pageTitle">
-			<h3>
-				<span id="current_obj" style="font-weight: normal;">
-					{l s='Accounting Export:'}
-				</span>
-			</h3>
-		</div>
-	</div>
-</div>
-
-{foreach from=$preventList key=name item=preventType}
-	{if !empty($preventType)}
-		<div class="{$name}">
-			<ul>
-				{foreach from=$preventType item=translationPrevent}
-					<li>{$translationPrevent}</li>
-				{/foreach}
-				{if $already_generated}
-					<li>
-						{l s='Generate it:'}
-						<a href="{$smarty.server.REQUEST_URI}&begin_date={$begin_date}&end_date={$end_date}&type={$export_type}&format={$file_format}&regenerate={$already_generated}&accounting_export=true">
-							{l s='Start export'}
-						</a>
-					<li>
-				{/if}
-			</ul>
-		</div>
-	{/if}
-{/foreach}
-
-<div id="account_list">
-	<form id="{$table}_form" method="POST" action="{$smarty.server.REQUEST_URI}">
-		<label for="beginDate">{l s='Begin at:'}</label>
-		<div class="margin-form">
-			<input class="datepicker" id="begin_date" type="text" name="begin_date" value="{$begin_date}" />
-			<span class="input-error">{l s='The date does not have the right format'}</span>
-		</div>
-
-		<label for="endDate">{l s='End at:'}</label>
-		<div class="margin-form">
-			<input class="datepicker" id="end_date" type="text" name="end_date" value="{$end_date}" />
-			<span class="input-error">{l s='The date does not have the right format'}</span>
-		</div>
-
-		<label for="format">{l s='File format:'}</label>
-		<div class="margin-form">
-			<select id="format" name="format">
-				<option value="">{l s='Choose a format'}</option>
-				<option value="csv" {if $file_format == 'csv'} selected="selected"{/if}>
-					{l s='Excel (CSV)'}
-				</option>
-				<option value="txt" {if $file_format == 'txt'} selected="selected"{/if}>
-					{l s='Text (TXT)'}
-				</option>
-			</select>
-			<span class="input-error">{l s='The date does not have the right format'}</span>
-		</div>
-
-		<label for="type">{l s='Export Type:'}</label>
-		<div class="margin-form">
-			<select id="type" name="type">
-				<option value="">{l s='Choose export type'}</option>
-				<option value="accounting_export" {if $export_type == 'accounting_export'} selected="selected"{/if}>
-					{l s='Accounting export'}
-				</option>
-				<option value="reconciliation_export" {if $export_type == 'reconciliation_export'} selected="selected"{/if}>
-					{l s='Reconciliation'}
-				</option>
-			</select>
-			<span class="input-error">{l s='The date does not have the right format'}</span>
-		</div>
-
-		<div class="margin-form">
-			<input type="submit" class="button" id="{$table}_form_submit_btn" name="accounting_export" value="{l s='Launch export'}"/>
-		</div>
-
-	</form>
-</div>
-
-<div id="account_list" style="margin-top:10px;">
-	<h3>{l s='History'}</h3>
-	{if $exported_list|count}
-		<table class="table" style="width:100%;">
-			<thead>
-				<th>{l s='Export type'}</th>
-				<th>{l s='Date start to'}</th>
-				<th>{l s='Date end to'}</th>
-				<th>{l s='File'}</th>
-			</thead>
-			<tbody>
-				{foreach from=$exported_list item=export_detail}
-					<tr>
-						<td>{$export_detail['title']}</td>
-						<td>{$export_detail['begin_to']}</td>
-						<td>{$export_detail['end_to']}</td>
-						<td>
-							<a href="{$smarty.server.REQUEST_URI}&download={$export_detail['file']}">
-								{l s='Download'}
-								<img src="../img/admin/{if $export_detail['file']|pathinfo:$smarty.const.PATHINFO_EXTENSION == 'csv'}excel_file.png{else}page_white_text.png{/if}" />
-							<a>
-						</td>
-					</tr>
-				{/foreach}
-			</tbody>
-		</table>
-	{else}
-		{l s='No exported data found'}
-	{/if}
-</div>

admin-dev/themes/default/template/controllers/accounting_registered_number/content.tpl

@@ -1,65 +0,0 @@
-{*
-* 2007-2012 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-2012 PrestaShop SA
-*  @version  Release: $Revision: 9856 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-
-<div class="toolbarBox">
-		{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-		<div class="pageTitle">
-			<h3>
-				<span id="current_obj" style="font-weight: normal;">
-					{$title|default:'&nbsp;'}
-				</span>
-			</h3>
-		</div>
-</div>
-
-<div id="account_list">
-	{foreach from=$account_number_list item=detail key=name}
-		<h2>{$detail['title']}</h2>
-		{if $detail['list']|count}
-			<table class="table" style="width:100%;">
-				<thead>
-					{if $detail['list']|count}
-						{foreach from=$detail['fields'] item=col_name key=sql_name}
-							<th>{$col_name}</th>
-						{/foreach}
-					{/if}
-				</thead>
-				<tbody>
-					{foreach from=$detail['list'] item=row key=row_number}
-						<tr>
-							{foreach from=$row item=value key=value_num}
-								<td>{$value}</td>
-							{/foreach}
-						</tr>
-					{/foreach}
-				</tbody>
-			</table>
-		{else}
-			<p>{l s='No defined account number for this list'}</p>
-		{/if}
-		<div class="separation"></div>
-	{/foreach}
-</div>

admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl

@@ -86,7 +86,7 @@
 			});
 			</script>
 			<div class="margin-form">
-				<input type="text" size="33" name="email" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'|htmlentities}" style="text-transform: lowercase;" /> <sup>*</sup>
+				<input type="text" size="33" name="email" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" style="text-transform: lowercase;" /> <sup>*</sup>
 			</div>
 		{/if}
 	{else}

admin-dev/themes/default/template/controllers/attribute_generator/content.tpl

@@ -25,14 +25,13 @@
 *}
 
 <script type="text/javascript">
-	i18n_tax_exc = "{l s='Tax Excl.:'}";
-	i18n_tax_inc = "{l s='Tax Incl.:'}";
+	i18n_tax_exc = '{l s='Tax Excl.:'} ';
+	i18n_tax_inc = '{l s='Tax Incl.:'} ';
 
-	var product_tax = "{$tax_rates}";
+	var product_tax = '{$tax_rates}';
 	function calcPrice(element, element_has_tax)
 	{
-			name = element.attr("name");
-			var element_price = element.val().replace(/,/g, ".");
+			var element_price = element.val().replace(/,/g, '.');
 			var other_element_price = 0;
 
 			if (!isNaN(element_price) && element_price > 0)
@@ -45,103 +44,81 @@
 				other_element_price = other_element_price.toFixed(2);
 			}
 
-			$("#related_to_"+name).val(other_element_price);
+			$('#related_to_'+element.attr('name')).val(other_element_price);
 	}
 
-
-	$(document).ready(function()
-	{
-		$(".price_impact").each(function()
-		{
-			calcPrice($(this), false);
-		});
-	});
+	$(document).ready(function() { $('.price_impact').each(function() { calcPrice($(this), false); }); });
 </script>
 
-<div class="toolbarBox">
-	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-	<div class="pageTitle">
-	<h3>
-		<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-	</h3>
-	</div>
-</div>
+{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+<div class="leadin">{block name="leadin"}{/block}</div>
 
-{if $generate}
-	<div class="module_confirmation conf confirm">
-		{$combinations_size} {l s='product(s) successfully created.'}
-	</div>
-{/if}
+{if $generate}<div class="module_confirmation conf confirm">{l s='%d product(s) successfully created.' sprintf=$combinations_size}</div>{/if}
 <script type="text/javascript" src="../js/attributesBack.js"></script>
 <form enctype="multipart/form-data" method="post" id="generator" action="{$url_generator}">
 	<fieldset style="margin-bottom: 35px;">
-		<legend><img src="../img/admin/asterisk.gif" />{l s='Attributes generator'}</legend>
-        <div style="display: block; margin-bottom: 20px;" class="hint">{l s='To generate the attributes, hold down the "Ctrl" key, select your attributes and click "Add".'}</div>
-		<div style="float: left; margin-right:50px;">
-			<div>
-				<select multiple name="attributes[]" id="attribute_group" style="width: 200px; height: 350px; margin-bottom: 10px;">
-					{foreach $attribute_groups as $k => $attribute_group}
-						{if isset($attribute_js[$attribute_group['id_attribute_group']])}
-							<optgroup name="{$attribute_group['id_attribute_group']}" id="{$attribute_group['id_attribute_group']}" label="{$attribute_group['name']|escape:'htmlall':'UTF-8'}">
-								{foreach $attribute_js[$attribute_group['id_attribute_group']] as $k => $v}
-									<option name="{$k}" id="attr_{$k}" value="{$v|escape:'htmlall':'UTF-8'}" title="{$v|escape:'htmlall':'UTF-8'}">{$v|escape:'htmlall':'UTF-8'}</option>
-								{/foreach}
-							</optgroup>
-						{/if}
-					{/foreach}
-				</select>
-			</div>
-			<div>
-				<p style="text-align: center;">
-					<input class="button" type="button" style="margin: 0 0 10px 20px;" value="{l s='Add'}" class="button" onclick="add_attr_multiple();" />
-					<input class="button" type="button" style="margin: 0 0 10px 20px;" value="{l s='Delete'}" class="button" onclick="del_attr_multiple();" /><br />
+		<legend><img src="../img/admin/asterisk.gif" alt="" />{l s='Attributes generator'}</legend>
+		<div style="float: left; margin-right: 50px;">
+			<select multiple name="attributes[]" id="attribute_group" style="height: 500px; margin-bottom: 10px;">
+				{foreach $attribute_groups as $k => $attribute_group}
+					{if isset($attribute_js[$attribute_group['id_attribute_group']])}
+						<optgroup name="{$attribute_group['id_attribute_group']}" id="{$attribute_group['id_attribute_group']}" label="{$attribute_group['name']|escape:'htmlall':'UTF-8'}">
+							{foreach $attribute_js[$attribute_group['id_attribute_group']] as $k => $v}
+								<option name="{$k}" id="attr_{$k}" value="{$v|escape:'htmlall':'UTF-8'}" title="{$v|escape:'htmlall':'UTF-8'}">{$v|escape:'htmlall':'UTF-8'}</option>
+							{/foreach}
+						</optgroup>
+					{/if}
+				{/foreach}
+			</select>
+			<div style="text-align: center; margin-bottom: 10px;">
+				<p>
+					<input class="button" type="button" style="margin-right: 15px;" value="{l s='Add'}" class="button" onclick="add_attr_multiple();" />
+					<input class="button" type="button" value="{l s='Delete'}" class="button" onclick="del_attr_multiple();" />
 				</p>
 			</div>
 		</div>
-		<br />
-		{l s='Add or modify attributes for:'} <b>{$product_name}</b>
-		<br /><br />
-		<div style="padding-top:10px; float: left; width: 570px;">
-			<div style="float:left;">
-				<label>{l s='Quantity'}</label>
-				<div class="margin-form">
-					<input type="text" size="20" name="quantity" value="0"/>
-				</div>
-				<label>{l s='Reference'}</label>
-				<div class="margin-form">
-					<input type="text" size="20" name="reference" value="{$product_reference|htmlentities}"/>
-				</div>
-			</div>
-			<div style="float:left; text-align:center; margin-left:20px;">
-				<input type="submit" class="button" style="margin-bottom:5px;" name="generate" value="{l s='Generate'}" /><br />
-			</div>
-			<br style="clear:both;" />
-			<div style="margin-top: 15px;">
-				{foreach $attribute_groups as $k => $attribute_group}
-					{if isset($attribute_js[$attribute_group['id_attribute_group']])}
-						<br class="clear"/>
-						<table class="table" cellpadding="0" cellspacing="0" align="left" style="margin-bottom: 10px; display: none;">
-							<thead>
-								<tr>
-									<th id="tab_h1" style="width: 150px">{$attribute_group['name']|escape:'htmlall':'UTF-8'}</th>
-									<th id="tab_h2" style="width: 350px" colspan="2">{l s='Price impact'} {$currency_sign}</th>
-									<th style="width: 150px">{l s='Weight impact'} ({$weight_unit})</th>
-								</tr>
-							</thead>
-							<tbody id="table_{$attribute_group['id_attribute_group']}" name="result_table">
-							</tbody>
-						</table>
-						{if isset($attributes[$attribute_group['id_attribute_group']])}
-							{foreach $attributes[$attribute_group['id_attribute_group']] AS $k => $attribute}
-								<script type="text/javascript">
-									$('#table_{$attribute_group['id_attribute_group']}').append(create_attribute_row({$k}, {$attribute_group['id_attribute_group']}, '{$attribute['attribute_name']|addslashes}', {$attribute['price']}, {$attribute['weight']}));
-									toggle(getE('table_' + {$attribute_group['id_attribute_group']}).parentNode, true);
-								</script>
-							{/foreach}						
-						{/if}
+		<div style="float: left; width: 570px;">
+			<div class="hint" style="width: 570px; padding-left: 45px; margin-bottom: 15px; display: block; position: inherit;">{l s='The Combinations Generator is a tool which allows you to easily create a series of combinations by selecting the related attributes. For example, if you are selling T-Shirts, in 3 different sizes and 2 different colors, the Generator will create 6 combinations for you.'}</div>
+			<p>{l s='You are currently generating combinations for the following product:'} <b>{$product_name|escape:'htmlall':'UTF-8'}</b></p>
+			<h4>{l s='Step 1: On the left side, Select the attributes you want to use (Holding down the "CTRL" Key on your keyboard and validating by clicking on "Add"'}</h4>
+			<div>
+			{foreach $attribute_groups as $k => $attribute_group}
+				{if isset($attribute_js[$attribute_group['id_attribute_group']])}
+					<table class="table clear" cellpadding="0" cellspacing="0" style="margin-bottom: 10px; display: none;">
+						<thead>
+							<tr>
+								<th id="tab_h1" style="width: 150px">{$attribute_group['name']|escape:'htmlall':'UTF-8'}</th>
+								<th id="tab_h2" style="width: 350px" colspan="2">{l s='Impact on the Product Price'} ({$currency_sign})</th>
+								<th style="width: 150px">{l s='Impact on the Product Weight'} ({$weight_unit})</th>
+							</tr>
+						</thead>
+						<tbody id="table_{$attribute_group['id_attribute_group']}" name="result_table">
+						</tbody>
+					</table>
+					{if isset($attributes[$attribute_group['id_attribute_group']])}
+						{foreach $attributes[$attribute_group['id_attribute_group']] AS $k => $attribute}
+							<script type="text/javascript">
+								$('#table_{$attribute_group['id_attribute_group']}').append(create_attribute_row({$k}, {$attribute_group['id_attribute_group']}, '{$attribute['attribute_name']|addslashes}', {$attribute['price']}, {$attribute['weight']}));
+								toggle(getE('table_' + {$attribute_group['id_attribute_group']}).parentNode, true);
+							</script>
+						{/foreach}						
 					{/if}
-				{/foreach}
+				{/if}
+			{/foreach}
             </div>
+			<h4>{l s='Step 2 (optional): Select a default Quantity and Reference for all the combinations that the Generator will create for this product'}</h4>
+			<table border="0" class="table" cellpadding="0" cellspacing="0">
+				<tr>
+					<td>{l s='Default Quantity:'}</td>
+					<td><input type="text" size="20" name="quantity" value="0" style="width: 50px;" /></td>
+				</tr>
+				<tr>
+					<td>{l s='Default Reference:'}</td>
+					<td><input type="text" size="20" name="reference" value="{$product_reference|escape:'htmlall':'UTF-8'}" /></td>
+				</tr>
+			</table>
+			<h4>{l s='Finally, click on "Generate these combinations"'}</h4>
+			<p><input type="submit" class="button" style="margin-bottom:5px;" name="generate" value="{l s='Generate these combinations'}" /></p>
 		</div>
 	</fieldset>
 </form>

admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl

@@ -69,13 +69,16 @@
 	var changeAssociationGroup = function()
 	{
 		var id_attribute_group = $('#id_attribute_group').val();
-		$('.input_group_shop').each(function(k, item)
+		$('.input_shop').each(function(k, item)
 		{
-			var id_group_shop = $(item).val();
-			if (typeof shop_associations[id_attribute_group] != 'undefined' && $.inArray(id_group_shop, shop_associations[id_attribute_group]) > -1)
+			var id_shop = $(item).attr('shop_id');
+			if (typeof shop_associations[id_attribute_group] != 'undefined' && $.inArray(id_shop, shop_associations[id_attribute_group]) > -1)
 				$(item).attr('disabled', false);
 			else
+			{
 				$(item).attr('disabled', true);
+				$(item).attr('checked', false);
+			}
 		});
 	};
 	$('#id_attribute_group').change(changeAssociationGroup);

admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl

@@ -91,7 +91,7 @@
 				{$tr.$key}
 			{* If type is 'editable', an input is created *}
 			{elseif isset($params.type) && $params.type == 'editable' && isset($tr.id)}
-				<input type="text" name="{$key}_{$tr.id}" value="{$tr.$key|htmlentities}" class="{$key}" />
+				<input type="text" name="{$key}_{$tr.id}" value="{$tr.$key|escape:'htmlall':'UTF-8'}" class="{$key}" />
 			{elseif isset($params.callback)}
 				{$tr.$key}
 			{elseif isset($tr.$key) && $key == 'color'}

admin-dev/themes/default/template/controllers/cart_rules/actions.tpl

@@ -62,7 +62,7 @@
 		<label>{l s='Product'}</label>
 		<div class="margin-form">
 			<input type="hidden" id="reduction_product" name="reduction_product" value="{$currentTab->getFieldValue($currentObject, 'reduction_product')|intval}" />
-			<input type="text" id="reductionProductFilter" name="reductionProductFilter" value="{$reductionProductFilter|utf8_decode|htmlentities}" style="width:400px" />
+			<input type="text" id="reductionProductFilter" name="reductionProductFilter" value="{$reductionProductFilter|escape:'htmlall':'UTF-8'}" style="width:400px" />
 		</div>
 	</div>
 </div>
@@ -89,7 +89,7 @@
 			</select>
 		</div>
 		<div class="clear">&nbsp;</div>
-		<div id="gift_attributes_list" {if $gift_product_attribute_select == ''}style="display:none"{/if}>
+		<div id="gift_attributes_list" {if !$hasAttribute}style="display:none"{/if}>
 			<label>{l s='Available combinations'}</label>
 			<div id="gift_attributes_list_select">
 				{$gift_product_attribute_select}

admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl

@@ -1,15 +1,17 @@
 <label>{l s='Limit to a single customer'}</label>
 <div class="margin-form">
 	<input type="hidden" id="id_customer" name="id_customer" value="{$currentTab->getFieldValue($currentObject, 'id_customer')|intval}" />
-	<input type="text" id="customerFilter" name="customerFilter" value="{$customerFilter|htmlentities}" style="width:400px" />
+	<input type="text" id="customerFilter" name="customerFilter" value="{$customerFilter|escape:'htmlall':'UTF-8'}" style="width:400px" />
 	<p class="preference_description">{l s='Optional, the cart rule will be available for everyone if you leave this field blank.'}</p>
 </div>
 <label>{l s='Validity'}</label>
 <div class="margin-form">
 	<strong>{l s='from'}</strong>
-	<input type="text" class="datepicker" name="date_from" value="{if $currentTab->getFieldValue($currentObject, 'date_from')}{$currentTab->getFieldValue($currentObject, 'date_from')}{else}{$defaultDateFrom}{/if}" />
+	<input type="text" class="datepicker" name="date_from"
+		value="{if $currentTab->getFieldValue($currentObject, 'date_from')}{$currentTab->getFieldValue($currentObject, 'date_from')|escape}{else}{$defaultDateFrom}{/if}" />
 	<strong>{l s='to'}</strong>
-	<input type="text" class="datepicker" name="date_to" value="{if $currentTab->getFieldValue($currentObject, 'date_to')}{$currentTab->getFieldValue($currentObject, 'date_to')}{else}{$defaultDateTo}{/if}" />
+	<input type="text" class="datepicker" name="date_to"
+		value="{if $currentTab->getFieldValue($currentObject, 'date_to')}{$currentTab->getFieldValue($currentObject, 'date_to')|escape}{else}{$defaultDateTo}{/if}" />
 	<p class="preference_description">{l s='Default period is one month.'}</p>
 </div>
 <label>{l s='Minimum amount'}</label>
@@ -17,7 +19,14 @@
 	<input type="text" name="minimum_amount" value="{$currentTab->getFieldValue($currentObject, 'minimum_amount')|floatval}" />
 	<select name="minimum_amount_currency">
 	{foreach from=$currencies item='currency'}
-		<option value="{$currency.id_currency|intval}" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_currency') == $currency.id_currency || (!$currentTab->getFieldValue($currentObject, 'minimum_amount_currency') && $currency.id_currency == $defaultCurrency)}selected="selected"{/if}>{$currency.iso_code}</option>
+		<option value="{$currency.id_currency|intval}"
+		{if $currentTab->getFieldValue($currentObject, 'minimum_amount_currency') == $currency.id_currency
+			|| (!$currentTab->getFieldValue($currentObject, 'minimum_amount_currency') && $currency.id_currency == $defaultCurrency)}
+			selected="selected"
+		{/if}
+		>
+			{$currency.iso_code}
+		</option>
 	{/foreach}
 	</select>
 	<select name="minimum_amount_tax">
@@ -50,10 +59,13 @@
 				<p><strong>{l s='Selected countries'}</strong></p>
 				<select name="country_select[]" id="country_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$countries.selected item='country'}
-						<option value="{$country.id_country|intval}">&nbsp;{$country.name}</option>
+						<option value="{$country.id_country|intval}">&nbsp;{$country.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="country_select_remove">
+				<a
+					id="country_select_remove"
+					style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					{l s='Remove'} &gt;&gt;
 				</a>
 			</td>
@@ -61,10 +73,13 @@
 				<p><strong>{l s='Unselected countries'}</strong></p>
 				<select id="country_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$countries.unselected item='country'}
-						<option value="{$country.id_country|intval}">&nbsp;{$country.name}</option>
+						<option value="{$country.id_country|intval}">&nbsp;{$country.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="country_select_add">
+				<a
+					id="country_select_add"
+					style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					&lt;&lt; {l s='Add'}
 				</a>
 			</td>
@@ -82,10 +97,13 @@
 				<p><strong>{l s='Selected carriers'}</strong></p>
 				<select name="carrier_select[]" id="carrier_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$carriers.selected item='carrier'}
-						<option value="{$carrier.id_carrier|intval}">&nbsp;{$carrier.name}</option>
+						<option value="{$carrier.id_carrier|intval}">&nbsp;{$carrier.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="carrier_select_remove">
+				<a
+					id="carrier_select_remove"
+					style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					{l s='Remove'} &gt;&gt;
 				</a>
 			</td>
@@ -93,10 +111,13 @@
 				<p><strong>{l s='Unselected carriers'}</strong></p>
 				<select id="carrier_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$carriers.unselected item='carrier'}
-						<option value="{$carrier.id_carrier|intval}">&nbsp;{$carrier.name}</option>
+						<option value="{$carrier.id_carrier|intval}">&nbsp;{$carrier.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="carrier_select_add">
+				<a
+					id="carrier_select_add"
+					style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					&lt;&lt; {l s='Add'}
 				</a>
 			</td>
@@ -106,7 +127,8 @@
 {/if}
 {if $groups.unselected|@count + $groups.selected|@count > 1}
 <br />
-<input type="checkbox" id="group_restriction" name="group_restriction" value="1" {if $groups.unselected|@count}checked="checked"{/if} /> <strong>{l s='Customer group selection'}</strong>
+<input type="checkbox" id="group_restriction" name="group_restriction" value="1" {if $groups.unselected|@count}checked="checked"{/if} />
+<strong>{l s='Customer group selection'}</strong>
 <div id="group_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:0 10px 10px 10px;background-color:#FFF5D3">
 	<table>
 		<tr>
@@ -114,10 +136,13 @@
 				<p><strong>{l s='Selected groups'}</strong></p>
 				<select name="group_select[]" id="group_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$groups.selected item='group'}
-						<option value="{$group.id_group|intval}">&nbsp;{$group.name}</option>
+						<option value="{$group.id_group|intval}">&nbsp;{$group.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="group_select_remove">
+				<a
+					id="group_select_remove"
+					style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					{l s='Remove'} &gt;&gt;
 				</a>
 			</td>
@@ -125,10 +150,13 @@
 				<p><strong>{l s='Unselected groups'}</strong></p>
 				<select id="group_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$groups.unselected item='group'}
-						<option value="{$group.id_group|intval}">&nbsp;{$group.name}</option>
+						<option value="{$group.id_group|intval}">&nbsp;{$group.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="group_select_add">
+				<a
+					id="group_select_add"
+					style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					&lt;&lt; {l s='Add'}
 				</a>
 			</td>
@@ -138,7 +166,8 @@
 {/if}
 {if $cart_rules.unselected|@count + $cart_rules.selected|@count > 0}
 <br />
-<input type="checkbox" id="cart_rule_restriction" name="cart_rule_restriction" value="1" {if $cart_rules.unselected|@count}checked="checked"{/if} /> <strong>{l s='Compatibility with other cart rules'}</strong>
+<input type="checkbox" id="cart_rule_restriction" name="cart_rule_restriction" value="1" {if $cart_rules.unselected|@count}checked="checked"{/if} />
+<strong>{l s='Compatibility with other cart rules'}</strong>
 <div id="cart_rule_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:0 10px 10px 10px;background-color:#FFF5D3">
 	<table>
 		<tr>
@@ -146,10 +175,13 @@
 				<p><strong>{l s='Combinable cart rules'}</strong></p>
 				<select name="cart_rule_select[]" id="cart_rule_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$cart_rules.selected item='cart_rule'}
-						<option value="{$cart_rule.id_cart_rule|intval}">&nbsp;{$cart_rule.name}</option>
+						<option value="{$cart_rule.id_cart_rule|intval}">&nbsp;{$cart_rule.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="cart_rule_select_remove">
+				<a
+					id="cart_rule_select_remove"
+					style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					{l s='Remove'} &gt;&gt;
 				</a>
 			</td>
@@ -157,10 +189,13 @@
 				<p><strong>{l s='Uncombinable cart rules'}</strong></p>
 				<select id="cart_rule_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple="">
 					{foreach from=$cart_rules.unselected item='cart_rule'}
-						<option value="{$cart_rule.id_cart_rule|intval}">&nbsp;{$cart_rule.name}</option>
+						<option value="{$cart_rule.id_cart_rule|intval}">&nbsp;{$cart_rule.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="cart_rule_select_add">
+				<a
+					id="cart_rule_select_add"
+					style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					&lt;&lt; {l s='Add'}
 				</a>
 			</td>
@@ -190,10 +225,13 @@
 				<p><strong>{l s='Selected shops'}</strong></p>
 				<select name="shop_select[]" id="shop_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$shops.selected item='shop'}
-						<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name}</option>
+						<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="shop_select_remove">
+				<a
+					id="shop_select_remove"
+					style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					{l s='Remove'} &gt;&gt;
 				</a>
 			</td>
@@ -201,10 +239,13 @@
 				<p><strong>{l s='Unselected shops'}</strong></p>
 				<select id="shop_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$shops.unselected item='shop'}
-						<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name}</option>
+						<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="shop_select_add">
+				<a
+					id="shop_select_add"
+					style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					&lt;&lt; {l s='Add'}
 				</a>
 			</td>

admin-dev/themes/default/template/controllers/cart_rules/form.js

@@ -65,7 +65,7 @@ function removeProductRule(product_rule_group_id, product_rule_id)
 
 function toggleCartRuleFilter(id)
 {
-	if ($(id).attr('checked'))
+	if ($(id).prop('checked'))
 		$('#' + $(id).attr('id') + '_div').show(400);
 	else
 		$('#' + $(id).attr('id') + '_div').hide(200);
@@ -110,10 +110,12 @@ function toggleApplyDiscount(percent, amount, apply_to)
 	if (percent)
 	{
 		$('#apply_discount_percent_div').show(400);
-		if ($('#apply_discount_to_product').attr('checked'))
+		if ($('#apply_discount_to_product').prop('checked'))
 			toggleApplyDiscountTo();
-		$('#apply_discount_to_cheapest').removeAttr('disabled');
-		$('#apply_discount_to_selection').removeAttr('disabled');
+		$('#apply_discount_to_cheapest').show();
+		$('*[for=apply_discount_to_cheapest]').show();
+		$('#apply_discount_to_selection').show();
+		$('*[for=apply_discount_to_selection]').show();
 	}
 	else
 	{
@@ -124,11 +126,13 @@ function toggleApplyDiscount(percent, amount, apply_to)
 	if (amount)
 	{
 		$('#apply_discount_amount_div').show(400);
-		if ($('#apply_discount_to_product').attr('checked'))
+		if ($('#apply_discount_to_product').prop('checked'))
 			toggleApplyDiscountTo();
-		$('#apply_discount_to_cheapest').attr('disabled', 'disabled');
+		$('#apply_discount_to_cheapest').hide();
+		$('*[for=apply_discount_to_cheapest]').hide();
 		$('#apply_discount_to_cheapest').removeAttr('checked');
-		$('#apply_discount_to_selection').attr('disabled', 'disabled');
+		$('#apply_discount_to_selection').hide();
+		$('*[for=apply_discount_to_selection]').hide();
 		$('#apply_discount_to_selection').removeAttr('checked');
 	}
 	else
@@ -148,24 +152,24 @@ function toggleApplyDiscount(percent, amount, apply_to)
 
 function toggleApplyDiscountTo()
 {
-	if ($('#apply_discount_to_product').attr('checked'))
+	if ($('#apply_discount_to_product').prop('checked'))
 		$('#apply_discount_to_product_div').show(400);
 	else
 	{
 		$('#apply_discount_to_product_div').hide(200);
 		$('#reductionProductFilter').val('');
-		if ($('#apply_discount_to_order').attr('checked'))
+		if ($('#apply_discount_to_order').prop('checked'))
 			$('#reduction_product').val('0');
-		if ($('#apply_discount_to_cheapest').attr('checked'))
+		if ($('#apply_discount_to_cheapest').prop('checked'))
 			$('#reduction_product').val('-1');
-		if ($('#apply_discount_to_selection').attr('checked'))
+		if ($('#apply_discount_to_selection').prop('checked'))
 			$('#reduction_product').val('-2');
 	}
 }
 
 function toggleGiftProduct()
 {
-	if ($('#free_gift_on').attr('checked'))
+	if ($('#free_gift_on').prop('checked'))
 		$('#free_gift_div').show(400);
 	else
 	{
@@ -176,31 +180,31 @@ function toggleGiftProduct()
 }
 
 $('#apply_discount_percent').click(function() {toggleApplyDiscount(true, false, true);});
-if ($('#apply_discount_percent').attr('checked'))
+if ($('#apply_discount_percent').prop('checked'))
 	toggleApplyDiscount(true, false, true);
 
 $('#apply_discount_amount').click(function() {toggleApplyDiscount(false, true, true);});
-if ($('#apply_discount_amount').attr('checked'))
+if ($('#apply_discount_amount').prop('checked'))
 	toggleApplyDiscount(false, true, true);
 
 $('#apply_discount_off').click(function() {toggleApplyDiscount(false, false, false);});
-if ($('#apply_discount_off').attr('checked'))
+if ($('#apply_discount_off').prop('checked'))
 	toggleApplyDiscount(false, false, false);
 
 $('#apply_discount_to_order').click(function() {toggleApplyDiscountTo();});
-if ($('#apply_discount_to_order').attr('checked'))
+if ($('#apply_discount_to_order').prop('checked'))
 	toggleApplyDiscountTo();
 	
 $('#apply_discount_to_product').click(function() {toggleApplyDiscountTo();});
-if ($('#apply_discount_to_product').attr('checked'))
+if ($('#apply_discount_to_product').prop('checked'))
 	toggleApplyDiscountTo();
 	
 $('#apply_discount_to_cheapest').click(function() {toggleApplyDiscountTo();});
-if ($('#apply_discount_to_cheapest').attr('checked'))
+if ($('#apply_discount_to_cheapest').prop('checked'))
 	toggleApplyDiscountTo();
 	
 $('#apply_discount_to_selection').click(function() {toggleApplyDiscountTo();});
-if ($('#apply_discount_to_selection').attr('checked'))
+if ($('#apply_discount_to_selection').prop('checked'))
 	toggleApplyDiscountTo();
 	
 $('#free_gift_on').click(function() {toggleGiftProduct();});
@@ -219,13 +223,13 @@ $('#cart_rule_form').submit(function() {
 		else
 		{
 			$('#' + restrictions[i] + '_select_2 option').each(function(i) {
-				$(this).attr('selected', 'selected');
+				$(this).attr('selected', true);
 			});
 		}
 	}
 	
 	$('.product_rule_toselect option').each(function(i) {
-		$(this).attr('selected', 'selected');
+		$(this).attr('selected', true);
 	});
 });
 	

admin-dev/themes/default/template/controllers/cart_rules/form.tpl

@@ -1,24 +1,11 @@
-{if $show_toolbar}
-	<div class="toolbar-placeholder">
-		<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
-				{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-				<div class="pageTitle">
-				<h3>
-					{block name=pageTitle}
-						<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-					{/block}
-				</h3>
-				</div>
-		</div>
-	</div>
-	<div class="leadin">{block name="leadin"}{/block}</div>
-{/if}
+{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+<div class="leadin">{block name="leadin"}{/block}</div>
 
 <div>
  	<div class="productTabs">
 		<ul class="tab">
 			<li class="tab-row">
-				<a class="tab-page" id="cart_rule_link_informations" href="javascript:displayCartRuleTab('informations');">{l s='Informations'}</a>
+				<a class="tab-page" id="cart_rule_link_informations" href="javascript:displayCartRuleTab('informations');">{l s='Information'}</a>
 			</li>
 			<li class="tab-row">
 				<a class="tab-page" id="cart_rule_link_conditions" href="javascript:displayCartRuleTab('conditions');">{l s='Conditions'}</a>
@@ -29,7 +16,7 @@
 		</ul>
 	</div>
 </div>
-<form action="{$currentIndex}&token={$currentToken}&addcart_rule" id="cart_rule_form" method="post">
+<form action="{$currentIndex|escape}&token={$currentToken|escape}&addcart_rule" id="cart_rule_form" method="post">
 	{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
 	<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
 	<div id="cart_rule_informations" class="cart_rule_tab">
@@ -49,22 +36,22 @@
 	</div>
 	<div class="separation"></div>
 	<div style="text-align:center">
-		<input type="submit" value="{l s='Save'}" class="button" name="submitAddcart_rule" id="{$table}_form_submit_btn" />
+		<input type="submit" value="{l s='Save'}" class="button" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn" />
 		<!--<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" id="" />-->
 	</div>
 </form>
 <script type="text/javascript">
-	var product_rule_groups_counter = {if isset($product_rule_groups_counter)}{$product_rule_groups_counter}{else}0{/if};
+	var product_rule_groups_counter = {if isset($product_rule_groups_counter)}{$product_rule_groups_counter|intval}{else}0{/if};
 	var product_rule_counters = new Array();
-	var currentToken = '{$currentToken}';
-	var currentFormTab = '{if isset($smarty.post.currentFormTab)}{$smarty.post.currentFormTab|escape}{else}informations{/if}';
+	var currentToken = '{$currentToken|escape:'quotes'}';
+	var currentFormTab = '{if isset($smarty.post.currentFormTab)}{$smarty.post.currentFormTab|escape:'quotes'}{else}informations{/if}';
 	
 	var languages = new Array();
 	{foreach from=$languages item=language key=k}
 		languages[{$k}] = {
 			id_lang: {$language.id_lang},
-			iso_code: '{$language.iso_code}',
-			name: '{$language.name}'
+			iso_code: '{$language.iso_code|escape:'quotes'}',
+			name: '{$language.name|escape:'quotes'}'
 		};
 	{/foreach}
 	displayFlags(languages, {$defaultLanguage});

admin-dev/themes/default/template/controllers/cart_rules/informations.tpl

@@ -5,8 +5,8 @@
 			<div class="margin-form">
 				<div class="translatable">
 				{foreach from=$languages item=language}
-					<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $defaultLanguage}block{else}none{/if};float:left">
-						<input type="text" id="name_{$language.id_lang}" name="name_{$language.id_lang}" value="{$currentTab->getFieldValue($currentObject, 'name', $language.id_lang)}" style="width:400px" />
+					<div class="lang_{$language.id_lang|intval}" style="display:{if $language.id_lang == $defaultLanguage}block{else}none{/if};float:left">
+						<input type="text" id="name_{$language.id_lang|intval}" name="name_{$language.id_lang|intval}" value="{$currentTab->getFieldValue($currentObject, 'name', $language.id_lang|intval)}" style="width:400px" />
 						<sup>*</sup>
 					</div>
 				{/foreach}
@@ -15,12 +15,12 @@
 			</div>
 			<label>{l s='Description'}</label>
 			<div class="margin-form">
-				<textarea name="description" style="width:80%;height:100px">{$currentTab->getFieldValue($currentObject, 'description')}</textarea>
+				<textarea name="description" style="width:80%;height:100px">{$currentTab->getFieldValue($currentObject, 'description')|escape}</textarea>
 				<p class="preference_description">{l s='For you only, never displayed to the customer.'}</p>
 			</div>
 			<label>{l s='Code'}</label>
 			<div class="margin-form">
-				<input type="text" id="code" name="code" value="{$currentTab->getFieldValue($currentObject, 'code')}" />
+				<input type="text" id="code" name="code" value="{$currentTab->getFieldValue($currentObject, 'code')|escape}" />
 				<a href="javascript:gencode(8);" class="button">{l s='(Click to generate random code)'}</a>
 				<p class="preference_description">{l s='Caution! The rule will automatically be applied if you leave this field blank.'}</p>
 			</div>

admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl

@@ -1,26 +1,27 @@
-<tr id="product_rule_{$product_rule_group_id}_{$product_rule_id}_tr">
+<tr id="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_tr">
 	<td>
-		<a href="javascript:removeProductRule({$product_rule_group_id}, {$product_rule_id});">
+		<a href="javascript:removeProductRule({$product_rule_group_id|intval}, {$product_rule_id|intval});">
 			<img src="../img/admin/disabled.gif" alt="{l s='Remove'}" title="{l s='Remove'}" />
 		</a>
 	</td>
 	<td>
-		<input type="hidden" name="product_rule_{$product_rule_group_id}[]" value="{$product_rule_id}" />
-		<input type="hidden" name="product_rule_{$product_rule_group_id}_{$product_rule_id}_type" value="{$product_rule_type}" />
-		[{$product_rule_type}]
+		<input type="hidden" name="product_rule_{$product_rule_group_id|intval}[]" value="{$product_rule_id}" />
+		<input type="hidden" name="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_type" value="{$product_rule_type|escape}" />
+		{* Everything is on a single line in order to avoid a empty space between the [ ] and the word *}
+		[{if $product_rule_type == 'products'}{l s='Products'}{elseif $product_rule_type == 'categories'}{l s='Categories'}{elseif $product_rule_type == 'manufacturers'}{l s='Manufacturers'}{elseif $product_rule_type == 'suppliers'}{l s='Suppliers'}{elseif $product_rule_type == 'attributes'}{l s='Attributes'}{/if}]
 	</td>
 	<td>
 		{l s='The product(s) are matching on of these'}
 	</td>
 	<td>
-		<input type="text" id="product_rule_{$product_rule_group_id}_{$product_rule_id}_match" value="" disabled="disabled" />
+		<input type="text" id="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_match" value="" disabled="disabled" />
 	</td>
 	<td>
-		<a id="product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_link" href="#product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_content">
+		<a id="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_choose_link" href="#product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_choose_content">
 			<img src="../img/admin/choose.gif" alt="{l s='Choose'}" title="{l s='Choose'}" /> {l s='Choose'}
 		</a>
 		<div>
-			<div id="product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_content">
+			<div id="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_choose_content">
 				{$product_rule_choose_content}
 			</div>
 		</div>
@@ -28,7 +29,7 @@
 </tr>
 
 <script type="text/javascript">
-	$('#product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_content').parent().hide();
-	$("#product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_link").fancybox();
-	$(document).ready(function() { updateProductRuleShortDescription($('#product_rule_select_{$product_rule_group_id}_{$product_rule_id}_add')); });
+	$('#product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_choose_content').parent().hide();
+	$("#product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_choose_link").fancybox();
+	$(document).ready(function() { updateProductRuleShortDescription($('#product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_add')); });
 </script>

admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl

@@ -1,20 +1,20 @@
-<tr id="product_rule_group_{$product_rule_group_id}_tr">
+<tr id="product_rule_group_{$product_rule_group_id|intval}_tr">
 	<td style="vertical-align:center;padding-right:10px">
-		<a href="javascript:removeProductRuleGroup({$product_rule_group_id});">
+		<a href="javascript:removeProductRuleGroup({$product_rule_group_id|intval});">
 			<img src="../img/admin/disabled.gif" alt="{l s='Remove'}" title="{l s='Remove'}" />
 		</a>
 	</td>
 	<td style="padding-bottom:15px">
-		<input type="hidden" name="product_rule_group[]" value="{$product_rule_group_id}" />
+		<input type="hidden" name="product_rule_group[]" value="{$product_rule_group_id|intval}" />
 		{l s='The cart must contain at least'}
-		<input type="text" name="product_rule_group_{$product_rule_group_id}_quantity" value="{$product_rule_group_quantity|intval}" style="width:30px" />
+		<input type="text" name="product_rule_group_{$product_rule_group_id|intval}_quantity" value="{$product_rule_group_quantity|intval}" style="width:30px" />
 		{l s='product(s) matching the following rules:'}
 		<br />
-		<a href="javascript:addProductRule({$product_rule_group_id});">
+		<a href="javascript:addProductRule({$product_rule_group_id|intval});">
 			<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" />
 			{l s='Add a rule concerning'}
 		</a>
-		<select id="product_rule_type_{$product_rule_group_id}">
+		<select id="product_rule_type_{$product_rule_group_id|intval}">
 			<option value="">{l s='-- Choose --'}</option>
 			<option value="products">{l s='Products'}</option>
 			<option value="attributes">{l s='Attributes'}</option>
@@ -22,10 +22,10 @@
 			<option value="manufacturers">{l s='Manufacturers'}</option>
 			<option value="suppliers">{l s='Suppliers'}</option>
 		</select>
-		<a href="javascript:addProductRule({$product_rule_group_id});">
+		<a href="javascript:addProductRule({$product_rule_group_id|intval});">
 			<input type="button" class="button" value="OK" />
 		</a>
-		<table id="product_rule_table_{$product_rule_group_id}" class="table" cellpadding="0" cellspacing="0">
+		<table id="product_rule_table_{$product_rule_group_id|intval}" class="table" cellpadding="0" cellspacing="0">
 			{if isset($product_rules) && $product_rules|@count}
 				{foreach from=$product_rules item='product_rule'}
 					{$product_rule}

admin-dev/themes/default/template/controllers/cart_rules/product_rule_itemlist.tpl

@@ -2,23 +2,39 @@
 	<tr>
 		<td>
 			<p><strong>{l s='Selected'}</strong></p>
-			<select name="product_rule_select_{$product_rule_group_id}_{$product_rule_id}[]" class="product_rule_toselect" id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+			<select
+				name="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}[]"
+				id="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_2"
+				class="product_rule_toselect"
+				style="border:1px solid #AAAAAA;width:400px;height:160px"
+				multiple
+			>
 				{foreach from=$product_rule_itemlist.selected item='item'}
 					<option value="{$item.id|intval}">&nbsp;{$item.name}</option>
 				{/foreach}
 			</select><br /><br />
-			<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_remove">
+			<a
+				id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_remove"
+				style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+			>
 				{l s='Remove'} &gt;&gt;
 			</a>
 		</td>
-		<td style="padding-left:20px;">
+		<td style="padding-left:20px">
 			<p><strong>{l s='Unselected'}</strong></p>
-			<select id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+			<select
+				id="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_1"
+				style="border:1px solid #AAAAAA;width:400px;height:160px"
+				multiple
+			>
 				{foreach from=$product_rule_itemlist.unselected item='item'}
 					<option value="{$item.id|intval}">&nbsp;{$item.name}</option>
 				{/foreach}
 			</select><br /><br />
-			<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_add">
+			<a
+				id="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_add"
+				style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+			>
 				&lt;&lt; {l s='Add'}
 			</a>
 		</td>
@@ -26,7 +42,7 @@
 </table>
 
 <script type="text/javascript">
-	$('#product_rule_select_{$product_rule_group_id}_{$product_rule_id}_remove').click(function() { removeCartRuleOption(this); updateProductRuleShortDescription(this); });
-	$('#product_rule_select_{$product_rule_group_id}_{$product_rule_id}_add').click(function() { addCartRuleOption(this); updateProductRuleShortDescription(this); });
-	$(document).ready(function() { updateProductRuleShortDescription($('#product_rule_select_{$product_rule_group_id}_{$product_rule_id}_add')); });
+	$('#product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_remove').click(function() { removeCartRuleOption(this); updateProductRuleShortDescription(this); });
+	$('#product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_add').click(function() { addCartRuleOption(this); updateProductRuleShortDescription(this); });
+	$(document).ready(function() { updateProductRuleShortDescription($('#product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_add')); });
 </script>

admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl

@@ -51,7 +51,7 @@
 		<h2><img src="../img/admin/cart.gif" /> {l s='Order information'}</h2>
 		<span>
 		{if $order->id}
-			<a href="{$link->getAdminLink('AdminOrders')}&id_order={$order->id}&vieworder"> {l s='Order #'}{$order->id|string_format:"%06d"}</a></span>
+			<a href="{$link->getAdminLink('AdminOrders')}&id_order={$order->id}&vieworder"> {l s='Order #%d' sprintf=$order->id|string_format:"%06d"}</a></span>
 			<br /><br />
 			{l s='Made on:'} {dateFormat date=$order->date_add}<br /><br /><br /><br />
 		{else}

admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl

@@ -43,7 +43,7 @@
 					if (r == 'ok')
 					{
 						$('#note_feedback').html("<b style='color:green'>{l s='Your note has been saved'}</b>").fadeIn(400);
-						$('#submitCustomerNote').attr('disabled', 'disabled');
+						$('#submitCustomerNote').attr('disabled', true);
 					}
 					else if (r == 'error:validation')
 						$('#note_feedback').html("<b style='color:red'>({l s='Error: your note is not valid'}</b>").fadeIn(400);
@@ -144,7 +144,7 @@
 		</table>
 		<div class="clear">&nbsp;</div>
 	{else}
-		{$customer->firstname} {$customer->lastname} {l s='has never contacted you'}
+		{l s='%1$s %2$s has never contacted you' sprintf=[$customer->firstname, $customer->lastname]}
 	{/if}
 	
 	{* display hook specified to this page : AdminCustomers *}
@@ -152,7 +152,12 @@
 	
 	<div class="clear">&nbsp;</div>
 	
-	<h2>{l s='Groups'} ({count($groups)})</h2>
+	<h2>
+		{l s='Groups'} ({count($groups)})
+		<a href="{$current}&addcustomer&id_customer={$customer->id}&token={$token}">
+			<img src="../img/admin/edit.gif" />
+		</a>
+	</h2>
 	{if $groups AND count($groups)}
 		<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
 			<colgroup>
@@ -257,7 +262,7 @@
 			<div class="clear">&nbsp;</div>
 		{/if}
 	{else}
-		{$customer->firstname} {$customer->lastname} {l s='has not placed any orders yet'}
+		{l s='%1$s %2$s has not placed any orders yet' sprintf=[$customer->firstname, $customer->lastname]}
 	{/if}
 	
 	{if $products AND count($products)}
@@ -329,7 +334,7 @@
 			{/foreach}
 		</table>
 	{else}
-		{$customer->firstname} {$customer->lastname} {l s='has not registered any addresses yet'}
+		{l s='%1$s %2$s has not registered any addresses yet' sprintf=[$customer->firstname, $customer->lastname]}
 	{/if}
 	
 	<div class="clear">&nbsp;</div>
@@ -357,7 +362,7 @@
 		{/foreach}
 		</table>
 	{else}
-		{$customer->firstname} {$customer->lastname} {l s='has no discount vouchers'}.
+		{l s='%1$s %2$s has no discount vouchers' sprintf=[$customer->firstname, $customer->lastname]}.
 	{/if}
 	<div class="clear">&nbsp;</div>
 	

admin-dev/themes/default/template/controllers/emails/content.tpl

@@ -29,6 +29,7 @@
 	var textSubject = "{l s='Test message - Prestashop'}";
 	var textSendOk = "{l s='A test e-mail has been sent to the e-mail address you specified'}";
 	var textSendError= "{l s='Error: please check your configuration'}";
+	var token_mail = '{$token}';
 	var errorMail = "{l s='This e-mail address is invalid'}";
 	$(document).ready(function() {
 		if ($('input[name=PS_MAIL_METHOD]:checked').val() == 2)

admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl

@@ -59,20 +59,47 @@
 	$(document).ready(function(){
 		$('select[name=id_profile]').change(function(){
 			ifSuperAdmin($(this));
-		});
 
+			$.ajax({
+				url: "{$link->getAdminLink('AdminEmployees')}",
+				cache: false,
+				data : {
+					ajax : '1',
+					action : 'getTabByIdProfile',
+					id_profile : $(this).val()
+				},
+				dataType : 'json',
+				success : function(resp,textStatus,jqXHR)
+				{
+					if (resp != false)
+					{
+						$('select[name=default_tab]').html('');
+						$.each(resp, function(key, r){
+							if (r.id_parent == 0)
+							{
+								$('select[name=default_tab]').append('<optgroup label="'+r.name+'"></optgroup>');
+								$.each(r.children, function(k, value){
+									$('select[name=default_tab]').append('<option value="'+r.id_tab+'">'+value.name+'</option>')
+								});
+							}
+						});
+					}
+				}
+			});
+		});
 		ifSuperAdmin($('select[name=id_profile]'));
 	});
 
 	function ifSuperAdmin(el)
 	{
 		var val = $(el).val();
-		if(val == {$smarty.const._PS_ADMIN_PROFILE_})
+
+		if (!val || val == {$smarty.const._PS_ADMIN_PROFILE_})
 		{
-			$('.assoShop input[type=checkbox]').attr('disabled', 'disabled');
-			$('.assoShop input[type=checkbox]').attr('checked', 'checked');
+			$('.assoShop input[type=checkbox]').attr('disabled', true);
+			$('.assoShop input[type=checkbox]').attr('checked', true);
 		}
 		else
-			$('.assoShop input[type=checkbox]').attr('disabled', '');
+			$('.assoShop input[type=checkbox]').attr('disabled', false);
 	}
 {/block}

admin-dev/themes/default/template/controllers/group_shop/helpers/form/form.tpl

@@ -1,123 +0,0 @@
-{*
-* 2007-2012 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-2012 PrestaShop SA
-*  @version  Release: $Revision: 8971 $
-*  @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}
-
-	function toggleShareOrders() {
-
-		var disabled_customer = ($('#share_customer_on').attr('checked')) ? false : true;
-		var disabled_stock = ($('#share_stock_on').attr('checked')) ? false : true;
-
-		if (disabled_customer || disabled_stock)
-		{
-			$("input[name=share_order]").each(function(i) {
-	            $(this).attr('disabled', 'disabled');
-	        });
-
-			$('#share_order_off').attr('checked', true);
-		}
-		else
-		{
-			$('input[name=share_order]').attr('disabled', '');
-		}
-	}
-
-	$(document).ready(function() {
-		toggleShareOrders();
-		$('input[name=share_customer]').click(function()
-		{
-			toggleShareOrders();
-		});
-		$('input[name=share_stock]').click(function()
-		{
-			toggleShareOrders();
-		});
-
-		$('#useImportData').click(function() {
-			$('#importList').slideToggle('slow');
-		});
-	});
-
-{/block}
-
-{block name="label"}
-
-	{if $input.type == 'text' && $input.name == 'name'}
-		<div class="hint" name="help_box" style="display:block;">{l s='You can\'t edit GroupShop when you have more than one shop'}</div><br />
-	{/if}
-
-	{if isset($input.label)}
-		<label>{$input.label} </label>
-	{/if}
-
-{/block}
-
-{block name="other_fieldsets"}
-	{if isset($form_import)}
-		<br /><br />
-		<fieldset>
-			{foreach $form_import as $key => $field}
-				{if $key == 'legend'}
-					<legend>
-						{if isset($field.image)}<img src="{$field.image}" alt="{$field.title}" />{/if}
-						{$field.title}
-					</legend>
-				{elseif $key == 'label'}
-					<label>{$field}</label>
-				{/if}
-				<div class="clear"></div>
-				{if $key == 'checkbox'}
-					<div class="margin-form">
-						<label><input type="{$field.type}" value="{$field.value}" name="{$field.name}" id="{$field.name}" {if $checked} checked="checked"{/if}/> {$field.label}</label>
-				{elseif $key == 'select'}
-						<select name="{$field.name}" id="{$field.name}">
-							{foreach $field.options.query AS $key => $option}
-								<option value="{$key}" {if $key == $defaultGroup}selected="selected"{/if}>
-									{$option.name}
-								</option>
-							{/foreach}
-						</select>
-				{elseif $key == 'allcheckbox'}
-						<div id="importList" {if !$checked}style="display:none"{/if}>
-							<ul>
-								{foreach $field.values as $key => $label}
-									<li><label><input type="checkbox" name="importData[{$key}]" checked="checked" /> {$label}</label></li>
-								{/foreach}
-							</ul>
-						</div>
-				{elseif $key == 'p'}
-						<p>{$field}</p>
-					</div>
-				{elseif $key == 'submit'}
-					<div class="margin-form">
-						<input type="submit" value="{$field.title}" name="submitAdd{$table}" {if isset($field.class)}class="{$field.class}"{/if} />
-					</div>
-				{/if}
-			{/foreach}
-		</fieldset>
-	{/if}
-{/block}

admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl

@@ -77,7 +77,7 @@
 			else
 			{
 				$(elt).addClass('select_all').removeClass('unselect_all');
-				$('ul#sortable_module_'+$(elt).attr('id')).find('input[type="checkbox"]').attr('checked', 'checked');
+				$('ul#sortable_module_'+$(elt).attr('id')).find('input[type="checkbox"]').attr('checked', true);
 				$(elt).html('{l s='Unselect all'}');
 			}
 		}
@@ -171,7 +171,7 @@
 				{foreach $input['values'] key=key item=category }
 					<tr class="alt_row" id="{$category.id_category}">
 						<td>{$category.path}</td>
-						<td>{l s='Discount:'} {$category.reduction}{l s='%'}</td>
+						<td>{l s='Discount: %d%%' sprintf=$category.reduction}</td>
 						<td>
 							<a href="#" onclick="deleteCategoryReduction({$category.id_category});"><img src="../img/admin/delete.gif"></a>
 							<input type="hidden" class="category_reduction" name="category_reduction[{$category.id_category}]" value="{$category.reduction}">
@@ -258,7 +258,7 @@
 					<tr>
 						<td style="text-align:center">
 							<button style="width:100%;margin-top:5px" id="authorize_list" onclick="toogleCheck(this);return false;" class="button">{l s='Select all'}</button>
-							<button style="width:100%;margin-top:5px;margin-bottom:5px" onclick="authorizeChecked();return false;" class="button">{l s=''}</button>
+							<button style="width:100%;margin-top:5px;margin-bottom:5px" onclick="authorizeChecked();return false;" class="button">{l s='Unauthorize >>'}</button>
 						</td>
 						<td style="text-align:center">
 							<button style="width:100%;margin-top:5px"id="unauthorize_list" onclick="toogleCheck(this);return false;" class="button">{l s='Select all'}</button>

admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl

@@ -31,7 +31,7 @@
 	<fieldset>
 		<ul>
 			<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Name:'}</span> {$group->name[$language->id]}</li>
-		<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Discount:'}</span> {$group->reduction} {l s='%'}</li>
+		<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Discount: %d%%' sprintf=$group->reduction}</span></li>
 		<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Current category discount:'}</span>
 			{if !$categorieReductions}
 				{l s='None'}
@@ -40,7 +40,7 @@
 					{foreach $categorieReductions key=key item=category }
 						<tr class="alt_row">
 							<td>{$category.path}</td>
-							<td>{l s='Discount:'} {$category.reduction}{l s='%'}</td>
+							<td>{l s='Discount: %d%%' sprintf=$category.reduction}</td>
 						</tr>
 					{/foreach}
 				</table>
@@ -52,7 +52,7 @@
 				{l s='Tax excluded'}
 			{else}
 				{l s='Tax included'}
-				{/if}
+			{/if}
 		</li>
 		<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Show prices:'}</span> {if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}
 		</li>

admin-dev/themes/default/template/controllers/home/content.tpl

@@ -51,7 +51,7 @@
 			<a href="{$protocol}://screencasts.prestashop.com/v1.5/screencast.php?iso_lang={$isoUser}" id="screencast_fancybox"><img height="128" width="220" src="../img/admin/preview_fr.jpg" /><span class="mask-player"></span></a>
 		</div>
 			<div id="video-content">
-			<p>{l s='Take part in the e-commerce adventure with PrestaShop, the fast, powerful, and customizable e-commerce solution. With more than 275 features, PrestaShop will help you create a world of opportunities without limits. Discover the solution that has already conquered more than 100,000 merchants worldwide!'}</p>
+			<p>{l s='Take part in the e-commerce adventure with PrestaShop, the fast, powerful, and customizable e-commerce solution. With more than 275 features, PrestaShop will help you create a world of opportunities without limits. Discover the solution that has already conquered more than 120,000 merchants worldwide!'}</p>
 			</div>
 	<div id="footer_iframe_home">
 		<!--<a href="#">{l s='View more video tutorials'}</a>-->

admin-dev/themes/default/template/controllers/images/content.tpl

@@ -93,9 +93,7 @@
 				{l s='You can also decide to move your images to the new storage system: in this case, click on the "Move images" button below. Please be patient, this can take several minutes.'}
 				<br /><br />
 				<div class="hint clear" style="display: block;">&nbsp;
-					{l s='After moving all of your product images, for best performance go to the '}
-					<a style="text-decoration:underline" href="{$link_ppreferences}">{l s='product preferences tab'}</a>
-					{l s='and set "Use the legacy image filesystem" option to "No".'}
+					{l s='After moving all your product images, for best performance, set the "Use the legacy image filesystem" option above to "No".'}
 				</div>
 				<center><input type="Submit" name="submitMoveImages{$table}" value="{l s='Move images'}" class="button space" onclick="return confirm('{l s='Are you sure?'}');" /></center>
 			</fieldset>

admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl

@@ -24,22 +24,11 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{if $show_toolbar}
-	<div class="toolbar-placeholder">
-		<div class="toolbarBox{if $toolbar_scroll} toolbarHead{/if}">
-				{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-				<div class="pageTitle">
-				<h3>
-					<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-				</h3>
-				</div>
-			<div class="leadin">{block name="leadin"}{/block}</div>
-		</div>
-	</div>
-{/if}
+{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+<div class="leadin">{block name="leadin"}{/block}</div>
 
 {if $module_confirmation}
-	<div class="module_confirmation conf confirm"><img src="../img/admin/ok.gif" alt="" title="" style="margin-right:5px; float:left;" />
+	<div class="module_confirmation conf confirm">
 		{l s='Your .CSV file has been sucessfully imported into your shop.'}
 	</div>
 {/if}
@@ -51,30 +40,26 @@
 		$("a#upload_file_import_link").fancybox({
 				'titleShow' : false,
 				'transitionIn' : 'elastic',
-				'transitionOut' : 'elastic',
+				'transitionOut' : 'elastic'
+		});
+
+		$('#preview_import').submit(function(e) {
+			if ($('#truncate').get(0).checked)
+			{
+				if (!confirm('{l s='Are you sure you want to delete' js=1}' + ' ' + $.trim($('#entity > option:selected').text().toLowerCase()) + '{l s='?' js=1}'))
+				{
+					e.preventDefault();
+				}
+			}
 		});
 	});
 
 	function activeClueTip()
 	{
-		$('.info').cluetip({
+		$('.info_import').cluetip({
 			splitTitle: '|',
 		    showTitle: false
 	 	});
-
-		$('#preview_import').submit(function() {
-			if ($('#truncate').get(0).checked)
-			{
-				if (confirm('{l s='Are you sure you want to delete' js=1}' + ' ' + $.trim($('#entity > option:selected').text().toLowerCase()) + '{l s='?' js=1}'))
-				{
-					return true;
-				}
-				else
-				{
-					return false;
-				}
-			}
-		});
 	};
 </script>
 
@@ -85,7 +70,7 @@
 	<div id="upload_file_import" style="padding-left: 10px; background-color: #EBEDF4; border: 1px solid #CCCED7">
 		<div class="clear">&nbsp;</div>
 		<form action="{$current}&token={$token}" method="POST" enctype="multipart/form-data">	
-			<label class="clear" style="width:160px; text-align: left;">{l s='Select your CSV file:'} </label>	
+			<label class="clear" style="width:160px; text-align: left;">{l s='Select your CSV file'} </label>	
 			<div class="margin-form" style="padding-left:190px;">
 				<input name="file" type="file" />
 				<p class="preference_description">
@@ -112,8 +97,10 @@
 				<li><a href="../docs/csv_import/addresses_import.csv">{l s='Sample Addresses file'}</a></li>
 				<li><a href="../docs/csv_import/manufacturers_import.csv">{l s='Sample Manufacturers file'}</a></li>
 				<li><a href="../docs/csv_import/suppliers_import.csv">{l s='Sample Suppliers file'}</a></li>
-				<li><a href="../docs/csv_import/supply_orders_import.csv">{l s='Supply Orders sample file'}</a></li>
-				<li><a href="../docs/csv_import/supply_orders_details_import.csv">{l s='Supply Orders Details sample file'}</a></li>
+				{if $PS_ADVANCED_STOCK_MANAGEMENT}
+					<li><a href="../docs/csv_import/supply_orders_import.csv">{l s='Supply Orders sample file'}</a></li>
+					<li><a href="../docs/csv_import/supply_orders_details_import.csv">{l s='Supply Orders Details sample file'}</a></li>
+				{/if}
 			</ul>
 		</div>
 		<div class="clear">&nbsp;</div>
@@ -134,33 +121,32 @@
 	
 	<fieldset style="float: left; margin: 0pt 20px 0pt 0pt; width: 70%;">
 		<legend><img src="../img/admin/import.gif" />{l s='Import'}</legend>
-		<label class="clear">{l s='What kind of Entity would you like to import ?'} </label>
-		<div class="margin-form">
-			<select name="entity" id="entity">
-				{foreach $entities AS $entity => $i}
-					<option value="{$i}"
-						{if $entity == $i}selected="selected"{/if}>
-						{$entity}
-					</option>
-				{/foreach}
-			</select>
-		</div>
 
-			<label class="clear">{l s='Your CSV file'} ({count($files_to_import)} {if count($files_to_import) > 1} {l s='files'}{else}{l s='file'}{/if}{l s='):'}</label>
+			<label class="clear">{if count($files_to_import) > 1}{l s='Your CSV file (%d files):' sprintf=files_to_import}{else}{l s='Your CSV file (%d file):' sprintf=files_to_import}{/if}</label>
 			<div class="margin-form">
-			{if count($files_to_import)}
-				<select name="csv">
-					{foreach $files_to_import AS $filename}
-						<option value="{$filename}">{$filename}</option>
-					{/foreach}
-				</select>
-			{/if}
-				&nbsp;&nbsp;
+				{if count($files_to_import)}
+					<select name="csv">
+						{foreach $files_to_import AS $filename}
+							<option value="{$filename}">{$filename}</option>
+						{/foreach}
+					</select>
+				{/if}
+				&nbsp;
 				<a href="#upload_file_import" id="upload_file_import_link" class="button"><img src="../img/admin/add.gif" alt="Uplaod" title="Upload" />{l s='Upload'}</a>
 			</div>
-			<br />
+
+			<label class="clear">{l s='What kind of Entity would you like to import?'} </label>
+			<div class="margin-form">
+				<select name="entity" id="entity">
+					{foreach $entities AS $entity => $i}
+						<option value="{$i}" {if $entity == $i}selected="selected"{/if}>
+							{$entity}
+						</option>
+					{/foreach}
+				</select>
+			</div>
 				
-			<label class="clear">{l s='Language of the file:'}</label>
+			<label class="clear">{l s='Language of the file'}</label>
 			<div class="margin-form">
 				<select name="iso_lang">
 					{foreach $languages AS $lang}
@@ -173,12 +159,12 @@
 			<div class="margin-form">
 				<input name="convert" id="convert" type="checkbox" style="margin-top: 6px;"/>
 			</div>
-			<label class="clear">{l s='Field separator:'} </label>
+			<label class="clear">{l s='Field separator'} </label>
 			<div class="margin-form">
 				<input type="text" size="2" value=";" name="separator"/>
 				{l s='e.g. '}"1<span class="bold" style="color: red">;</span>Ipod<span class="bold" style="color: red">;</span>129.90<span class="bold" style="color: red">;</span>5"
 			</div>
-			<label class="clear">{l s='Multiple value separator:'} </label>
+			<label class="clear">{l s='Multiple value separator'} </label>
 			<div class="margin-form">
 				<input type="text" size="2" value="," name="multiple_value_separator"/>
 				{l s='e.g. '}"Ipod;red.jpg<span class="bold" style="color: red">,</span>blue.jpg<span class="bold" style="color: red">,</span>green.jpg;129.90"
@@ -192,7 +178,8 @@
 				<input name="match_ref" id="match_ref" type="checkbox" style="margin-top: 6px; display:none"/>
 			</div>
 			<div class="space margin-form">
-				<input type="submit" name="submitImportFile" value="{l s='Next step'}" class="button"/>
+				<input type="submit" name="submitImportFile" value="{l s='Next step'}" class="button" {if empty($files_to_import)}disabled{/if}/>
+				{if empty($files_to_import)}<span style="color:red;">{l s='You must upload a file for go to the next step.'}</span>{/if}
 			</div>
 			<div class="warn import_products_categories" style="margin-top: 20px;">
 				<p>{l s='Note that the category import does not support categories of the same name.'}</p>
@@ -205,9 +192,8 @@
 			<div class="warn" style="margin-top: 20px;">
 				<p>{l s='There is no CSV file available, please upload one using the \'Upload\' button above.'}</p>
 				<ul>
-				<li>{l s='You can read informations on CSV import at:'} <a href="http://www.prestashop.com/wiki/Troubleshooting_6/" target="_blank">http://www.prestashop.com/wiki/Troubleshooting_6/</a></li>	
-					<li>
-				{l s='Read more about CSV format at:'} <a href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">http://en.wikipedia.org/wiki/Comma-separated_values</a></li>
+					<li>{l s='You can read informations on CSV import at:'} <a href="http://doc.prestashop.com/display/PS14/Troubleshooting#Troubleshooting-HowtocorrectlyimportaccentuatedcontentusingaCSVfile%3F" target="_blank">http://doc.prestashop.com/display/PS14/Troubleshooting</a></li>
+					<li>{l s='Read more about CSV format at:'} <a href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">http://en.wikipedia.org/wiki/Comma-separated_values</a></li>
 				</ul>
 			</div>
 		{/if}

admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl

@@ -79,20 +79,20 @@
 		<legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='Information about your configuration'}</legend>
 		<h3>{l s='Server information'}</h3>
 		<p>
-			<b>{l s='Prestashop version'}:</b> {$version.ps}
+			<b>{l s='Prestashop version'}:</b> {$version.ps|escape:'htmlall':'UTF-8'}
 		</p>
 	
 		{if count($uname)}
 		<p>
-			<b>{l s='Server information'}:</b> {$uname}
+			<b>{l s='Server information'}:</b> {$uname|escape:'htmlall':'UTF-8'}
 		</p>
 		{/if}
 	
 		<p>
-			<b>{l s='Server software version'}:</b> {$version.server}
+			<b>{l s='Server software version'}:</b> {$version.server|escape:'htmlall':'UTF-8'}
 		</p>
 		<p>
-			<b>{l s='PHP version'}:</b> {$version.php}
+			<b>{l s='PHP version'}:</b> {$version.php|escape:'htmlall':'UTF-8'}
 		</p>
 		{if $apache_instaweb}
 		<p style="color:red;font-weight:700">{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
@@ -101,22 +101,22 @@
 		<hr />
 		<h3>{l s='Database information'}</h3>
 		<p>
-			<b>{l s='MySQL version'}:</b> {$database.version}
+			<b>{l s='MySQL version'}:</b> {$database.version|escape:'htmlall':'UTF-8'}
 		</p>
 		<p>
-			<b>{l s='MySQL engine'}:</b> {$database.engine}
+			<b>{l s='MySQL engine'}:</b> {$database.engine|escape:'htmlall':'UTF-8'}
 		</p>
 		<p>
-			<b>{l s='Tables prefix'}:</b> {$database.prefix}
+			<b>{l s='Tables prefix'}:</b> {$database.prefix|escape:'htmlall':'UTF-8'}
 		</p>
 	
 		<hr />
 		<h3>{l s='Store information'}</h3>
 		<p>
-			<b>{l s='Shop URL'}:</b> {$shop.url}
+			<b>{l s='Shop URL'}:</b> {$shop.url|escape:'htmlall':'UTF-8'}
 		</p>
 		<p>
-			<b>{l s='Current theme in use'}:</b> {$shop.theme}
+			<b>{l s='Current theme in use'}:</b> {$shop.theme|escape:'htmlall':'UTF-8'}
 		</p>
 		<hr />
 		<h3>{l s='Mail configuration'}</h3>
@@ -128,7 +128,7 @@
 	{else}
 		{l s='You are using your own SMTP parameters.'}</p>
 		<p>
-			<b>{l s='SMTP server'}:</b> {$smtp.server}
+			<b>{l s='SMTP server'}:</b> {$smtp.server|escape:'htmlall':'UTF-8'}
 		</p>
 		<p>
 			<b>{l s='SMTP user'}:</b>
@@ -147,16 +147,16 @@
 			{/if}
 		</p>
 		<p>
-			<b>{l s='Encryption'}:</b> {$smtp.encryption}
+			<b>{l s='Encryption'}:</b> {$smtp.encryption|escape:'htmlall':'UTF-8'}
 		</p>
 		<p>
-			<b>{l s='Port'}:</b> {$smtp.port}
+			<b>{l s='Port'}:</b> {$smtp.port|escape:'htmlall':'UTF-8'}
 		</p>
 	{/if}
 		<hr />
 		<h3>{l s='Your information'}</h3>
 		<p>
-			<b>{l s='Your web browser'}:</b> {$user_agent}
+			<b>{l s='Your web browser'}:</b> {$user_agent|escape:'htmlall':'UTF-8'}
 		</p>
 	</fieldset>
 	<br />

admin-dev/themes/default/template/controllers/login/content.tpl

@@ -31,9 +31,9 @@
 </script>
 
 <div id="container">	
-	<div id="error" style="{if !isset($errors)}display:none;{/if}">
+	<div id="error" {if !isset($errors)}class="hide"{/if}>
 		{if isset($errors)}
-			<h3>{if $nbErrors > 1}{l s='There are'}{else}{l s='There is'}{/if} {$nbErrors}{if $nbErrors > 1} {l s='errors'}{else} {l s='error'}{/if}</h3>
+			<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>
@@ -48,59 +48,66 @@
 		</div>
 	{/if}
 	<div id="login">
-	{if !isset($wrong_folder_name)}
-		<div id="login_form">
-			<h1>{$shop_name}</h1>
-			<form action="" method="post" id="login_form" onsubmit="doAjaxLogin('{$redirect}');return false;">
-				<label for="email">{l s='E-mail address:'}</label><br />
-				<input type="text" id="email" name="email" class="input" value="{if isset($email)}{$email|htmlentities}{/if}" />
-				<div style="margin: 1.8em 0 0 0;">
-					<label for="passwd">{l s='Password:'}</label><br />
-					<input id="passwd" type="password" name="passwd" class="input" value="{if isset($password)}{$password}{/if}"/>
-				</div>
-				<div>
-					<div id="submit">
-						<input type="hidden" name="redirect" value="{$redirect}"/>
-						<input type="submit" name="submitLogin" value="{l s='Log in'}" class="button" style="float:left"/>
-						<span style="float:left;width:30px">
-							<img id="ajax-loader" src="../img/loader.gif" style="float:left;margin:2px 0 0 5px;display:none">
-						</span>
-					</div>
-					<div id="lost">
-						<a href="#" onclick="displayForgotPassword();return false;">{l s='Lost password?'}</a>
-					</div>
-				</div>
-				<script type="text/javascript">
-				//TODO FOCUS ON EMAIL
-				</script>
-			</form>
-		</div>
-	{else}
 		<h1>{$shop_name}</h1>
-		<div style="margin:30px;">
-			<p><span>{l s='For security reasons, you cannot connect to the Back Office until after you have:'}<br /><br />
-				<ul>
-					<li>{l s='deleted the /install folder'}</li>
-					<li>{l s='renamed the /admin folder (e.g. /admin123)'}{$randomNb}</li>
-				</ul>
-			<br />{l s='Please then access this page by the new URL (e.g. http://www.yoursite.com/admin123)'}{$randomNb}</span></p>
+	{if !isset($wrong_folder_name)}
+		<form action="#" id="login_form" method="post">
+			<div class="field">
+				<label for="email">{l s='E-mail 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">
+				</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='Please enter the e-mail address you provided during the registration process in order to receive your access code by e-mail'}</p>
+
+			<div class="field">
+				<label>{l s='E-mail 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">
+				</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>
+				<li>{l s='deleted the /install folder'}</li>
+				<li>{l s='renamed the /admin folder (e.g. /admin123%d)' sprintf=$randomNb}</li>
+			</ul>
+			<p>{l s='Please then access this page by the new URL (e.g. http://www.yoursite.com/admin123%d)' sprintf=$randomNb}</p>
 		</div>
 	{/if}
-		<div id="forgot_password" style="display:none">
-			<h1>{$shop_name}</h1>
-			<form action="" method="post" onsubmit="doAjaxForgot();return false;">
-				<div class="page-title center">{l s='Forgot your password?'}</div><br />
-				<span style="font-weight: bold;">{l s='Please enter the e-mail address you provided during the registration process in order to receive your access code by e-mail'}</span><br />
-				<input style="margin-top:20px" type="text" name="email_forgot" id="email_forgot" class="input" />
-				<div id="submit">
-					<input type="submit" name="Submit" value="{l s='Send'}" class="button" style="float:left" />
-				<span style="float:left;width:30px">
-					<img id="ajax-loader" src="../img/loader.gif" style="float:left;margin:2px 0 0 5px;display:none">
-				</span>
-				</div>
-				<div id="lost"><a href="#" onclick="displayLogin();return false;">{l s='Back to login'}</a></div>
-			</form>
-		</div>
 	</div>
 	<h2><a href="http://www.prestashop.com">&copy; 2005 - {$smarty.now|date_format:"%Y"} Copyright by PrestaShop. all rights reserved.</a></h2>
 </div>

admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl

@@ -28,7 +28,7 @@
 {block name="input"}
 	{if $field['type'] == 'maintenance_ip'}
 		{$field['script_ip']}
-		<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'|htmlentities}" />
+		<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
 		{$field['link_remove_ip']}
 	{else}
 		{$smarty.block.parent}

admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl

@@ -27,18 +27,18 @@
 {extends file="helpers/options/options.tpl"}
 {block name="input"}
 	{if $field['type'] == 'rewriting_settings'}
-		{if $field['mod_rewrite']}
 			<label class="t" for="{$key}_on"><img src="../img/admin/enabled.gif" alt="{l s='Yes'}" title="{l s='Yes'}" /></label>
 			<input type="radio" name="{$key}" id="{$key}_on" value="1" {if $field['value']} checked="checked"{/if}{if isset($field['js']['on'])} {$field['js']['on']}{/if}/>
 			<label class="t" for="{$key}_on"> {l s='Yes'}</label>
 			<label class="t" for="{$key}_off"><img src="../img/admin/disabled.gif" alt="{l s='No'}" title="{l s='No'}" style="margin-left: 10px;" /></label>
 			<input type="radio" name="{$key}" id="{$key}_off" value="0" {if !$field['value']} checked="checked"{/if}{if isset($field['js']['off'])} {$field['js']['off']}{/if}/>
 			<label class="t" for="{$key}_off"> {l s='No'}</label>
-		{else}
-			<span class="warning_mod_rewrite" style="display:block;height:15px">{l s='URL rewriting (mod_rewrite) is not active on your server. If you want to use Friendly URL you must activate this mod.'}</span>
+		{if !$field['mod_rewrite']}
+			<span class="warning_mod_rewrite">{l s='URL rewriting (mod_rewrite) is not active on your server. If you want to use Friendly URL you must activate this mod.'}</span>
 			<div class="clear"></div>
 		{/if}
 	{else}
 		{$smarty.block.parent}
 	{/if}
-{/block}
+{/block}
+

admin-dev/themes/default/template/controllers/modules/content.tpl

@@ -28,10 +28,12 @@
 {if isset($module_content)}
 	{$module_content}
 {else}
-	{include file='controllers/modules/js.tpl'}
-	{if isset($smarty.get.select) && $smarty.get.select eq 'favorites'}
-		{include file='controllers/modules/favorites.tpl'}
-	{else}
-		{include file='controllers/modules/page.tpl'}
+	{if !isset($smarty.get.configure)}
+		{include file='controllers/modules/js.tpl'}
+		{if isset($smarty.get.select) && $smarty.get.select eq 'favorites'}
+			{include file='controllers/modules/favorites.tpl'}
+		{else}
+			{include file='controllers/modules/page.tpl'}
+		{/if}
 	{/if}
 {/if}

admin-dev/themes/default/template/controllers/modules/favorites.tpl

@@ -23,13 +23,13 @@
 				</colgroup>
 				<thead>
 					<tr class="nodrag nodrop">
-						<th class="center">Logo</th>
-						<th>Nom du module</th>
-						<th>Description</th>
-						<th>Etat</th>
-						<th>Catégories</th>
-						<th>Intérêt</th>
-						<th>Favori</th>
+						<th class="center">{l s='Logo'}</th>
+						<th>{l s='Module Name'}</th>
+						<th>{l s='Description'}</th>
+						<th>{l s='Status'}</th>
+						<th>{l s='Categories'}</th>
+						<th>{l s='Interest'}</th>
+						<th>{l s='Favorite'}</th>
 						<th>&nbsp;</th>
 					</tr>
 				</thead>

admin-dev/themes/default/template/controllers/modules/filters.tpl

@@ -56,7 +56,7 @@
 			<!--start addons login-->
 			<div class="filter-module" id="addons_login_div">
 		
-				<p>{l s='Do you have a PrestaShop Addons account?'}</p>
+				<p>{l s='Do you have a %s account?' sprintf='<a href="http://addons.prestashop.com/">PrestaShop Addons</a>'}</p>
 				<form id="addons_login_form" method="post">
 					<label>{l s='Login to Addons'} :</label> <input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
 					<label>{l s= 'Password Addons'} :</label> <input type="password" value="" id="password_addons" autocomplete="off" class="ac_input">

admin-dev/themes/default/template/controllers/modules/header.tpl

@@ -29,7 +29,7 @@
 	
 			<ul class="cc_button">
 				<li>
-					<a id="desc-module-new" class="toolbar_btn" href="#top_container" onclick="$('#module_install').slideToggle();" title="Add new">
+					<a id="desc-module-new" class="toolbar_btn" href="#top_container" onclick="$('#module_install').slideToggle();" title="{l s='Add new module'}">
 						<span class="process-icon-new-module" ></span>
 						<div>{l s='Add new module'}</div>
 					</a>

admin-dev/themes/default/template/controllers/modules/js.tpl

@@ -24,7 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-
 <link href="{$smarty.const._PS_JS_DIR_}jquery/plugins/fancybox/jquery.fancybox.css" rel="stylesheet" type="text/css" media="screen" />
 <script type="text/javascript">{$autocompleteList}</script>
 <script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/plugins/autocomplete/jquery.autocomplete.js"></script>
@@ -35,13 +34,11 @@
 	var currentIndexWithToken = '{$currentIndex}&token={$token}';
 	var dirNameCurrentIndex = '{$dirNameCurrentIndex}';
 	var ajaxCurrentIndex = '{$ajaxCurrentIndex}';
+	var installed_modules = {if isset($installed_modules) && count($installed_modules)}{$installed_modules}{else}false{/if};
 	var by = '{l s='by'}';
 	var errorLogin = '{l s='PrestaShop was unable to login to Addons, please check your credentials and your internet connection.'}';
 	var confirmPreferencesSaved = '{l s='Preferences saved'}';
-	{if isset($smarty.get.anchor)}var anchor = '{$smarty.get.anchor|htmlentities|replace:'(':''|replace:')':''|replace:'{':''|replace:'}':''|replace:'\'':''|replace:'/':''}';{else}var anchor = '';{/if}
-
-
-
+	{if isset($smarty.get.anchor) && !isset($error_module)}var anchor = '{$smarty.get.anchor|htmlentities|replace:'(':''|replace:')':''|replace:'{':''|replace:'}':''|replace:'\'':''|replace:'/':''}';{else}var anchor = '';{/if}
 
 	{literal}
 
@@ -67,16 +64,14 @@
 		document.location.href=currentIndex+'&token='+token+'&'+action+'='+module_list.substring(1, module_list.length);
 	}
 
-
 	$('document').ready( function() {
-
-
-
 		// ScrollTo
 		if (anchor != '')
 			$.scrollTo('#'+anchor, 1200, {offset: -100});
 
-
+		// If a list of modules is set, install request has been called
+		if (installed_modules !== false)
+			wsModuleCall(installed_modules);
 
 		// AutoComplete Search
 		$('input[name="filtername"]').autocomplete(moduleList, {
@@ -98,28 +93,23 @@
 			 $('#filternameForm').submit();
 		});
 
-
-
 		// Method to check / uncheck all modules checkbox
 		$('#checkme').click(function()
 		{
 			if ($(this).attr("rel") == 'false')
 			{
-				$(this).attr("checked", "checked");
+				$(this).attr("checked", true);
 				$(this).attr("rel", "true");
-				$("input[name=modules]").attr("checked", "checked");
+				$("input[name=modules]").attr("checked", true);
 			}
 			else
 			{
-				$(this).attr("checked", "");
+				$(this).removeAttr("checked");
 				$(this).attr("rel", "false");
-				$("input[name=modules]").attr("checked", "");
+				$("input[name=modules]").removeAttr("checked");
 			}
 		});		
 
-
-
-
 		// Method to reload filter in ajax
 		$('.categoryModuleFilterLink').click(function()
 		{
@@ -156,8 +146,6 @@
 			return false;
 		});
 
-
-
 		// Method to get modules_list.xml from prestashop.com and default_country_modules_list.xml from addons.prestashop.com
 		try
 		{
@@ -186,8 +174,6 @@
 		}
 		catch(e) { }
 
-
-
 		// Method to log on PrestaShop Addons WebServices
 		$('#addons_login_button').click(function()
 		{
@@ -233,7 +219,6 @@
 			return false;
 		});
 
-
 		// Method to log out PrestaShop Addons WebServices
 		$('#addons_logout_button').click(function()
 		{
@@ -275,7 +260,6 @@
 			return false;
 		});
 
-
 		// Method to set filter on modules
 		function setFilter()
 		{
@@ -320,9 +304,6 @@
 		$('#module_status_filter').change(function() { setFilter(); });
 		$('#country_module_value_filter').change(function() { setFilter(); });
 
-
-
-
 		// Method to save favorites preferences
 		$('.moduleFavorite').change(function()
 		{
@@ -360,10 +341,30 @@
 			catch(e){}
 			return false;
 		});
-
-
-
-
 	});
+
+	function wsModuleCall(modules_list)
+	{
+		$.ajax({
+			type : 'POST',
+			url : ajaxCurrentIndex,
+			data :	{
+				'modules_list' : modules_list,
+				'controller' : 'AdminModules',
+				'action' : 'wsModuleCall',
+				'token' : token
+			},
+			dataType: 'json',
+			success: function(json)
+			{
+				//console.log(json);
+ 			},
+			error: function(xhr, ajaxOptions, thrownError)
+			{
+				//jAlert("TECHNICAL ERROR"+xhr);
+			}
+		});
+	}
+
 	{/literal}
-</script>
+</script>

admin-dev/themes/default/template/controllers/modules/list.tpl

@@ -67,7 +67,7 @@
 											<dd>{$module->categoryName}</dd>
 										</dl>
 									</div>
-									<p class="desc">{l s='Description'} : {$module->description}</p>
+									<p class="desc">{if isset($module->description) && $module->description ne ''}{l s='Description'} : {$module->description}{else}&nbsp;{/if}</p>
 									{if isset($module->message)}<div class="conf">{$module->message}</div>{/if}
 									<div class="row-actions-module">
 										{if !isset($module->not_on_disk)}{$module->optionsHtml}{else}&nbsp;{/if}

admin-dev/themes/default/template/controllers/modules_positions/form.tpl

@@ -24,16 +24,9 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<div class="toolbarBox">
-{if $show_toolbar}
-	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-	<div class="pageTitle">
-	<h3>{block name=pageTitle}
-		<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-		{/block}</h3>
-	</div>
-{/if}
-</div>
+{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">
 	{if $display_key}
 		<input type="hidden" name="show_modules" value="{$display_key}" />

admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl

@@ -30,19 +30,8 @@
 </script>
 <script type="text/javascript" src="../js/admin-dnd.js"></script>
 
-{if $show_toolbar}
-	<div class="toolbar-placeholder">
-		<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
-			{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-			<div class="pageTitle">
-				<h3>{block name=pageTitle}
-					<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-					{/block}
-				</h3>
-			</div>
-		</div>
-	</div>
-{/if}
+{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+<div class="leadin">{block name="leadin"}{/block}</div>
 
 <div class="filter-module">
 <form>

admin-dev/themes/default/template/controllers/not_found/content.tpl

@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<h1>{l s='The controller'} {$controller} {l s='is missing or invalid.'}</h1>
+<h1>{l s='The controller %s is missing or invalid.' sprintf=$controller}</h1>
 <ul>
 <li><a href="index.php">{l s='Go to Dashboard'}</a></li>
 <li><a href="#" onclick="window.history.back();">{l s='Back to previous page'}</a></li>

admin-dev/themes/default/template/controllers/orders/_customized_data.tpl

@@ -23,9 +23,9 @@
 *  @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>
+{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 ($product.image->id)}{$product.image_tag}{else}'--'{/if}</td>
 		<td>
 			<a href="index.php?controller=adminproducts&id_product={$product['product_id']}&updateproduct&token={getAdminToken tab='AdminProducts'}">
@@ -34,76 +34,90 @@
 			{if ($product['product_supplier_reference'])}{l s='Ref Supplier:'} {$product['product_supplier_reference']}{/if}
 			</a>
 		</td>
-		<td align="center">{displayPrice price=$product['product_price_wt'] currency=$currency->id}</td>
+		<td align="center">
+			<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']}" />
+				{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 ($order->hasBeenPaid())}<td align="center" class="productQuantity">{$product['customizationQuantityRefunded']}</td>{/if}
 		{if ($order->hasBeenDelivered())}<td align="center" class="productQuantity">{$product['customizationQuantityReturned']}</td>{/if}
-		<td align="center" class="productQuantity"> - </td>
-		<td align="center">
+		<td align="center" class=""> - </td>
+		<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}
 		{else}
 			{displayPrice price=Tools::ps_round($product['product_price_wt'] * $product['customizationQuantityTotal'], 2) currency=$currency->id}
 		{/if}
 		</td>
-		<td align="center" class="cancelCheck">--</td>
-		<td align="center" class="cancelQuantity">--</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>
+		<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 from=$product.customizedDatas key=customizationId item=customization}
-		<tr>
-			<td colspan="2">
-		{foreach from=$customization.datas key=type item=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="display: inline; margin: 2px;">
-						<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>
-			{elseif ($type == Product::CUSTOMIZE_TEXTFIELD)}
-				<ul style="margin: 0px 0px 4px 0px; padding: 0px 0px 0px 6px; list-style-type: none;">
-				{foreach from=$datas item=data}
-					<li>{if $data['name']}{$data['name']}{else}{l s='Text #'}{$data@iteration}{/if}{l s=':'} {$data['value']}</li>
-				{/foreach}
-				</ul>
-			{/if}
+	{foreach $product.customizedDatas as $customizationPerAddress}
+		{foreach $customizationPerAddress as $customizationId => $customization}
+			<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">
+			{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}-file{$data@iteration}" target="_blank"><img src="{$smarty.const._THEME_PROD_PIC_DIR_}{$data['value']}_small" alt="" /></a>
+						</li>
+					{/foreach}
+					</ul>
+				{elseif ($type == Product::CUSTOMIZE_TEXTFIELD)}
+					<ul style="margin: 0px 0px 4px 0px; padding: 0px 0px 0px 6px; list-style-type: none;">
+					{foreach from=$datas item=data}
+						<li>{if $data['name']}{l s='%s:' sprintf=$data['name']}{else}{l s='Text #%s:' sprintf=$data@iteration}{/if} {$data['value']}</li>
+					{/foreach}
+					</ul>
+				{/if}
+			{/foreach}
+				</td>
+				<td align="center">-
+				</td>
+				<td align="center" class="productQuantity">
+					<span class="product_quantity_show">{$customization['quantity']}</span>
+					{if $can_edit}
+					<span class="product_quantity_edit" style="display:none;">
+						<input type="text" name="product_quantity[{$customizationId}]" class="edit_product_quantity" value="{$customization['quantity']|htmlentities}" size="2" />
+					</span>
+					{/if}
+				</td>
+				{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">
+				-
+				</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}
+					{else}
+						{displayPrice price=Tools::ps_round($product['product_price_wt'] * $customization['quantity'], 2) currency=$currency->id}
+					{/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[{$k}]" value="0" /> 0/{$customization['quantity']-$product['product_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"><input type="text" size="3" name="partialRefundProduct[{$k}]" /> &euro;</div>
+				</td>
+				<td class="edit_product_fields" colspan="2" style="display:none"></td>
+				<td class="product_action" style="text-align:right">
+				</td>
+			</tr>
 		{/foreach}
-			</td>
-			<td align="center">-</td>
-			<td align="center" class="productQuantity">{$customization['quantity']}</td>
-			{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">-</td>
-			<td align="center">
-			{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
-				{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}
-			{/if}
-			</td>
-			<td align="center" class="cancelCheck">
-				<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')) && (int)(($customization['quantity_returned']) < (int)($customization['quantity'])))}
-				<input type="checkbox" name="id_customization[{$customizationId}]" id="id_customization[{$customizationId}]" value="{$product['id_order_detail']}" onchange="setCancelQuantity(this, '{$customizationId}', '{$customization['quantity'] - $customization['quantity_refunded']}')" '.{if (($customization['quantity_returned'] + $customization['quantity_refunded']) >= $customization['quantity'])}disabled="disabled"{/if} />
-			{else}
-				--
-			{/if}
-			</td>
-			<td class="cancelQuantity">
-			{if (($customization['quantity_returned'] + $customization['quantity_refunded']) >= $customization['quantity'])}
-				<input type="hidden" name="cancelCustomizationQuantity[{$customizationId}]" value="0" />
-			{elseif (!$order->hasBeenDelivered() || Configuration::get('PS_ORDER_RETURN'))}
-				<input type="text" id="cancelQuantity_{$customizationId}" name="cancelCustomizationQuantity[{$customizationId}]" size="2" onclick="selectCheckbox(this);" value="" />
-			{/if}
-			{if ($order->hasBeenDelivered())}
-				{$customization['quantity_returned']}/{$customization['quantity']-$customization['quantity_refunded']}
-			{elseif ($order->hasBeenPaid())}
-				{$customization['quantity_returned']}/{$customization['quantity']}
-			{/if}
-			</td>
-		</tr>
 	{/foreach}
 {/if}

admin-dev/themes/default/template/controllers/orders/_discount_form.tpl

@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<form method="POST" action="{$currentIndex}&viewOrder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+<form method="POST" action="{$current_index}&viewOrder&id_order={$order->id|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
 	<label>{l s='Name'}</label>
 	<div class="margin-form">
 		<input type="text" name="discount_name" value="" />

admin-dev/themes/default/template/controllers/orders/_documents.tpl

@@ -58,12 +58,15 @@
 				{l s='Credit Slip'}
 			{/if}</td>
 		<td class="document_number">
-			<a target="_blank" href="
 			{if get_class($document) eq 'OrderInvoice'}
-				pdf.php?{if isset($document->is_delivery)}delivery{else}pdf{/if}&id_order_invoice={$document->id}
+				{if isset($document->is_delivery)}
+					<a target="_blank" href="{$link->getAdminLink('AdminPdf')}&submitAction=generateDeliverySlipPDF&id_order_invoice={$document->id}">
+			   	{else}
+					<a target="_blank" href="{$link->getAdminLink('AdminPdf')}&submitAction=generateInvoicePDF&id_order_invoice={$document->id}">
+			   {/if}
 			{elseif get_class($document) eq 'OrderSlip'}
-				pdf.php?id_order_slip={$document->id}
-			{/if}">
+				<a target="_blank" href="{$link->getAdminLink('AdminPdf')}&submitAction=generateOrderSlipPDF&id_order_slip={$document->id}">
+			{/if}
 			{if get_class($document) eq 'OrderInvoice'}
 				{if isset($document->is_delivery)}
 					#{Configuration::get('PS_DELIVERY_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->delivery_number}
@@ -71,7 +74,7 @@
 					{$document->getInvoiceNumberFormatted($current_id_lang)}
 				{/if}
 			{elseif get_class($document) eq 'OrderSlip'}
-				{l s='#'}{'%06d'|sprintf:$document->id}
+				{l s='#%d' sprintf=$document->id}
 			{/if} <img src="../img/admin/details.gif" alt="{l s='See the document'}" /></a></td>
 		<td class="document_amount">
 		{if get_class($document) eq 'OrderInvoice'}
@@ -79,8 +82,14 @@
 				--
 			{else}
 				{displayPrice price=$document->total_paid_tax_incl currency=$currency->id}&nbsp;
-				{if $document->getRestPaid()}
-					<span style="color:red;font-weight:bold;">({displayPrice price=$document->getRestPaid() currency=$currency->id} {l s='not paid'})</span>
+				{if $document->getGlobalRestPaid()}
+					<span style="color:red;font-weight:bold;">
+					{if $document->getGlobalRestPaid() >= 0}
+						({displayPrice price=$document->getGlobalRestPaid() currency=$currency->id} {l s='not paid'})
+					{else}
+						({displayPrice price=-$document->getGlobalRestPaid() currency=$currency->id} {l s='overpaid'})
+					{/if}
+					</span>
 				{/if}
 			{/if}
 		{/if}
@@ -100,7 +109,7 @@
 		{if !isset($document->is_delivery)}
 	<tr id="invoiceNote{$document->id}" style="display:none" class="current-edit">
 		<td colspan="5">
-			<form action="{$currentIndex}&viewOrder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}" 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}" />
@@ -115,11 +124,13 @@
 	</tr>
 		{/if}
 	{/if}
-		{foreachelse}
+	{foreachelse}
 	<tr>
 		<td colspan="5" class="center">
 			<h3>{l s='No document is available'}</h3>
-			<p><a class="button" href="{$currentIndex}&viewOrder&submitGenerateInvoice&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">{l s='Generate invoice'}</a></p>
+			{if isset($invoice_management_active) && $invoice_management_active}
+			<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>
 	{/foreach}

admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl

@@ -26,8 +26,8 @@
 
 {* Generate HTML code for printing Invoice Icon with link *}
 <span style="width:20px; margin-right:5px;">
-{if ($order_state->invoice && $order->invoice_number)}
-	<a target="_blank" href="pdf.php?id_order={$order->id}&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
+{if ($order_state->invoice || $order->invoice_number)}
+	<a target="_blank" href="{$link->getAdminLink('AdminPdf')}&submitAction=generateInvoicePDF&id_order={$order->id}"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
 {else}
 	-
 {/if}
@@ -35,8 +35,8 @@
 
 {* Generate HTML code for printing Delivery Icon with link *}
 <span style="width:20px;">
-{if ($order_state->delivery && $order->delivery_number)}
-	<a target="_blank" href="pdf.php?id_order={$order->id}&delivery"><img src="../img/admin/delivery.gif" alt="delivery" /></a>
+{if ($order_state->delivery || $order->delivery_number)}
+	<a target="_blank" href="{$link->getAdminLink('AdminPdf')}&submitAction=generateDeliverySlipPDF&id_order={$order->id}"><img src="../img/admin/delivery.gif" alt="delivery" /></a>
 {else}
 	-
 {/if}

admin-dev/themes/default/template/controllers/orders/_product_line.tpl

@@ -69,16 +69,16 @@
 		<input type="hidden" name="totalQty" id="totalQty" value="{$product['product_quantity']}" />
 		<input type="hidden" name="productName" id="productName" value="{$product['product_name']}" />
 	{if ((!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN')) AND (int)($product['product_quantity_return']) < (int)($product['product_quantity']))}
-		<input type="checkbox" name="id_order_detail[{$k}]" id="id_order_detail[{$k}]" value="{$product['id_order_detail']}" onchange="setCancelQuantity(this, {$product['id_order_detail']}, {$product['product_quantity_in_stock'] - $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']}, {$product['product_quantity_in_stock'] - $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 ($product['product_quantity_return'] + $product['product_quantity_refunded'] >= $product['product_quantity'])}
-		<input type="hidden" name="cancelQuantity[{$k}]" 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_{$product['id_order_detail']}" name="cancelQuantity[{$k}]" size="2" onclick="selectCheckbox(this);" value="" />
+		<input type="text" id="cancelQuantity_{$product['id_order_detail']}" name="cancelQuantity[{$product['id_order_detail']}]" size="2" onclick="selectCheckbox(this);" value="" />
 	{/if}
 
 	{if $product['customizationQuantityTotal']}
@@ -96,8 +96,10 @@
 	{/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[{$k}]" value="0" /> 0/{$productQuantity-$product['product_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"><input type="text" size="3" name="partialRefundProduct[{$k}]" /> &euro;</div>
+		<div style="width:40%;margin-top:5px;float:left">{l s='Quantity:'}</div> <div style="width:60%;margin-top:2px;float:left"><input onchange="checkPartialRefundProductQuantity(this)" type="text" size="3" name="partialRefundProductQuantity[{{$product['id_order_detail']}}]" value="0" /> 0/{$productQuantity-$product['product_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"><input onchange="checkPartialRefundProductAmount(this)" type="text" size="3" name="partialRefundProduct[{$product['id_order_detail']}]" /> &euro;</div> {if !empty($product['amount_refund']) && $product['amount_refund'] > 0}({l s='%s refund' sprintf=$product['amount_refund']}){/if}
+		<input type="hidden" value="{$product['quantity_refundable']}" class="partialRefundProductQuantity" />
+		<input type="hidden" value="{$product['amount_refundable']}" class="partialRefundProductAmount" />
 	</td>
 	{if ($can_edit && !$order->hasBeenDelivered())}
 	<td class="product_invoice" colspan="2" style="display: none;text-align:center;">

admin-dev/themes/default/template/controllers/orders/_shipping.tpl

@@ -58,9 +58,9 @@
 		<td>
 			<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')}&vieworder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}">
+				<form style="display: inline;" method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id|escape:'htmlall':'UTF-8'}">
 					<span class="shipping_number_edit" style="display:none;">
-						<input type="text" name="id_order_carrier" value="{$line.id_order_carrier|htmlentities}" />
+						<input type="hidden" name="id_order_carrier" value="{$line.id_order_carrier|htmlentities}" />
 						<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
 						<input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" />
 					</span>

admin-dev/themes/default/template/controllers/orders/form.tpl

@@ -29,12 +29,18 @@
 	var changed_shipping_price = false;
 	var shipping_price_selected_carrier = '';
 	var current_index = '{$current}&token={$token}';
+	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'}';
 	var txt_hide_carts = '{l s='Hide carts and orders for this customer'}';
+	var defaults_order_state = new Array();
+	var customization_errors = false;
+	{foreach from=$defaults_order_state key='module' item='id_order_state'}
+		defaults_order_state['{$module}'] = '{$id_order_state}';
+	{/foreach}
 	$(document).ready(function() {
 		$('#customer').typeWatch({
 			captureLength: 1,
@@ -48,6 +54,12 @@
 			wait: 100,
 			callback: function(){ searchProducts(); }
 		});
+		$('#payment_module_name').change(function() {
+			var id_order_state = defaults_order_state[this.value];
+			if (typeof(id_order_state) == 'undefined')
+				id_order_state = defaults_order_state['other'];
+			$('#id_order_state').val(id_order_state);
+		});
 		$("#id_address_delivery").change(function() {
 			updateAddresses();
 		});
@@ -60,7 +72,7 @@
 		$('#id_lang').change(function() {
 			updateLang();
 		});
-		$('#delivery_option,#carrier_recycled_package,#order_gift,#gift_message').change(function() {
+		$('#delivery_option,#carrier_recycled_package,#order_gift,#gift_message,#id_address_delivery').change(function() {
 			updateDeliveryOption();
 		});
 		$('#shipping_price').change(function() {
@@ -85,6 +97,7 @@
 			return false;
 		});
 		$('#show_old_carts').click();
+		$('#payment_module_name').change();
 		$.ajaxSetup({ type:"post" });
 		$("#voucher").autocomplete('{$link->getAdminLink('AdminCartRules')}', {
 					minChars: 3,
@@ -137,7 +150,31 @@
 			useCart($(this).attr('rel'));
 			return false;
 		});
-
+		$('#free_shipping').click(function() {
+			var free_shipping = 0;
+			if (this.checked)
+				free_shipping = 1;
+			$.ajax({
+				type:"POST",
+				url: "{$link->getAdminLink('AdminCarts')}",
+				async: true,
+				dataType: "json",
+				data : {
+					ajax: "1",
+					token: "{getAdminToken tab='AdminCarts'}",
+					tab: "AdminCarts",
+					action: "updateFreeShipping",
+					id_cart: id_cart,
+					id_customer: id_customer,
+					'free_shipping': free_shipping
+					},
+				success : function(res)
+				{
+					displaySummary(res);
+				}
+			});
+		});
+		
 		$('.duplicate_order').live('click', function(e) {
 			e.preventDefault();
 			duplicateOrder($(this).attr('rel'));
@@ -406,7 +443,7 @@
 				{
 					var html = '<ul>';
 					$.each(res.customers, function() {
-						html += '<li class="customerCard"><div class="customerName"><a class="fancybox" href="{$link->getAdminLink('AdminCustomers')}&id_customer='+this.id_customer+'&viewcustomer&liteDisplaying=1">'+this.firstname+' '+this.lastname+'</a><span class="customerBirthday"> '+((this.birthday) ? this.birthday : '')+'</span></div>';
+						html += '<li class="customerCard"><div class="customerName"><a class="fancybox" href="{$link->getAdminLink('AdminCustomers')}&id_customer='+this.id_customer+'&viewcustomer&liteDisplaying=1">'+this.firstname+' '+this.lastname+'</a><span class="customerBirthday"> '+((this.birthday != '0000-00-00') ? this.birthday : '')+'</span></div>';
 						html += '<div class="customerEmail"><a href="mailto:'+this.email+'">'+this.email+'</div>';
 						html += '<a onclick="setupCustomer('+ this.id_customer+');return false;" href="#" class="id_customer button">{l s='Choose'}</a></li>';
 					});
@@ -454,7 +491,7 @@
 						html_carts += '<a href="#" title="{l s='Use this cart'}" class="use_cart" rel="'+this.id_cart+'"><img src="../img/admin/duplicate.png" /></a></td></tr>';
 					});
 					$.each(res.orders, function() {
-						html_orders += '<tr><td>'+this.id_order+'</td><td>'+this.date_add+'</td><td>'+this.nb_products+'</td><td>'+this.total_paid_real+'</span></td><td>'+this.payment+'</td><td>'+this.order_state+'</td>';
+						html_orders += '<tr><td>'+this.id_order+'</td><td>'+this.date_add+'</td><td>'+(this.nb_products ? this.nb_products : '0')+'</td><td>'+this.total_paid_real+'</span></td><td>'+this.payment+'</td><td>'+this.order_state+'</td>';
 						html_orders += '<td><a title="{l s='View this order'}" class="fancybox" href="{$link->getAdminLink('AdminOrders')}&id_order='+this.id_order+'&vieworder&liteDisplaying=1#"><img src="../img/admin/details.gif" /></a>';
 						html_orders += '<a href="#" "title="{l s='Duplicate this order'}" class="duplicate_order" rel="'+this.id_order+'"><img src="../img/admin/duplicate.png" /></a></td></tr>';
 					});
@@ -513,33 +550,55 @@
 			{
 				var products_found = '';
 				var attributes_html = '';
+				var customization_html = '';
 				stock = {};
 				
 				if(res.found)
 				{
 					$('#products_err').hide();
 					$('#products_found').show();
-					products_found += '<label>{l s='Product:'}</label><select id="id_product" onclick="displayProductAttributes();">';
+					products_found += '<label>{l s='Product:'}</label><select id="id_product" onclick="display_product_attributes();display_product_customizations();">';
 					attributes_html += '<label>{l s='Combination:'}</label>';
 					$.each(res.products, function() {
 						products_found += '<option '+(this.combinations.length > 0 ? 'rel="'+this.qty_in_stock+'"' : '')+' value="'+this.id_product+'">'+this.name+(this.combinations.length == 0 ? ' - '+this.formatted_price : '')+'</option>';
 						attributes_html += '<select class="id_product_attribute" id="ipa_'+this.id_product+'" style="display:none;">';
 						var id_product = this.id_product;
+						if (this.customizable == '1')
+						{
+							customization_html += '<fieldset class="width3"><legend>{l s='Customization'}</legend><form id="customization_'+id_product+'" class="id_customization" method="post" enctype="multipart/form-data" action="'+admin_cart_link+'" style="display:none;">';
+							customization_html += '<input type="hidden" name="id_product" value="'+id_product+'"';
+							customization_html += '<input type="hidden" name="id_cart" value="'+id_cart+'"';
+							customization_html += '<input type="hidden" name="action" value="updateCustomizationFields"';
+							customization_html += '<input type="hidden" name="id_customer" value="'+id_customer+'"';
+							customization_html += '<input type="hidden" name="ajax" value="1"';
+							$.each(this.customization_fields, function() {
+								customization_html += '<p><label for="customization_'+id_product+'_'+this.id_customization_field+'">';
+								if (this.required == 1)
+									customization_html += '<sup>*</sup>';
+								customization_html += this.name+'{l s=':'}</label>';
+								if (this.type == 0)
+									customization_html += '<input class="customization_field" type="file" name="customization_'+id_product+'_'+this.id_customization_field+'" id="customization_'+id_product+'_'+this.id_customization_field+'">';
+								else if (this.type == 1)
+									customization_html += '<input class="customization_field" type="text" name="customization_'+id_product+'_'+this.id_customization_field+'" id="customization_'+id_product+'_'+this.id_customization_field+'">';
+								customization_html += '</p>';
+							});
+							customization_html += '</fieldset></form>';
+						}
 						
 						$.each(this.combinations, function() {
 							attributes_html += '<option rel="'+this.qty_in_stock+'" '+(this.default_on == 1 ? 'selected="selected"' : '')+' value="'+this.id_product_attribute+'">'+this.attributes+' - '+this.formatted_price+'</option>';
 						});
 						
 						stock[this.id_product] = this.stock;
-						
+
 						attributes_html += '</select>';
 					});
-					
 					products_found += '</select>';
-					
 					$('#products_found #product_list').html(products_found);
 					$('#products_found #attributes_list').html(attributes_html);
-					displayProductAttributes();
+					$('#products_found #customization_list').contents().find('body').html(customization_html);
+					display_product_attributes();
+					display_product_customizations();
 					$('#id_product').change();
 				}
 				else
@@ -552,8 +611,21 @@
 			}
 		});
 	}
-
-	function displayProductAttributes()
+	
+	function display_product_customizations()
+	{
+		if ($('#products_found #customization_list').contents().find('#customization_'+$('#id_product option:selected').val()).children().length === 0)
+			$('#customization_list').hide();
+		else
+		{
+			$('#customization_list').show();
+			$('#products_found #customization_list').contents().find('.id_customization').hide();
+			$('#products_found #customization_list').contents().find('#customization_'+$('#id_product option:selected').val()).show();
+			$('#products_found #customization_list').css('height',$('#products_found #customization_list').contents().find('#customization_'+$('#id_product option:selected').val()).height()+95+'px');
+		}
+	}
+	
+	function display_product_attributes()
 	{
 		if ($('#ipa_'+$('#id_product option:selected').val()+' option').length === 0)
 			$('#attributes_list').hide();
@@ -614,16 +686,21 @@
 		updateDeliveryOptionList(jsonSummary.delivery_option_list);
 
 		if (jsonSummary.cart.gift == 1)
-			$('#order_gift').attr('checked', 'checked');
+			$('#order_gift').attr('checked', true);
 		else
 			$('#carrier_gift').removeAttr('checked');
 		if (jsonSummary.cart.recyclable == 1)
-			$('#carrier_recycled_package').attr('checked', 'checked');
+			$('#carrier_recycled_package').attr('checked', true);
 		else
 			$('#carrier_recycled_package').removeAttr('checked');
+		if (jsonSummary.free_shipping == 1)
+			$('#free_shipping').attr('checked', true);
+		else
+			$('#free_shipping').removeAttr('checked');
+		
 		$('#gift_message').html(jsonSummary.cart.gift_message);
 		if(!changed_shipping_price)
-			$('#shipping_price').val(jsonSummary.summary.total_shipping);
+			$('#shipping_price').html('<b>'+jsonSummary.summary.total_shipping+'</b>');
 		shipping_price_selected_carrier = jsonSummary.summary.total_shipping;
 
 		$('#total_vouchers').html(jsonSummary.summary.total_discounts_tax_exc);
@@ -634,11 +711,11 @@
 		$('#total_products').html(jsonSummary.summary.total_products);
 		id_currency = jsonSummary.cart.id_currency;
 		$('#id_currency option').removeAttr('selected');
-		$('#id_currency option[value="'+id_currency+'"]').attr('selected', 'selected');
+		$('#id_currency option[value="'+id_currency+'"]').attr('selected', true);
 		updateCurrencySign();
 		id_lang = jsonSummary.cart.id_lang;
 		$('#id_lang option').removeAttr('selected');
-		$('#id_lang option[value="'+id_lang+'"]').attr('selected', 'selected');
+		$('#id_lang option[value="'+id_lang+'"]').attr('selected', true);
 		$('#send_email_to_customer').attr('rel', jsonSummary.link_order);
 		$('#go_order_process').attr('href', jsonSummary.link_order);
 		$('#order_message').val(jsonSummary.order_message);
@@ -661,7 +738,7 @@
 				id_product_attribute: id_product_attribute,
 				qty: qty,
 				id_customer: id_customer,
-				id_cart: id_cart
+				id_cart: id_cart,
 				},
 			success : function(res)
 			{
@@ -690,7 +767,14 @@
 	function addProduct()
 	{
 		var id_product = $('#id_product option:selected').val();
-		updateQty(id_product, $('#ipa_'+id_product+' option:selected').val(), $('#qty').val());
+		$('#products_found #customization_list').contents().find('#customization_'+id_product).submit();
+		if (customization_errors)
+			$('#products_err').show();
+		else
+		{
+			$('#products_err').hide();
+			updateQty(id_product, $('#ipa_'+id_product+' option:selected').val(), $('#qty').val());
+		}
 	}
 
 	function updateCurrency()
@@ -728,7 +812,7 @@
 				token: "{getAdminToken tab='AdminCarts'}",
 				tab: "admincarts",
 				action: "updateLang",
-				id_currency: $('#id_lang option:selected').val(),
+				id_lang: $('#id_lang option:selected').val(),
 				id_customer: id_customer,
 				id_cart: id_cart
 				},
@@ -811,6 +895,17 @@
 			addresses_delivery_options += '<option value="'+this.id_address+'" '+(this.id_address == id_address_delivery ? 'selected="selected"' : '')+'>'+this.alias+'</option>';
 			addresses_invoice_options += '<option value="'+this.id_address+'" '+(this.id_address == id_address_invoice ? 'selected="selected"' : '')+'>'+this.alias+'</option>';
 		});
+		if (addresses.length == 0)
+		{
+			$('#addresses_err').show().html('{l s='You must add at least one address to process the order.'}');
+			$('#address_delivery, #address_invoice').hide();
+		}
+		else
+		{
+			$('#addresses_err').hide();
+			$('#address_delivery, #address_invoice').show();
+		}
+			
 		$('#id_address_delivery').html(addresses_delivery_options);
 		$('#id_address_invoice').html(addresses_invoice_options);
 		$('#address_delivery_detail').html(address_delivery_detail);
@@ -840,40 +935,51 @@
 			}
 		});
 	}
-
 </script>
-{if $show_toolbar}
-	<div class="toolbar-placeholder">
-		<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
-				{include file="toolbar.tpl"}
-				<div class="pageTitle">
-				<h3>
-					{block name=pageTitle}
-						<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-					{/block}
-				</h3>
-				</div>
-		</div>
+
+{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+<div class="leadin">{block name="leadin"}{/block}</div>
+
+<fieldset id="customer_part">
+	<legend><img src="../img/admin/tab-customers.gif" />{l s='Customer'}</legend>
+	<label>{l s='Search customers:'}</label>
+	<div class="margin-form">
+		<input type="text" id="customer" value="" />
+		<p>{l s='Search a customer by tapping the first letters of his name'}</p>
+		<a class="fancybox button" href="{$link->getAdminLink('AdminCustomers')}&addcustomer&liteDisplaying=1&submitFormAjax=1#">
+			<img src="../img/admin/add.gif" title="new"/><span>{l s='Add new customer'}</span>
+		</a>
 	</div>
-	<div class="leadin">{block name="leadin"}{/block}</div>
-{/if}
-<fieldset id="customer_part"><legend><img src="../img/admin/tab-customers.gif" />{l s='Customer'}</legend>
-	<p><label>{l s='Search customers:'}</label><input type="text" id="customer" value="" />
-	<a class="fancybox button" href="{$link->getAdminLink('AdminCustomers')}&addcustomer&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/><span>{l s='Add new customer'}</span></a></p>
 	<div id="customers">
 	</div>
 </fieldset><br />
 <form action="{$link->getAdminLink('AdminOrders')}&submitAdd{$table}=1" method="post" autocomplete="off">
 <fieldset id="products_part" style="display:none;"><legend><img src="../img/t/AdminCatalog.gif" />{l s='Cart'}</legend>
 	<div>
-		<p><label>{l s='Search a product:'} </label>
-		<input type="hidden" value="" id="id_cart" name="id_cart" />
-		<input type="text" id="product" value="" /></p>
+		<label>{l s='Search a product:'} </label>
+		<div class="margin-form">
+			<input type="hidden" value="" id="id_cart" name="id_cart" />
+			<input type="text" id="product" value="" />
+			<p>{l s='Search a product by tapping the first letters of his name'}</p>
+		</div>
 		<div id="products_found">
 			<div id="product_list">
 			</div>
 			<div id="attributes_list">
 			</div>
+			<iframe id="customization_list" style="border:0px;overflow:hidden;width:100%">
+				<html>
+				<head>
+					{if isset($css_files_orders)}
+						{foreach from=$css_files_orders key=css_uri item=media}
+							<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
+						{/foreach}
+					{/if}
+				</head>
+				<body>
+				</body>
+				</html>
+			</iframe>
 			<p><label for="qty">{l s='Quantity:'}</label><input type="text" name="qty" id="qty" value="1" />&nbsp;<b>{l s='In stock:'}</b>&nbsp;<span id="qty_in_stock"></span></p>
 			<div class="margin-form">
 				<p><input type="submit" onclick="addProduct();return false;" class="button" id="submitAddProduct" value="{l s='Add to cart'}"/></p>
@@ -904,6 +1010,7 @@
 			<tbody>
 			</tbody>
 		</table>
+		<p><b>{l s='The prices are without taxes.'}</b></p>
 	</div>
 	<div>
 		<p><label for="id_currency">{l s='Currency:'}</label>
@@ -1009,6 +1116,7 @@
 <br />
 <fieldset id="address_part" style="display:none;">
 	<legend><img src="../img/t/AdminAddresses.gif" />{l s='Addresses'}</legend>
+	<div id="addresses_err" class="warn" style="display:none;"></div>
 	<div id="address_delivery">
 		<h3>{l s='Delivery:'}</h3>
 		<select id="id_address_delivery" name="id_address_delivery">
@@ -1037,8 +1145,11 @@
 					</select>
 				</p>
 				<p>
-					<label for="shipping_price">{l s='Shipping price:'}</label> <input type="text" id="shipping_price"  name="shipping_price" size="7" />&nbsp;<span class="currency_sign"></span>&nbsp;
-					<a class="button" href="#" onclick="resetShippingPrice();return false;">{l s='Reset shipping price'}</a>
+					<label for="shipping_price">{l s='Shipping price:'}</label> <span id="shipping_price"  name="shipping_price"></span>&nbsp;<span class="currency_sign"></span>&nbsp;
+				</p>
+				<p>
+					<label for="free_shipping">{l s='Free shipping:'}</label>
+					<input type="checkbox" id="free_shipping" name="free_shipping" value="1" />
 				</p>
 			</div>
 			<div id="float:left;">

admin-dev/themes/default/template/controllers/orders/form_customization_feedback.tpl

@@ -1,44 +1,52 @@
-{*
-* 2007-2012 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-2012 PrestaShop SA
-*  @version  Release: $Revision: 6594 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-
-<hr width="99%" align="center" size="2" />
-<!-- Block Mobile Newsletter module-->
-<div id="newsletter">
-	<h4>{l s="Newsletter" mod="blocknewletter"}</h4>
-	{if isset($msg) && $msg}
-		<p class="{if $nw_error}warning_inline{else}success_inline{/if}">{$msg}</p>
-	{/if}
-	<form action="{$link->getPageLink('index')}" method="post">
-		<fieldset>
-			<input type="email" name="email"
-				placeholder="{l s='your e-mail' mod='blocknewsletter'}"
-				value="{if isset($value) && $value}{$value}{/if}"
-				class="inputNew" />
-			<input type="submit" value="OK" data-role="button" data-theme="a" name="submitNewsletter" />
-			<input type="hidden" name="action" value="0" />
-		</fieldset>
-	</form>
-</div><!-- /newsletter -->
+{*
+* 2007-2012 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-2012 PrestaShop SA
+*  @version  Release: $Revision: 8971 $
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<html>
+<head>
+{if isset($css_files)}
+	{foreach from=$css_files key=css_uri item=media}
+		<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
+	{/foreach}
+{/if}
+</head>
+<body>
+	<script type="text/javascript">
+	{if $customization_errors|count}
+		customization_errors = true;
+		var id_selected_product = parent.$('#id_product option:selected').val();
+		if (parent.searchProducts())
+		{
+			parent.$('#products_err', window.parent.document).html('{$customization_errors}');
+			parent.$('#id_product option[value="'+id_selected_product+'"]').attr('selected', true);
+			parent.$('#id_product').change();
+		}
+		
+	{else}
+		parent.$('#products_err', window.parent.document).hide();
+		customization_errors = false;
+	{/if}
+	</script>
+	</body>
+</html>

admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl

@@ -38,7 +38,7 @@
 	var currency_format = "{$currency->format}";
 	var currency_blank = "{$currency->blank}";
 	var priceDisplayPrecision = 2;
-	var use_taxes = {$order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}
+	var use_taxes = {if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}true{else}false{/if};
 	var token = "{$smarty.get.token|escape:'htmlall':'UTF-8'}";
 
 	var txt_add_product_stock_issue = "{l s='You want to add more product than are available in stock, are you sure you want to add this quantity?' js=1}";
@@ -64,15 +64,19 @@
 <div class="bloc-command">
 	<div class="button-command">
 			{if (count($invoices_collection))}
-			<a class="button" href="pdf.php?id_order={$order->id}&pdf" target="_blank"><img src="../img/admin/charged_ok.gif" alt="{l s='View invoice'}" /> {l s='View invoice'}</a>
+				<a class="button" href="{$link->getAdminLink('AdminPdf')}&submitAction=generateInvoicePDF&id_order={$order->id}" target="_blank">
+					<img src="../img/admin/charged_ok.gif" alt="{l s='View invoice'}" /> {l s='View invoice'}
+				</a>
 			{else}
-			<img src="../img/admin/charged_ko.gif" alt="{l s='No invoice'}" /> {l s='No invoice'}
+				<img src="../img/admin/charged_ko.gif" alt="{l s='No invoice'}" /> {l s='No invoice'}
 			{/if}
 			 |
 			{if (($currentState && $currentState->delivery) || $order->delivery_number)}
-			<a class="button"  href="pdf.php?id_order={$order->id}&delivery" target="_blank"><img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'}</a>
+				<a class="button"  href="{$link->getAdminLink('AdminPdf')}&submitAction=generateDeliverySlipPDF&id_order={$order->id}" target="_blank">
+					<img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'}
+				</a>
 			{else}
-			<img src="../img/admin/delivery_ko.gif" alt="{l s='No delivery slip'}" /> {l s='No delivery slip'}
+				<img src="../img/admin/delivery_ko.gif" alt="{l s='No delivery slip'}" /> {l s='No delivery slip'}
 			{/if}
 			 |
 			<a class="button" href="javascript:window.print()"><img src="../img/admin/printer.gif" alt="{l s='Print order'}" title="{l s='Print order'}" /> {l s='Print order'}</a>
@@ -149,7 +153,7 @@
 				<span style="font-weight: bold; font-size: 14px;"><a href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={getAdminToken tab='AdminCustomers'}"> {$customer->firstname} {$customer->lastname}</a></span> ({l s='#'}{$customer->id})<br />
 				(<a href="mailto:{$customer->email}">{$customer->email}</a>)<br /><br />
 				{if ($customer->isGuest())}
-					{l s='This order has been placed by a'} <b>{l s='guest'}</b>
+					{l s='This order has been placed by a guest.'}
 					{if (!Customer::customerExists($customer->email))}
 					<form method="POST" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
 						<input type="hidden" name="id_lang" value="{$order->id_lang}" />
@@ -198,6 +202,50 @@
 				{if $nextOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$nextOrder}">{l s='Next >'}</a>{/if}
 			</div>
 			<div class="clear"></div>
+			
+			<!-- linked orders block -->
+			{if count($order->getBrother()) > 0}
+				<fieldset>
+					<legend><img src="../img/admin/tab-orders.gif" /> {l s='Linked orders'}</legend>
+					<table class="table" width="100%;" cellspacing="0" cellpadding="0">
+						<thead>
+							<tr>
+								<th width="10%">
+									{l s='Order n°'}
+								</th>
+								<th>
+									{l s='Status'}
+								</th>
+								<th width="10%">
+									{l s='Amount'}
+								</th>
+								<th width="5%">
+								</th>
+							</tr>
+						</thead>
+						<tbody>
+							{foreach $order->getBrother() as $brother_order}
+								<tr>
+									<td>
+										<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">#{'%06d'|sprintf:$brother_order->id}</a>
+									</td>
+									<td>
+										{$brother_order->getCurrentOrderState()->name[$current_id_lang]}
+									</td>
+									<td>
+										{displayPrice price=$brother_order->total_paid_tax_incl currency=$currency->id}
+									</td>
+									<td>
+										<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}"><img alt="{l s='See the order'}" src="../img/admin/details.gif"></a>
+									</td>
+								</tr>
+							{/foreach}
+						</tbody>
+					</table>
+				</fieldset>
+				<br />
+			{/if}
+			
 			<!-- Documents block -->
 			<fieldset>
 				<legend><img src="../img/admin/details.gif" /> {l s='Documents'}</legend>
@@ -226,13 +274,26 @@
 				</form>
 				<hr />
 				{/if}
-
+				
+				{if count($order->getOrderPayments()) > 0}
 				<p class="error" style="{if round($orders_total_paid_tax_incl, 2) == round($total_paid, 2) || $currentState->id == 6}display: none;{/if}">
 					{l s='Warning:'} {displayPrice price=$total_paid currency=$currency->id}
-					{l s='paid instead of'} <span class="total_paid">{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}</span>
+					{l s='paid instead of'} <span class="total_paid">{displayPrice price=$orders_total_paid_tax_incl currency=$currency->id}</span>
+					
+					{foreach $order->getBrother() as $brother_order}
+						{if $brother_order@first}
+							{if count($order->getBrother()) == 1}
+								<br />{l s='This warning also concerns the order '}
+							{else}
+								<br />{l s='This warning also concerns the next orders:'}
+							{/if}
+						{/if}
+						<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">#{'%06d'|sprintf:$brother_order->id}</a>
+					{/foreach}
 				</p>
+				{/if}
 
-				<form id="formAddPayment" method="post" action="{$currentIndex}&viewOrder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+				<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
 					<table class="table" width="100%" cellspacing="0" cellpadding="0">
 						<colgroup>
 							<col width="15%"></col>
@@ -260,8 +321,8 @@
 								<td>{$payment->transaction_id}</td>
 								<td>{displayPrice price=$payment->amount currency=$payment->id_currency}</td>
 								<td>
-								{if $payment->id_order_invoice}
-									{OrderInvoice::retrieveOneById($payment->id_order_invoice)->getInvoiceNumberFormatted($current_id_lang)}
+								{if $invoice = $payment->getOrderInvoice($order->id)}
+									{$invoice->getInvoiceNumberFormatted($current_id_lang)}
 								{else}
 									{l s='No invoice'}
 								{/if}
@@ -316,37 +377,37 @@
 								</td>
 							</tr>
 							{/foreach}
-							{if count($not_paid_invoices_collection) > 0}
-								<tr class="current-edit">
-									<td><input type="text" name="payment_date" class="datepicker" size="17" value="{date('Y-m-d H:i:s')}" /></td>
-									<td>
-										<select name="payment_method">
-										{foreach from=$payment_methods item=payment_method}
-											<option value="{$payment_method}">{$payment_method}</option>
-										{/foreach}
-										</select>
-									</td>
-									<td>
-										<input type="text" name="payment_transaction_id" value="" />
-									</td>
-									<td>
-										<input type="text" name="payment_amount" size="5" value="" />
-										<select name="payment_currency">
-										{foreach from=$currencies item=current_currency}
-											<option value="{$current_currency['id_currency']}"{if $current_currency['id_currency'] == $currency->id} selected="selected"{/if}>{$current_currency['sign']}</option>
-										{/foreach}
-										</select>
-									</td>
-									<td>
-										<select name="payment_invoice" id="payment_invoice">
-										{foreach from=$not_paid_invoices_collection item=invoice}
-											<option value="{$invoice->id}" selected="selected">{$invoice->getInvoiceNumberFormatted($current_id_lang)}</option>
-										{/foreach}
-										</select>
-									</td>
-									<td><input class="button" type="submit" name="submitAddPayment" value="Add" /></td>
-								</tr>
-							{/if}
+							<tr class="current-edit">
+								<td><input type="text" name="payment_date" class="datepicker" size="17" value="{date('Y-m-d H:i:s')}" /></td>
+								<td>
+									<select name="payment_method">
+									{foreach from=$payment_methods item=payment_method}
+										<option value="{$payment_method}">{$payment_method}</option>
+									{/foreach}
+									</select>
+								</td>
+								<td>
+									<input type="text" name="payment_transaction_id" value="" />
+								</td>
+								<td {if count($not_paid_invoices_collection) <= 0}colspan="2"{/if}>
+									<input type="text" name="payment_amount" size="5" value="" />
+									<select name="payment_currency">
+									{foreach from=$currencies item=current_currency}
+										<option value="{$current_currency['id_currency']}"{if $current_currency['id_currency'] == $currency->id} selected="selected"{/if}>{$current_currency['sign']}</option>
+									{/foreach}
+									</select>
+								</td>
+								{if count($not_paid_invoices_collection) > 0}
+								<td>
+									<select name="payment_invoice" id="payment_invoice">
+									{foreach from=$not_paid_invoices_collection item=invoice}
+										<option value="{$invoice->id}" selected="selected">{$invoice->getInvoiceNumberFormatted($current_id_lang)}</option>
+									{/foreach}
+									</select>
+								</td>
+								{/if}
+								<td><input class="button" type="submit" name="submitAddPayment" value="Add" /></td>
+							</tr>
 						</tbody>
 					</table>
 				</form>
@@ -354,85 +415,87 @@
 			<br />
 
 			<!-- Shipping block -->
-			<fieldset>
-				<legend><img src="../img/admin/delivery.gif" /> {l s='Shipping'}</legend>
+			{if !$order->isVirtual()}
+				<fieldset>
+					<legend><img src="../img/admin/delivery.gif" /> {l s='Shipping'}</legend>
 
-				<div class="clear" style="float: left; margin-right: 10px;">
-					<span>{l s='Recycled packaging:'}</span>
-					{if $order->recyclable}
-					<img src="../img/admin/enabled.gif" />
-					{else}
-					<img src="../img/admin/disabled.gif" />
-					{/if}
-				</div>
-				<div style="float: left;">
-					<span>{l s='Gift-wrapping:'}</span>
-					{if $order->gift}
-					<img src="../img/admin/enabled.gif" />
-					</div>
-					<div style="clear: left; margin: 0px 42px 0px 42px; padding-top: 2px;">
-						{if $order->gift_message}
-						<div style="border: 1px dashed #999; padding: 5px; margin-top: 8px;"><b>{l s='Message:'}</b><br />{$order->gift_message|nl2br}</div>
+					<div class="clear" style="float: left; margin-right: 10px;">
+						<span>{l s='Recycled packaging:'}</span>
+						{if $order->recyclable}
+						<img src="../img/admin/enabled.gif" />
+						{else}
+						<img src="../img/admin/disabled.gif" />
 						{/if}
-					{else}
-					<img src="../img/admin/disabled.gif" />
+					</div>
+					<div style="float: left;">
+						<span>{l s='Gift-wrapping:'}</span>
+						{if $order->gift}
+						<img src="../img/admin/enabled.gif" />
+						</div>
+						<div style="clear: left; margin: 0px 42px 0px 42px; padding-top: 2px;">
+							{if $order->gift_message}
+							<div style="border: 1px dashed #999; padding: 5px; margin-top: 8px;"><b>{l s='Message:'}</b><br />{$order->gift_message|nl2br}</div>
+							{/if}
+						{else}
+						<img src="../img/admin/disabled.gif" />
+						{/if}
+					</div>
+					<div class="clear" style="margin-bottom: 10px;"></div>
+
+					{include file='controllers/orders/_shipping.tpl'}
+
+					{if $carrierModuleCall}
+						{$carrierModuleCall}
 					{/if}
-				</div>
-				<div class="clear" style="margin-bottom: 10px;"></div>
+				</fieldset>
+				<br />
 
-				{include file='controllers/orders/_shipping.tpl'}
+				<!-- Return block -->
+				<fieldset>
+					<legend><img src="../img/admin/delivery.gif" /> {l s='Merchandise returns'}</legend>
 
-				{if $carrierModuleCall}
-					{$carrierModuleCall}
-				{/if}
-			</fieldset>
-			<br />
+					{if $order->getReturn()|count > 0}
+					<table class="table" width="100%" cellspacing="0" cellpadding="0">
+						<thead>
+							<tr>
+								<th style="width:30%">Date</th>
+								<th>Type</th>
+								<th style="width:20%">Carrier</th>
+								<th style="width:30%">Tracking number</th>
+							</tr>
+						</thead>
+						<tbody>
+							{foreach from=$order->getReturn() item=line}
+							<tr>
+								<td>{$line.date_add}</td>
+								<td>{$line.type}</td>
+								<td>{$line.state_name}</td>
+								<td>
+									<span id="shipping_number_show">{if isset($line.url) && isset($line.tracking_number)}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else if isset($line.tracking_number)}{$line.tracking_number}{/if}</span>
+									{if $line.can_edit}
+									<form style="display: inline;" method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
+										<span class="shipping_number_edit" style="display:none;">
+											<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
+											<input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" />
+										</span>
+										<a href="#" class="edit_shipping_number_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a>
+										<a href="#" class="cancel_shipping_number_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a>
+									</form>
+									{/if}
+								</td>
+							</tr>
+							{/foreach}
+						</tbody>
+					</table>
+					{else}
+					{l s='No merchandise returns yet.'}
+					{/if}
 
-			<!-- Return block -->
-			<fieldset>
-				<legend><img src="../img/admin/delivery.gif" /> {l s='Merchandise returns'}</legend>
-
-				{if $order->getReturn()|count > 0}
-				<table class="table" width="100%" cellspacing="0" cellpadding="0">
-					<thead>
-						<tr>
-							<th style="width:30%">Date</th>
-							<th>Type</th>
-							<th style="width:20%">Carrier</th>
-							<th style="width:30%">Tracking number</th>
-						</tr>
-					</thead>
-					<tbody>
-						{foreach from=$order->getReturn() item=line}
-						<tr>
-							<td>{$line.date_add}</td>
-							<td>{$line.type}</td>
-							<td>{$line.state_name}</td>
-							<td>
-								<span id="shipping_number_show">{if isset($line.url) && isset($line.tracking_number)}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else if isset($line.tracking_number)}{$line.tracking_number}{/if}</span>
-								{if $line.can_edit}
-								<form style="display: inline;" method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
-									<span class="shipping_number_edit" style="display:none;">
-										<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
-										<input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" />
-									</span>
-									<a href="#" class="edit_shipping_number_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a>
-									<a href="#" class="cancel_shipping_number_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a>
-								</form>
-								{/if}
-							</td>
-						</tr>
-						{/foreach}
-					</tbody>
-				</table>
-				{else}
-				{l s='No merchandise returns yet.'}
-				{/if}
-
-				{if $carrierModuleCall}
-					{$carrierModuleCall}
-				{/if}
-			</fieldset>
+					{if $carrierModuleCall}
+						{$carrierModuleCall}
+					{/if}
+				</fieldset>
+			{/if}
 		</div>
 		<!-- END Right column -->
 		<div class="clear" style="margin-bottom: 10px;"></div>
@@ -440,36 +503,37 @@
 
 	<div class="container-command container-command-top-spacing">
 		<!-- Addresses -->
-		<div style="width: 49%; float:left;"></contact>
-			<!-- Shipping address -->
-			<fieldset>
-				<legend><img src="../img/admin/delivery.gif" alt="{l s='Shipping address'}" />{l s='Shipping address'}</legend>
+		{if !$order->isVirtual()}
+			<div style="width: 49%; float:left;"></contact>
+				<!-- Shipping address -->
+				<fieldset>
+					<legend><img src="../img/admin/delivery.gif" alt="{l s='Shipping address'}" />{l s='Shipping address'}</legend>
 
-				{if $can_edit}
-				<form method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}">
-					<div style="margin-bottom:5px;">
-						<p>
-							<select name="id_address">
-								{foreach from=$customer_addresses item=address}
-								<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_delivery} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
-								{/foreach}
-							</select>
-							<input class="button" type="submit" name="submitAddressShipping" value="{l s='Change'}" />
-						</p>
+					{if $can_edit}
+					<form method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}">
+						<div style="margin-bottom:5px;">
+							<p>
+								<select name="id_address">
+									{foreach from=$customer_addresses item=address}
+									<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_delivery} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
+									{/foreach}
+								</select>
+								<input class="button" type="submit" name="submitAddressShipping" value="{l s='Change'}" />
+							</p>
+						</div>
+					</form>
+					{/if}
+
+					<div style="float: right">
+						<a href="?tab=AdminAddresses&id_address={$addresses.delivery->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=1{/if}&token={getAdminToken tab='AdminAddresses'}&back={$smarty.server.REQUEST_URI|urlencode}"><img src="../img/admin/edit.gif" /></a>
+						<a href="http://maps.google.com/maps?f=q&hl={$iso_code_lang}&geocode=&q={$addresses.delivery->address1} {$addresses.delivery->postcode} {$addresses.delivery->city} {if ($addresses.delivery->id_state)} {$addresses.deliveryState->name}{/if}" target="_blank"><img src="../img/admin/google.gif" alt="" class="middle" /></a>
 					</div>
-				</form>
-				{/if}
-
-				<div style="float: right">
-					<a href="?tab=AdminAddresses&id_address={$addresses.delivery->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=1{/if}&token={getAdminToken tab='AdminAddresses'}&back={$smarty.server.REQUEST_URI}"><img src="../img/admin/edit.gif" /></a>
-					<a href="http://maps.google.com/maps?f=q&hl={$iso_code_lang}&geocode=&q={$addresses.delivery->address1} {$addresses.delivery->postcode} {$addresses.delivery->city} {if ($addresses.delivery->id_state)} {$addresses.deliveryState->name}{/if}" target="_blank"><img src="../img/admin/google.gif" alt="" class="middle" /></a>
-				</div>
-
-				{displayAddressDetail address=$addresses.delivery newLine='<br />'}
-				{if $addresses.delivery->other}<hr />{$addresses.delivery->other}<br />{/if}
-			</fieldset>
-		</div>
 
+					{displayAddressDetail address=$addresses.delivery newLine='<br />'}
+					{if $addresses.delivery->other}<hr />{$addresses.delivery->other}<br />{/if}
+				</fieldset>
+			</div>
+		{/if}
 		<div style="width: 49%; float:right;"></contact>
 			<!-- Invoice address -->
 			<fieldset>
@@ -491,7 +555,7 @@
 				{/if}
 
 				<div style="float: right">
-					<a href="?tab=AdminAddresses&id_address={$addresses.invoice->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=2{/if}&back={$smarty.server.REQUEST_URI}&token={getAdminToken tab='AdminAddresses'}"><img src="../img/admin/edit.gif" /></a>
+					<a href="?tab=AdminAddresses&id_address={$addresses.invoice->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=2{/if}&back={$smarty.server.REQUEST_URI|urlencode}&token={getAdminToken tab='AdminAddresses'}"><img src="../img/admin/edit.gif" /></a>
 				</div>
 
 				{displayAddressDetail address=$addresses.invoice newLine='<br />'}
@@ -501,7 +565,7 @@
 		<div class="clear" style="margin-bottom: 10px;"></div>
 	</div>
 
-	<form style="width: 98%" class="container-command-top-spacing" action="{$currentIndex}&vieworder&token={$smarty.get.token}" method="post" onsubmit="return orderDeleteProduct('{l s='Cannot return this product'}', '{l s='Quantity to cancel is greater than quantity available'}');">
+	<form style="width: 98%" class="container-command-top-spacing" action="{$current_index}&vieworder&token={$smarty.get.token}" method="post" onsubmit="return orderDeleteProduct('{l s='Cannot return this product'}', '{l s='Quantity to cancel is greater than quantity available'}');">
 		<input type="hidden" name="id_order" value="{$order->id}" />
 		<fieldset style="width: 100%; ">
 			<div style="display: none">
@@ -527,12 +591,12 @@
 						<th style="width: 4%; text-align: center">{l s='Qty'}</th>
 						{if ($order->hasBeenPaid())}<th style="width: 3%; text-align: center">{l s='Refunded'}</th>{/if}
 						{if ($order->hasBeenDelivered())}<th style="width: 3%; text-align: center">{l s='Returned'}</th>{/if}
-						<th style="width: 3%; text-align: center">{l s='Stock'}</th>
+						<th style="width: 10%; text-align: center">{l s='Available quantity'}</th>
 						<th style="width: 10%; text-align: center">{l s='Total'} <sup>*</sup></th>
 						<th colspan="2" style="display: none;" class="add_product_fields">&nbsp;</th>
 						<th colspan="2" style="display: none;" class="edit_product_fields">&nbsp;</th>
 						<th colspan="2" style="display: none;" class="standard_refund_fields"><img src="../img/admin/delete.gif" alt="{l s='Products'}" />
-							{if ($order->hasBeenDelivered())}
+							{if ($order->hasBeenDelivered() || $order->hasBeenShipped())}
 								{l s='Return'}
 							{elseif ($order->hasBeenPaid())}
 								{l s='Refund'}
@@ -574,8 +638,7 @@
 						<br /><br />{l s='Merchandise returns are disabled'}
 					{/if}
 				</div>
-
-				<div style="float:right;">
+				<div style="float:right; margin-top: 20px;">
 					<table class="table" width="450px;" style="border-radius:0px;"cellspacing="0" cellpadding="0">
 						<tr id="total_products">
 							<td width="150px;"><b>{l s='Products'}</b></td>
@@ -627,7 +690,7 @@
 							</td>
 							{if $can_edit}
 							<td class="center">
-								<a href="{$currentIndex}&submitDeleteVoucher&id_order_cart_rule={$discount['id_order_cart_rule']}&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}"><img src="../img/admin/delete.gif" alt="{l s='Delete voucher'}" /></a>
+								<a href="{$current_index}&submitDeleteVoucher&id_order_cart_rule={$discount['id_order_cart_rule']}&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}"><img src="../img/admin/delete.gif" alt="{l s='Delete voucher'}" /></a>
 							</td>
 							{/if}
 						</tr>
@@ -655,8 +718,8 @@
 				<input type="checkbox" id="reinjectQuantities" name="reinjectQuantities" class="button" />&nbsp;<label for="reinjectQuantities" style="float:none; font-weight:normal;">{l s='Re-stock products'}</label><br />
 			{/if}
 			{if ((!$order->hasBeenDelivered() && $order->hasBeenPaid()) || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
-				<input type="checkbox" id="generateCreditSlip" name="generateCreditSlip" class="button" onclick="toogleShippingCost(this)" />&nbsp;<label for="generateCreditSlip" style="float:none; font-weight:normal;">{l s='Generate a credit slip'}</label><br />
-				<input type="checkbox" id="generateDiscount" name="generateDiscount" class="button" onclick="toogleShippingCost(this)" />&nbsp;<label for="generateDiscount" style="float:none; font-weight:normal;">{l s='Generate a voucher'}</label><br />
+				<input type="checkbox" id="generateCreditSlip" name="generateCreditSlip" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateCreditSlip" style="float:none; font-weight:normal;">{l s='Generate a credit slip'}</label><br />
+				<input type="checkbox" id="generateDiscount" name="generateDiscount" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateDiscount" style="float:none; font-weight:normal;">{l s='Generate a voucher'}</label><br />
 				<span id="spanShippingBack" style="display:none;"><input type="checkbox" id="shippingBack" name="shippingBack" class="button" />&nbsp;<label for="shippingBack" style="float:none; font-weight:normal;">{l s='Repay shipping costs'}</label><br /></span>
 			{/if}
 			{if (!$order->hasBeenDelivered() || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
@@ -717,12 +780,11 @@
 			</div>
 			<br />
 		{/foreach}
-		<p class="info">{l s='When you read a message, please click on the green check to mark it as read.'}</p>
 		</fieldset>
 	{/if}
 	</div>
 
 
 	<div class="clear">&nbsp;</div>
-	<br /><br /><a href="{$currentIndex}&token={$smarty.get.token}"><img src="../img/admin/arrow2.gif" /> {l s='Back to list'}</a><br />
+	<br /><br /><a href="{$current_index}&token={$smarty.get.token}"><img src="../img/admin/arrow2.gif" /> {l s='Back to list'}</a><br />
 {/block}

admin-dev/themes/default/template/controllers/outstanding/_print_pdf_icon.tpl

@@ -26,5 +26,5 @@
 
 {* Generate HTML code for printing Invoice Icon with link *}
 <span style="width:20px; margin-right:5px;">
-	<a href="pdf.php?id_order_invoice={$id_invoice}&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
+	<a href="{$link->getAdminLink('AdminPdf')}&submitAction=generateInvoicePDF&id_order_invoice={$id_invoice}"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
 </span>

admin-dev/themes/default/template/controllers/payment/restrictions.tpl

@@ -52,8 +52,9 @@
 				{foreach $payment_modules as $key_module => $module}
 					{if $module->active}
 						<td style="text-align: center">
+							{assign var='type' value='null'}
 							{if !$item['check_list'][$key_module]}
-								{$type = null}
+								{* Keep $type to null *}
 							{elseif $list['name_id'] === 'currency'}
 								{if $module->currencies && $module->currencies_mode == 'checkbox'}
 									{$type = 'checkbox'}
@@ -63,7 +64,7 @@
 							{else}
 								{$type = 'checkbox'}
 							{/if}
-							{if $type != null}
+							{if $type != 'null'}
 								<input type="checkbox" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}"
 									{if $item['check_list'][$key_module] == 'checked'}checked="checked"{/if} 
 								/>

admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl

@@ -75,20 +75,21 @@
 			</div>
 			<div id="formMemcachedServer" style="margin-top: 10px; display:none;">
 				<form action="{$current}&token={$token}" method="post">
-					<label>{l s='IP Address:'} </label>
+					<label>{l s='IP Address'} </label>
 					<div class="margin-form">
 						<input type="text" name="memcachedIp" />
 					</div>
-					<label>{l s='Port:'} </label>
+					<label>{l s='Port'} </label>
 					<div class="margin-form">
 						<input type="text" name="memcachedPort" value="11211" />
 					</div>
-					<label>{l s='Weight:'} </label>
+					<label>{l s='Weight'} </label>
 					<div class="margin-form">
 						<input type="text" name="memcachedWeight" value="1" />
 					</div>
 					<div class="margin-form">
 						<input type="submit" value="{l s='   Add Server   '}" name="submitAddServer" class="button" />
+                        <input type="button" value="{l s='   Test Server   '}" id="testMemcachedServer" class="button" />
 					</div>
 				</form>
 			</div>
@@ -145,12 +146,47 @@
 		$('#caching_system').change(function() {
 			showMemcached();
 		});
-	
+
 		$('#addMemcachedServer').click(function() {
 			$('#formMemcachedServer').show();
 			return false;
 		});
 
+		$('#testMemcachedServer').click(function() {
+			var host = $('input:text[name=memcachedIp]').val();
+			var port = $('input:text[name=memcachedPort]').val();
+			if (host && port)
+			{
+				$.ajax({
+					url: 'index.php',
+					data:
+					{
+						controller: 'adminperformance',
+						token: '{$token}',
+						action: 'test_server',
+						sHost: host,
+						sPort: port,
+						ajax: true
+					},
+					context: document.body,
+					dataType: 'json',
+					context: this,
+					async: false,
+					success: function(data)
+					{
+						if (data && $.isArray(data))
+						{
+							var color = data[0] != 0 ? 'green' : 'red';
+							$('#formMemcachedServerStatus').show();
+							$('input:text[name=memcachedIp]').css('background', color);
+							$('input:text[name=memcachedPort]').css('background', color);
+						}
+					}
+				});
+			}
+			return false;
+		});
+
 		$('input[name="smarty_force_compile"], input[name="smarty_cache"], input[name="smarty_console"]').change(function(){
 			$('#smarty_up').val(1);
 		});

admin-dev/themes/default/template/controllers/products/accounting.tpl

@@ -1,58 +0,0 @@
-{*
-* 2007-2012 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-2012 PrestaShop SA
-*  @version  Release: $Revision: 9856 $
-*  @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">
-
-
-
-</script>
-
-{if isset($product->id)}
-
-	<h4>{l s='Accounting'}</h4>
-	<div class="separation"></div>
-	{if !empty($error)}
-		<div class="hint" style="display:block">{$error}</div>
-	{else}
-			<div class="hint" style="display:block">
-				{l s='Configure the account number of the product for each zone, if a field is empty, it will use the default one of the shop set in the Accounting Management tab'}
-			</div>
-			<h3>{l s='Account number'}</h3>
-			<br />
-				{foreach from=$productAccountNumberList['zones'] key=id_zone item=currentZone}
-					<label>{$currentZone['name']}</label>
-					<div class="margin-form">
-						<input type="text" name="zone_{$id_zone}" value="{$currentZone['account_number']|htmlentities}" />
-					</div>
-				{/foreach}
-			</form>
-			<div style="text-align:left; font-size:11px;">
-				<i>{l s='These fields are used for the accounting export'}</i>
-			</div>
-			<div class="separation"></div>
-	{/if}
-
-{/if}

admin-dev/themes/default/template/controllers/products/associations.tpl

@@ -24,8 +24,11 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+<input type="hidden" name="submitted_tabs[]" value="Associations" />
 <div class="Associations">
 	<h4>{l s='Associations'}</h4>
+
+	{include file="controllers/products/multishop/check_fields.tpl" product_tab="Associations"}
 	<div class="separation"></div>
 		<div id="no_default_category" class="hint">
 		{l s='Please select a default category.'}
@@ -33,10 +36,13 @@
 	<table>
 		<tr>
 			<td class="col-left">
+				{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}
 				<label for="category_block">{l s='Associated categories:'}</label>
 			</td>
 			<td class="col-right">
-				<div id="category_block">{$category_tree}</div>
+				<div id="category_block">
+					{$category_tree}
+				</div>
 			</td>
 		</tr>
 		<tr>
@@ -45,14 +51,15 @@
 		<tr>
 			<td></td>
 			<td class="col-right">
-				<a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')}&addcategory">
-					<img src="../img/admin/add.gif" alt="{l s='Create new category'}" title="{l s='Create new category'}" />
-					<span>{l s='Create new category'}</span>
-				</a>
+					<a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')}&addcategory">
+						<img src="../img/admin/add.gif" alt="{l s='Create new category'}" title="{l s='Create new category'}" />
+						<span>{l s='Create new category'}</span>
+					</a>
 			</td>
 		</tr>
 		<tr>
 			<td class="col-left">
+				{include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"}
 				<label for="id_category_default">{l s='Default category:'}</label>
 			</td>
 			<td class="col-right">
@@ -65,20 +72,13 @@
 			</td>
 		</tr>
 	</table>
-	{if $feature_shop_active}
-		<div class="separation"></div>
-		{* @todo use asso_shop from Helper *}
-		<label>{l s='Shop association:'}</label>
-		{$displayAssoShop}
-	{/if}
-
 <div class="separation"></div>
 	<table>
 		<tr>
 			<td class="col-left"><label>{l s='Accessories:'}</label></td>
 			<td style="padding-bottom:5px;">
 				<input type="hidden" name="inputAccessories" id="inputAccessories" value="{foreach from=$accessories item=accessory}{$accessory.id_product}-{/foreach}" />
-				<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|htmlentitiesUTF8}¤{/foreach}" />
+				<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|escape:'htmlall':'UTF-8'}¤{/foreach}" />
 
 				<div id="ajax_choose_product">
 					<p style="clear:both;margin-top:0;">
@@ -91,8 +91,8 @@
 				<div id="divAccessories">
 					{* @todo : donot use 3 foreach, but assign var *}
 					{foreach from=$accessories item=accessory}
-						{$accessory.name|htmlentitiesUTF8}{if !empty($accessory.reference)}{$accessory.reference}{/if} 
-						<span onclick="delAccessory({$accessory.id_product});" style="cursor: pointer;">
+						{$accessory.name|escape:'htmlall':'UTF-8'}{if !empty($accessory.reference)}{$accessory.reference}{/if}
+						<span class="delAccessory" name="{$accessory.id_product}" style="cursor: pointer;">
 							<img src="../img/admin/delete.gif" class="middle" alt="" />
 						</span><br />
 					{/foreach}
@@ -117,43 +117,4 @@
 		</td>
 		</tr>
 	</table>
-</div>
-
-<script type="text/javascript">
-	var formProduct;
-	var accessories = new Array();
-	urlToCall = null;
-	/* function autocomplete */
-	$(document).ready(function() {
-		$('#product_autocomplete_input')
-			.autocomplete('ajax_products_list.php', {
-				minChars: 1,
-				autoFill: true,
-				max:20,
-				matchContains: true,
-				mustMatch:true,
-				scroll:false,
-				cacheLength:0,
-				formatItem: function(item) {
-					return item[1]+' - '+item[0];
-				}
-			}).result(addAccessory);
-
-		$('#product_autocomplete_input').setOptions({
-			extraParams: {
-				excludeIds : getAccessorieIds()
-			}
-		});
-
-		getManufacturers();
-	});
-
-	function getAccessorieIds()
-	{
-		var ids = {$product->id}+',';
-		ids += $('#inputAccessories').val().replace(/\\-/g,',').replace(/\\,$/,'');
-		ids = ids.replace(/\,$/,'');
-
-		return ids;
-	}
-</script>
+</div>

admin-dev/themes/default/template/controllers/products/attachments.tpl

@@ -25,7 +25,7 @@
 *}
 
 {if isset($obj->id)}
-
+	<input type="hidden" name="submitted_tabs[]" value="Attachments" />
 	<h4>{l s='Attachment'}</h4>
 	<div class="separation"></div>
 	<fieldset style="border:none;">
@@ -33,7 +33,7 @@
 		<div class="margin-form translatable">
 			{foreach $languages as $language}
 				<div class="lang_{$language.id_lang}" style="{if $language.id_lang != $default_form_language}display:none;{/if}float: left;">
-					<input type="text" name="attachment_name_{$language.id_lang}" value="{$attachment_name[$language.id_lang]|htmlentities}" />
+					<input type="text" name="attachment_name_{$language.id_lang}" value="{$attachment_name[$language.id_lang]|escape:'htmlall':'UTF-8'}" />
 				</div>
 			{/foreach}
 			<sup>&nbsp;*</sup>
@@ -44,7 +44,7 @@
 		<div class="margin-form translatable">
 			{foreach $languages as $language}
 				<div id="attachment_description_{$language.id_lang}" style="display: {if $language.id_lang == $default_form_language}block{else}none{/if}; float: left;">
-					<textarea name="attachment_description_{$language.id_lang}">{$attachment_description[$language.id_lang]|htmlentities}</textarea>
+					<textarea name="attachment_description_{$language.id_lang}">{$attachment_description[$language.id_lang]|escape:'htmlall':'UTF-8'}</textarea>
 				</div>
 			{/foreach}
 		</div>
@@ -52,11 +52,11 @@
 		<label>{l s='File'}</label>
 		<div class="margin-form">
 			<p><input type="file" name="attachment_file" /></p>
-			<p class="preference_description">{l s='Upload a file from your computer'} ({$PS_ATTACHMENT_MAXIMUM_SIZE} {l s='MB maximum'})</p>
+			<p class="preference_description">{l s='Upload a file from your computer'} ({$PS_ATTACHMENT_MAXIMUM_SIZE|string_format:"%.2f"} {l s='MB max.'})</p>
 		</div>
 		<div class="clear">&nbsp;</div>
 		<div class="margin-form">
-			<input type="submit" value="{l s='Download an attachment file'}" name="submitAddAttachments" class="button" />
+			<input type="submit" value="{l s='Upload attachment file'}" name="submitAddAttachments" class="button" />
 		</div>
 		<div class="small"><sup>*</sup> {l s='Required field'}</div>
 	</fieldset>
@@ -90,40 +90,4 @@
 	</table>
 	<div class="clear">&nbsp;</div>
 	<input type="hidden" name="arrayAttachments" id="arrayAttachments" value="{foreach $attach1 as $attach}{$attach.id_attachment},{/foreach}" />
-
-	<script type="text/javascript">
-		$(document).ready(function(){
-			$("#addAttachment").live('click', function() {
-				$("#selectAttachment2 option:selected").each(function(){
-					var val = $('#arrayAttachments').val();
-					var tab = val.split(',');
-					for (var i=0; i < tab.length; i++)
-						if (tab[i] == $(this).val())
-							return false;
-					$('#arrayAttachments').val(val+$(this).val()+',');
-				});
-				return !$("#selectAttachment2 option:selected").remove().appendTo("#selectAttachment1");
-			});
-			$("#removeAttachment").live('click', function() {
-				$("#selectAttachment1 option:selected").each(function(){
-					var val = $('#arrayAttachments').val();
-					var tab = val.split(',');
-					var tabs = '';
-					for (var i=0; i < tab.length; i++)
-						if (tab[i] != $(this).val())
-						{
-							tabs = tabs+','+tab[i];
-							$('#arrayAttachments').val(tabs);
-						}
-				});
-				return !$("#selectAttachment1 option:selected").remove().appendTo("#selectAttachment2");
-			});
-			$("#product").submit(function() {
-				$("#selectAttachment1 option").each(function(i) {
-					$(this).attr("selected", "selected");
-				});
-			});
-		});
-	</script>
-
 {/if}

admin-dev/themes/default/template/controllers/products/combination/helpers/list/list_footer.tpl

@@ -34,17 +34,4 @@
 			<li>{l s='A default combination must be designated for each product.'}</li>
 		</ul>
 	</div>
-
-	<script type="text/javascript">
-		var impact = getE('attribute_price_impact');
-		var impact2 = getE('attribute_weight_impact');
-
-		var s_attr_group = $('#span_new_group');
-		var s_attr_name = $('#span_new_attr');
-		var s_impact = $('#span_impact');
-		var s_impact2 = $('#span_weight_impact');
-
-		init_elems();
-	</script>
-
 {/block}

admin-dev/themes/default/template/controllers/products/combinations.tpl

@@ -25,20 +25,14 @@
 *}
 
 <script type="text/javascript">
-	{if $product->is_virtual}
-		$('#virtual_good_attributes').show();
-	{else}
-		$('#virtual_good_attributes').hide();
-	{/if}
-
 	var msg_combination_1 = '{l s='Please choose an attribute'}';
 	var msg_combination_2 = '{l s='Please choose a value'}';
 	var msg_combination_3 = '{l s='You can only add one combination per type of attribute'}';
 	var msg_new_combination = '{l s='New combination'}';
-
 </script>
 
-{if isset($product->id)}
+{if isset($product->id) && !$product->is_virtual}
+	<input type="hidden" name="submitted_tabs[]" value="Combinations" />
 	<script type="text/javascript">
 		var attrs = new Array();
 		var modifyattributegroup = "{l s='Modify this attribute combination' js=1}";
@@ -53,21 +47,34 @@
 	{/foreach}
 	</script>
 	<h4>{l s='Add or modify combinations for this product'}</h4>
-	<div class="separation"></div> {l s='or go to'}
-		&nbsp;<a class="button bt-icon confirm_leave" href="index.php?tab=AdminAttributeGenerator&id_product={$product->id}&attributegenerator&token={$token_generator}"><img src="../img/admin/appearance.gif" alt="combinations_generator" class="middle" title="{l s='Product combinations generator'}" /><span>{l s='Product combinations generator'}</span></a>
+	<div class="separation"></div> {l s='or use the'}
+		&nbsp;<a class="button bt-icon confirm_leave" href="index.php?tab=AdminAttributeGenerator&id_product={$product->id}&attributegenerator&token={$token_generator}"><img src="../img/admin/appearance.gif" alt="combinations_generator" class="middle" title="{l s='Product combinations generator'}" /><span>{l s='Product combinations generator'}</span></a> 
+		{l s='in order to create automatically a set of combinations'}
+	{if $combination_exists}
+	<div class="warn" style="display:block">
+		<ul>
+			<li>{l s='Some combinations already exist. If you want to generate some new combinations, the quantities for the actual combinations will be lost.'}</li>
+			<li>{l s='You still can add a combination by clicking the link "Add new combination" on the toolbar.'}</li>
+		</ul>
+	</div>
+	{/if}
+	{if isset($display_multishop_checkboxes) && $display_multishop_checkboxes}
+		<br />
+		{include file="controllers/products/multishop/check_fields.tpl" product_tab="Combinations"}
+	{/if}
 	<div class="separation"></div>
 	
 	<div id="add_new_combination" style="display: none;">
 		<table cellpadding="5" style="width:100%">
 			<tr>
 				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" valign="top">
-					{l s='Attribute:'}
+					<label>{l s='Attribute:'}</label>
 				</td>
 				<td style="padding-bottom:5px;">
 					<select name="attribute_group" id="attribute_group" style="width: 200px;" onchange="populate_attrs();">
 						{if isset($attributes_groups)}
 							{foreach from=$attributes_groups key=k item=attribute_group}
-								<option value="{$attribute_group.id_attribute_group}">{$attribute_group.name|htmlentitiesUTF8}&nbsp;&nbsp;</option>
+								<option value="{$attribute_group.id_attribute_group}">{$attribute_group.name|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
 							{/foreach}
 						{/if}
 					</select>
@@ -75,7 +82,7 @@
 			</tr>
 			<tr>
 				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" valign="top">
-					{l s='Value:'}
+					<label>{l s='Value:'}</label>
 				</td>
 				<td style="padding-bottom:5px;">
 					<select name="attribute" id="attribute" style="width: 200px;">
@@ -102,7 +109,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">{l s='Reference:'}</td>
+				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;"><label>{l s='Reference:'}</label></td>
 				<td style="padding-bottom:5px;">
 					<input size="55" type="text" id="attribute_reference" name="attribute_reference" value="" style="width: 130px; margin-right: 44px;" />
 					{l s='EAN13:'}<input size="55" maxlength="13" type="text" id="attribute_ean13" name="attribute_ean13" value="" style="width: 110px; margin-left: 10px; margin-right: 44px;" />
@@ -116,66 +123,11 @@
 				</td>
 			</tr>
 		</table>
-		<table cellpadding="5" id="virtual_good_attributes" style="width:100%;display:none;">
-			<tr>
-				<td colspan="2">
-					<div style="padding:5px;width:50%;float:left;margin-right:20px;border-right:1px solid #E0D0B1">
-					     	<h3>{l s='Virtual product'}</h3>
-						<p>{l s='Your server\'s maximum upload file size is'}:&nbsp;{$upload_max_filesize}</p>
-						<label id="virtual_product_file_attribute_label" for="virtual_product_file_attribute" class="t">{l s='Upload a file'}</label>
-						<p><input id="virtual_product_file_attribute" name="virtual_product_file_attribute" onchange="uploadFile2();" maxlength="'.$this->maxFileSize.'" type="file"></p>
-						<div id="upload-confirmation2">
-				
-							<p id="gethtmlink" style="display: none;">{l s='This is the link'} :&nbsp;{$product->productDownload->getHtmlLink(false, true)}
-									<a id="make_downloadable_product_attribute" onclick="return confirm('{l s='Delete this file' js=1}')" href="index.php?tab=AdminProducts&id_product={$product->productDownload->id_product}&id_category={$id_category}&token={$token}&deleteVirtualProductAttribute=true" class="red">{l s='Delete this file'}</a>
-							</p>
-						
-						</div>
-						<a id="delete_downloadable_product_attribute" style="display:none;" onclick="return confirm('{l s='Delete this file' js=1}')" href="index.php?tab=AdminProducts&id_product={$product->id}&id_category={$id_category}&token={$token}&deleteVirtualProductAttribute=true" class="red">{l s='Delete this file'}</a>
-						{if $up_filename}
-							<input type="hidden" id="virtual_product_filename_attribute" name="virtual_product_filename_attribute" value="{$up_filename}" />
-						{/if}
-				
-						<p class="block">
-							<label for="virtual_product_name_attribute" class="t">{l s='Filename'}</label>
-							<input id="virtual_product_name_attribute" name="virtual_product_name_attribute" style="width:200px" value="" type="text">
-							<span class="hint" name="help_box" style="display:none;">{l s='The full filename with its extension (e.g. Book.pdf)'}</span>
-						</p>
-					</div>
-					<div id="virtual_good_more_attribute" style="padding:5px;width:40%;float:left;margin-left:10px">
-						<p class="block">
-							<label for="virtual_product_nb_downloable" class="t">{l s='Number of downloads'}</label>
-							<input type="text" id="virtual_product_nb_downloable_attribute" name="virtual_product_nb_downloable_attribute" value="" class="" size="6" />
-							<span class="hint" name="help_box" style="display:none">{l s='Number of authorized downloads per customer'}</span>
-						</p>
-						<p class="block">
-							<label for="virtual_product_expiration_date_attribute" class="t">{l s='Expiration date'}</label>
-							<input class="datepicker" type="text" id="virtual_product_expiration_date_attribute" name="virtual_product_expiration_date_attribute" value="" size="11" maxlength="10" autocomplete="off" /> {l s='Format: YYYY-MM-DD'}
-							<span class="hint" name="help_box" style="display:none">{l s='Leave this blank for no expiration date'}</span>
-						</p>
-						<p class="block">
-							<label for="virtual_product_nb_days" class="t">{l s='Number of days'}</label>
-							<input type="text" id="virtual_product_nb_days_attribute" name="virtual_product_nb_days_attribute" value="" class="" size="4" /><sup> *</sup>
-							<span class="hint" name="help_box" style="display:none">{l s='How many days this file can be accessed by customers'} - <em>({l s='Set to zero for unlimited access'} ) </em></span>
-						</p>
-						<p class="block">
-							<label for="virtual_product_is_shareable_attribute" class="t">{l s='is shareable'}</label>
-							<input type="checkbox" id="virtual_product_is_shareable_attribute" name="virtual_product_is_shareable" value="1" />
-							<span class="hint" name="help_box" style="display:none">{l s='Specify if the file can be shared'}</span>
-						</p>
-					</div>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2">
-					<div class="separation"></div>
-				</td>
-			</tr>
-		</table>
 		<table>
 			<tr>
 				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">
-					{l s='Wholesale price:'}
+					{include file="controllers/products/multishop/checkbox.tpl" field="attribute_wholesale_price" type="default"}
+					<label>{l s='Wholesale price:'}</label>
 				</td>
 				<td style="padding-bottom:5px;">
 					{if $currency->format % 2 != 0}{$currency->sign}{/if}
@@ -185,7 +137,10 @@
 				</td>
 			</tr>
 			<tr>
-				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">{l s='Impact on price:'}</td>
+				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">
+					{include file="controllers/products/multishop/checkbox.tpl" field="attribute_price_impact" type="attribute_price_impact"}
+					<label>{l s='Impact on price:'}</label>
+				</td>
 				<td colspan="2" style="padding-bottom:5px;">
 					<select name="attribute_price_impact" id="attribute_price_impact" style="width: 140px;" onchange="check_impact(); calcImpactPriceTI();">
 						<option value="0">{l s='None'}</option>
@@ -210,7 +165,10 @@
 				</td>
 			</tr>
 			<tr>
-				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">{l s='Impact on weight:'}</td>
+				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">
+					{include file="controllers/products/multishop/checkbox.tpl" field="attribute_weight_impact" type="attribute_weight_impact"}
+					<label>{l s='Impact on weight:'}</label>
+				</td>
 				<td colspan="2" style="padding-bottom:5px;">
 					<select name="attribute_weight_impact" id="attribute_weight_impact" style="width: 140px;" onchange="check_weight_impact();">
 						<option value="0">{l s='None'}</option>
@@ -224,7 +182,10 @@
 				</td>
 			</tr>
 			<tr id="tr_unit_impact">
-				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">{l s='Impact on unit price :'}</td>
+				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">
+					{include file="controllers/products/multishop/checkbox.tpl" field="attribute_unit_impact" type="attribute_unit_impact"}
+					<label style="width: 100px; float: right">{l s='Impact on unit price :'}</label>
+				</td>
 				<td colspan="2" style="padding-bottom:5px;">
 					<select name="attribute_unit_impact" id="attribute_unit_impact" style="width: 140px;" onchange="check_unit_impact();">
 						<option value="0">{l s='None'}</option>
@@ -240,7 +201,8 @@
 			{if $ps_use_ecotax}
 				<tr>
 					<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">
-						{l s='Eco-tax:'}
+						{include file="controllers/products/multishop/checkbox.tpl" field="attribute_ecotax" type="default"}
+						<label>{l s='Eco-tax:'}</label>
 					</td>
 					<td style="padding-bottom:5px;">{if $currency->format % 2 != 0}{$currency->sign}{/if}
 						<input type="text" size="3" name="attribute_ecotax" id="attribute_ecotax" value="0.00" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
@@ -251,6 +213,7 @@
 			{/if}
 			<tr>
 				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" class="col-left">
+					{include file="controllers/products/multishop/checkbox.tpl" field="attribute_minimal_quantity" type="default"}
 					<label>{l s='Minimum quantity:'}</label>
 				</td>
 				<td style="padding-bottom:5px;">
@@ -259,7 +222,8 @@
 				</td>
 			</tr>
 			<tr>
-				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" class="col-left" style="width:150px">
+				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" class="col-left">
+					{include file="controllers/products/multishop/checkbox.tpl" field="available_date_attribute" type="default"}
 					<label>{l s='Available date:'}</label>
 				</td>
 				<td style="padding-bottom:5px;">
@@ -282,14 +246,14 @@
 				</td>
 			</tr>
 			<tr>
-				<td style="width:150px">{l s='Image:'}</td>
+				<td style="width:150px"><label>{l s='Image:'}</label></td>
 				<td style="padding-bottom:5px;">
 					<ul id="id_image_attr">
 						{foreach from=$images key=k item=image}
 							<li style="float: left; width: {$imageWidth}px;">
 								<input type="checkbox" name="id_image_attr[]" value="{$image.id_image}" id="id_image_attr_{$image.id_image}" />
 								<label for="id_image_attr_{$image.id_image}" style="float: none;">
-									<img src="{$smarty.const._THEME_PROD_DIR_}{$image.obj->getExistingImgPath()}-small.jpg" alt="{$image.legend|htmlentitiesUTF8}" title="{$image.legend|htmlentitiesUTF8}" />
+									<img src="{$smarty.const._THEME_PROD_DIR_}{$image.obj->getExistingImgPath()}-small.jpg" alt="{$image.legend|escape:'htmlall':'UTF-8'}" title="{$image.legend|escape:'htmlall':'UTF-8'}" />
 								</label>
 							</li>
 						{/foreach}
@@ -298,7 +262,10 @@
 				</td>
 			</tr>
 			<tr>
-				<td style="width:150px">{l s='Default:'}<br /><br /></td>
+				<td style="width:150px">
+					{include file="controllers/products/multishop/checkbox.tpl" field="attribute_default" type="attribute_default"}
+					<label>{l s='Default:'}</label><br /><br />
+				</td>
 				<td style="padding-bottom:5px;">
 					<input type="checkbox" name="attribute_default" id="attribute_default" value="1" />
 					&nbsp;{l s='Make this the default combination for this product'}<br /><br />
@@ -308,7 +275,7 @@
 				<td style="width:150px">&nbsp;</td>
 				<td style="padding-bottom:5px;">
 					<span id="ResetSpan" style="float:left;margin-left:8px;display:none;">
-						<input type="reset" name="ResetBtn" id="ResetBtn" onclick="init_elems();getE('id_product_attribute').value = 0;" class="button" value="{l s='Cancel modification'}" />
+						<input type="reset" name="ResetBtn" id="ResetBtn" onclick="getE('id_product_attribute').value = 0;" class="button" value="{l s='Cancel modification'}" />
 					</span>
 					<span class="clear"></span>
 				</td>

admin-dev/themes/default/template/controllers/products/customization.tpl

@@ -25,6 +25,7 @@
 *}
 
 {if isset($obj->id)}
+	<input type="hidden" name="submitted_tabs[]" value="Customization" />
 	<h4>{l s='Add or modify customizable properties'}</h4>
 	
 	<div class="separation"></div><br />

admin-dev/themes/default/template/controllers/products/features.tpl

@@ -25,7 +25,7 @@
 *}
 
 {if isset($product->id)}
-	
+	<input type="hidden" name="submitted_tabs[]" value="Features" />
 	<h4>{l s='Assign features to this product:'}</h4>
 	<div class="separation"></div>
 				<ul>
@@ -81,7 +81,7 @@
 		{foreach from=$languages key=k item=language}
 			<div class="lang_{$language.id_lang}" style="{if $language.id_lang != $default_form_language}display:none;{/if}float: left;">
 			<textarea class="custom_{$available_feature.id_feature}_" name="custom_{$available_feature.id_feature}_{$language.id_lang}" cols="40" rows="1"
-				onkeyup="if (isArrowKey(event)) return ;$('#feature_{$available_feature.id_feature}_value').val(0);" >{$available_feature.val[$k].value|htmlentitiesUTF8|default:""}</textarea>
+				onkeyup="if (isArrowKey(event)) return ;$('#feature_{$available_feature.id_feature}_value').val(0);" >{$available_feature.val[$k].value|escape:'htmlall':'UTF-8'|default:""}</textarea>
 			</div>
 		{/foreach}
 		</td>
@@ -98,11 +98,4 @@
 			<img src="../img/admin/add.gif" alt="new_features" title="{l s='Add a new feature'}" />&nbsp;{l s='Add a new feature'}
 		</a>
 	</div>
-	
-	<script type="text/javascript">
-	$(document).ready(function(){
-		displayFlags(languages, id_language, allowEmployeeFormLang);
-	});
-	</script>
-
 {/if}

admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl

@@ -28,38 +28,41 @@
 
 {block name="autoload_tinyMCE"}
 	// Execute when tab Informations has finished loading
-	onTabLoad('Informations', function(){
-		// change each by click to load only on click
-		$(".autoload_rte").each(function(e){
-			tinySetup({
-				mode :"exact",
-				editor_selector :"autoload_rte",
-				elements : $(this).attr("id"),
-				theme_advanced_buttons1 : "newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",
-				theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,,|,forecolor,backcolor",
-				theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,media,|,ltr,rtl,|,fullscreen",
-				theme_advanced_buttons4 : "styleprops,|,cite,abbr,acronym,del,ins,attribs,pagebreak",
-				setup : function(ed) {
+	tabs_manager.onLoad('Informations', function(){
+		tinySetup({
+			editor_selector :"autoload_rte",
+			theme_advanced_buttons1 : "newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",
+			theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,,|,forecolor,backcolor",
+			theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,media,|,ltr,rtl,|,fullscreen",
+			theme_advanced_buttons4 : "styleprops,|,cite,abbr,acronym,del,ins,attribs,pagebreak",
+			setup : function(ed) {
+				ed.onInit.add(function(ed)
+				{
+					if (typeof ProductMultishop.load_tinymce[ed.id] != 'undefined')
+					{
+						if (typeof ProductMultishop.load_tinymce[ed.id])
+							ed.hide();
+						else
+							ed.show();
+					}
+				});
 
-					{* Count the total number of the field *}
-
-					ed.onKeyUp.add(function(ed, e) {
-						tinyMCE.triggerSave();
-						textarea = $('#'+ed.id);
-						max = textarea.parent('div').find('span.counter').attr('max');
-						if (max != 'none')
-						{
-							textarea_value = textarea.val();
-							count = stripHTML(textarea_value).length;
-							rest = max - count;
-							if (rest < 0)
-								textarea.parent('div').find('span.counter').html('<span style="color:red;">{l s='Maximum'} '+max+' {l s='characters'} : '+rest+'</span>');
-							else
-								textarea.parent('div').find('span.counter').html(' ');
-						}
-					});
-				}
-			});
+				ed.onKeyUp.add(function(ed, e) {
+					tinyMCE.triggerSave();
+					textarea = $('#'+ed.id);
+					max = textarea.parent('div').find('span.counter').attr('max');
+					if (max != 'none')
+					{
+						textarea_value = textarea.val();
+						count = stripHTML(textarea_value).length;
+						rest = max - count;
+						if (rest < 0)
+							textarea.parent('div').find('span.counter').html('<span style="color:red;">{l s='Maximum'} '+max+' {l s='characters'} : '+rest+'</span>');
+						else
+							textarea.parent('div').find('span.counter').html(' ');
+					}
+				});
+			}
 		});
 	});
 {/block}
@@ -68,9 +71,10 @@
 	<div>
 		<div class="productTabs" style="display:none;">
 			<ul class="tab">
+			{*todo href when nojs*}
 			{foreach $product_tabs key=numStep item=tab}
 				<li class="tab-row">
-					<a class="tab-page {if $tab.selected}selected{/if}" id="link-{$tab.id}" href="{$tab.href}&amp;updateproduct">{$tab.name}</a>{*todo href when nojs*}
+					<a class="tab-page {if $tab.selected}selected{/if}" id="link-{$tab.id}" href="{$tab.href}&amp;updateproduct">{$tab.name}</a>
 				</li>
 			{/foreach}
 			</ul>
@@ -80,109 +84,49 @@
 		var token = '{$token}';
 		var id_product = {if isset($product->id)}{$product->id}{else}0{/if};
 		var defaultLanguage = {$defaultLanguage};
-
 		var product_type_pack = {Product::PTYPE_PACK};
 		var product_type_virtual = {Product::PTYPE_VIRTUAL};
 		var product_type_simple = {Product::PTYPE_SIMPLE};
 
+		var has_combinations = {$has_combinations};
+
 		var toload = new Array();
 		var empty_pack_msg = '{l s='Pack is empty. You need to add at least one product to the pack before you can save the pack.' slashes=1}';
 		var empty_name_msg = '{l s='Product name is empty. You need to enter a name at least for the default language before you can save the product.' slashes=1}';
 		var empty_link_rewrite_msg = '{l s='Friendly URL is empty. You need to enter a friendly URL at least for the default language before you can save the product.' slashes=1}';
+		var reload_tab_title = '{l s='Confirmation' slashes=1}';
+		var reload_tab_description = '{l s='Some tabs was not loaded correctly, do you want to reload them?' slashes=1}';
+
 		$('#product-tab-content-wait').show();
 		var post_data = {$post_data};
+		var save_error = {if $save_error}true{else}false{/if};
+
+		var product_type = {$product_type};
+		{*var mce_maximum = '{l s='Maximum'}';*}
+		{if isset($display_multishop_checkboxes) && $display_multishop_checkboxes}
+			var display_multishop_checkboxes = true;
+		{else}
+			var display_multishop_checkboxes = false;
+		{/if}
 
-		var product_type;
 		$(document).ready(function()
 		{
-			product_type = $("input[name=type_product]:checked").val();
 			$('#product-tab-content-wait').show();
-			{if $is_pack}
-				$('#pack_product').attr('checked', 'checked');
+			//product_type = $("input[name=type_product]:checked").val();
+			if (product_type == product_type_pack)
+			{
 				$('li.tab-row a[id*="VirtualProduct"]').hide();
-			{elseif $product->is_virtual}
-				$('#virtual_product').attr('checked', 'checked');
+			}
+			else if (product_type == product_type_virtual)
+			{
 				$('li.tab-row a[id*="Pack"]').hide();
 				$('li.tab-row a[id*="Shipping"]').hide();
-				$('#condition').attr('disabled', 'disabled');
-				$('#condition option[value=new]').attr('selected', 'selected');
-			{else}
-				$('#simple_product').attr('checked', 'checked');
-				$('li.tab-row a[id*="Pack"]').hide();
-				$('li.tab-row a[id*="VirtualProduct"]').hide();
-			{/if}
-
-			$('input[name="type_product"]').click(function()
+			}
+			else
 			{
-				// Reset settings
 				$('li.tab-row a[id*="Pack"]').hide();
 				$('li.tab-row a[id*="VirtualProduct"]').hide();
-				$('div.ppack').hide();
-				$('#is_virtual_good').removeAttr('checked');
-				$('div.is_virtual_good').hide();
-				$('#is_virtual').val(0);
-				$("#virtual_good_attributes").hide();
-				
-				// product_type is now global
-				product_type = $(this).val();
-
-				// until a product is added in the pack
-				// if product is PTYPE_PACK, save buttons will be disabled 
-				if (product_type == {Product::PTYPE_PACK})
-				{
-					//when you change the type of the product, directly go to the pack tab
-					$('li.tab-row a[id*="Pack"]').show().click();
-					$('#ppack').val(1).attr('checked', true).attr('disabled', 'disabled');
-					$('#ppackdiv').show();
-					// If the pack tab has not finished loaded the changes will be made when the loading event is triggered
-					$("#product-tab-content-Pack").bind('loaded', function(){
-						$('#ppack').val(1).attr('checked', true).attr('disabled', 'disabled');
-						$('#ppackdiv').show();
-					});
-					$("#product-tab-content-Quantities").bind('loaded', function(){
-						$('.stockForVirtualProduct').show();
-					});
-
-					$('li.tab-row a[id*="Shipping"]').show();
-					$('#condition').removeAttr('disabled');
-					$('#condition option[value=new]').removeAttr('selected');
-					$('.stockForVirtualProduct').show();
-					// if pack is enabled, if you choose pack, automatically switch to pack page
-				}
-				else if (product_type == {Product::PTYPE_VIRTUAL})
-				{
-					$('li.tab-row a[id*="VirtualProduct"]').show();
-					$('#is_virtual_good').attr('checked', true);
-					$('#virtual_good').show();
-					$('#is_virtual').val(1);
-					$("#virtual_good_attributes").show();
-					// If the virtual product tab has not finished loaded the changes will be made when the loading event is triggered
-					$("#product-tab-content-VirtualProduct").bind('loaded', function(){
-						$('#virtual_good').show();
-						$('#is_virtual').val(1);
-						$("#virtual_good_attributes").show();
-					});
-					$("#product-tab-content-Quantities").bind('loaded', function(){
-						$('.stockForVirtualProduct').hide();
-					});
-					$('li.tab-row a[id*="Shipping"]').hide();
-					$('#condition').attr('disabled', 'disabled');
-					$('#condition option[value=refurbished]').removeAttr('selected');
-					$('#condition option[value=used]').removeAttr('selected');
-					$('.stockForVirtualProduct').hide();
-				}
-				else
-				{
-					// 3rd case : product_type is PTYPE_SIMPLE (0)
-					$('li.tab-row a[id*="Shipping"]').show();
-					$('#condition').removeAttr('disabled');
-					$('#condition option[value=new]').removeAttr('selected');
-					$('.stockForVirtualProduct').show();
-				}
-				// this handle the save button displays and warnings
-				handleSaveButtons();
-
-			});
+			}
 
 			$('#desc-product-newCombination').hide();
 
@@ -207,15 +151,15 @@
 					$("#product-tab-content-"+currentId).hide();
 				}
 
-				if ($("#product-tab-content-"+id).hasClass('not-loaded') && !$("#product-tab-content-"+id).hasClass('loading'))
-					displayTabProductById(id, true, 0, null);
-				else
-				{
+				// if the tab has not already been loaded, load it now
+				tabs_manager.display(id, true);
+
+				tabs_manager.onLoad(id, function(){
 					$("#product-tab-content-"+id).show(0, function(){
 						$(this).trigger('displayed');
 					});
 					$("#link-"+id).addClass('selected');
-				}
+				});
 
 				var languages = new Array();
 				if (btn_name == "Combinations")
@@ -242,8 +186,7 @@
 			if ($('#product-tab-content-Associations').hasClass('not-loaded'))
 				disableSave();
 
-			$('#product-tab-content-Associations').bind('loaded', function()
-			{
+			tabs_manager.onLoad('Associations', function(){
 				handleSaveButtons();
 			});
 
@@ -269,8 +212,7 @@
 			{/foreach}
 
 			// Recursively load tabs starting with the first element of stack
-			displayTabProductById(tabs_to_preload[0], false, 0, tabs_to_preload);
-
+			tabs_manager.displayBulk(tabs_to_preload);
 			$('.productTabs').show();
 			$('#product_form').show();
 			$('#product-tab-content-wait').hide();
@@ -295,8 +237,9 @@
 
 	<form id="product_form" action="{$form_action}" method="post" enctype="multipart/form-data" name="product" style="display:none;">
 		<input type="hidden" name="id_product" value="{$id_product}" />
+		<input type="hidden" id="is_virtual" name="is_virtual" value="{$product->is_virtual}" />
 		<div class="tab-pane" id="tabPane1">
-		{if !$product->active}
+		{if !$product->active && $product->isAssociatedToShop()}
 			<div class="warn draft" >
 				<p>
 					<span style="float: left">

admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl

@@ -44,7 +44,7 @@
 					event.preventDefault();
 					$('#block_category_tree').toggle();
 					if ($('#block_category_tree').is(':visible'))
-						$(this).find('input').attr('checked', 'checked');
+						$(this).find('input').attr('checked', true);
 					else
 					{
 						$(this).find('input').removeAttr('checked');