// CHANGELOG

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

404.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

address.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7104 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

addresses.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7104 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajax-tab.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajax.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7234 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -121,10 +121,11 @@ if (Tools::isSubmit('ajaxCategoriesPositions'))
 			$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;
+				$position = $key + 1;
 				break;
 			}
 		}
+
 	$category = new Category($id_category_to_move);
 	if (Validate::isLoadedObject($category))
 	{
@@ -264,7 +265,7 @@ if (Tools::isSubmit('ajaxProductPackItems'))
 	FROM `'._DB_PREFIX_.'product` p
 	NATURAL LEFT JOIN `'._DB_PREFIX_.'product_lang` pl
 	WHERE pl.`id_lang` = '.(int)(Tools::getValue('id_lang')).'
-	'.Context::getContext()->shop->addSqlRestrictionOnLang('pl').'
+	'.Shop::addSqlRestrictionOnLang('pl').'
 	AND p.`id_product` NOT IN (SELECT DISTINCT id_product_pack FROM `'._DB_PREFIX_.'pack`)
 	AND p.`id_product` != '.(int)(Tools::getValue('id_product')));
 
@@ -503,7 +504,7 @@ if (Tools::isSubmit('saveHook'))
 	$hooks_list = explode(',', Tools::getValue('hooks_list'));
 	$id_shop = (int)Tools::getValue('id_shop');
 	if (!$id_shop)
-		$id_shop = Context::getContext()->shop->getId(true);
+		$id_shop = Context::getContext()->shop->id;
 
 	$res = true;
 	$hookableList = array();
@@ -637,36 +638,55 @@ if (Tools::isSubmit('updateElementEmployee') && Tools::getValue('updateElementEm
 
 if (Tools::isSubmit('syncImapMail'))
 {
-	if (!$url = Configuration::get('PS_SAV_IMAP_URL')
-	|| !$port = Configuration::get('PS_SAV_IMAP_PORT')
-	|| !$user = Configuration::get('PS_SAV_IMAP_USER')
-	|| !$password = Configuration::get('PS_SAV_IMAP_PWD'))
+	if (!($url = Configuration::get('PS_SAV_IMAP_URL'))
+	|| !($port = Configuration::get('PS_SAV_IMAP_PORT'))
+	|| !($user = Configuration::get('PS_SAV_IMAP_USER'))
+	|| !($password = Configuration::get('PS_SAV_IMAP_PWD')))
 	die('{"hasError" : true, "errors" : ["Configuration is not correct"]}');
 
+	$conf = Configuration::getMultiple(array(
+		'PS_SAV_IMAP_OPT_NORSH', 'PS_SAV_IMAP_OPT_SSL',
+		'PS_SAV_IMAP_OPT_VALIDATE-CERT', 'PS_SAV_IMAP_OPT_NOVALIDATE-CERT',
+		'PS_SAV_IMAP_OPT_TLS', 'PS_SAV_IMAP_OPT_NOTLS'));
+	
+	$conf_str = '';
+	if ($conf['PS_SAV_IMAP_OPT_NORSH'])
+		$conf_str .= '/norsh';
+	if ($conf['PS_SAV_IMAP_OPT_SSL'])
+		$conf_str .= '/ssl';
+	if ($conf['PS_SAV_IMAP_OPT_VALIDATE-CERT'])
+		$conf_str .= '/validate-cert';
+	if ($conf['PS_SAV_IMAP_OPT_NOVALIDATE-CERT'])
+		$conf_str .= '/novalidate-cert';
+	if ($conf['PS_SAV_IMAP_OPT_TLS'])
+		$conf_str .= '/tls';
+	if ($conf['PS_SAV_IMAP_OPT_NOTLS'])
+		$conf_str .= '/notls';
+
 	if (!function_exists('imap_open'))
 		die('{"hasError" : true, "errors" : ["imap is not installed on this server"]}');
 
-	$mbox = @imap_open('{'.$url.':'.$port.(Configuration::get('PS_SAV_IMAP_SSL') ? '/ssl' : '').'}', $user, $password);
+	$mbox = @imap_open('{'.$url.':'.$port.$conf_str.'}', $user, $password);
 
 	//checks if there is no error when connecting imap server
 	$errors = imap_errors();
 	$str_errors = '';
 	$str_error_delete = '';
-	if (sizeof($errors))
+	if (sizeof($errors) && is_array($errors))
 	{
-		$str_errors = '["';
+		var_dump($errors);
+		$str_errors = '';
 		foreach($errors as $error)
 			$str_errors .= '"'.$error.'",';
 		$str_errors = rtrim($str_errors, ',').'';
 	}
-
 	//checks if imap connexion is active
 	if (!$mbox)
 		die('{"hasError" : true, "errors" : ["Cannot connect to the mailbox"]}');
 
 	//Returns information about the current mailbox. Returns FALSE on failure.
 	$check = imap_check($mbox);
-	if ($check)
+	if (!$check)
 		die('{"hasError" : true, "errors" : ["Fail to get information about the current mailbox"]}');
 
 	if ($check->Nmsgs == 0)
@@ -717,7 +737,7 @@ if (Tools::isSubmit('syncImapMail'))
 	}
 	imap_expunge($mbox);
 	imap_close($mbox);
-	die('{"hasError" : false, "errors" : '.$str_errors.$str_errors_delete.'"]}');
+	die('{"hasError" : false, "errors" : ["'.$str_errors.$str_error_delete.'"]}');
 }
 
 /* Modify attribute position */
@@ -758,7 +778,7 @@ if (Tools::isSubmit('ajaxGroupsAttributesPositions'))
 
 	$new_positions = array();
 	foreach($positions as $k => $v)
-		if (count(explode('_', $v)) == 3)
+		if (count(explode('_', $v)) == 4)
 			$new_positions[] = $v;
 
 	foreach ($new_positions as $position => $value)
@@ -766,11 +786,11 @@ if (Tools::isSubmit('ajaxGroupsAttributesPositions'))
 		// pos[1] = id_attribute_group, pos[2] = old position
 		$pos = explode('_', $value);
 
-		if (isset($pos[1]) && (int)$pos[1] === $id_attribute_group)
+		if (isset($pos[2]) && (int)$pos[2] === $id_attribute_group)
 		{
-			if ($group_attribute = new AttributeGroup((int)$pos[1]))
+			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[1]."\r\n";
+					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
@@ -847,7 +867,7 @@ if (Tools::isSubmit('searchCategory'))
 	$results = Db::getInstance()->executeS(
 		'SELECT c.`id_category`, cl.`name`
 		FROM `'._DB_PREFIX_.'category` c
-		LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category`'.$context->shop->addSqlRestrictionOnLang('cl').')
+		LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category`'.Shop::addSqlRestrictionOnLang('cl').')
 		WHERE cl.`id_lang` = '.(int)$context->language->id.' AND c.`level_depth` <> 0
 		AND cl.`name` LIKE \'%'.pSQL($q).'%\'
 		GROUP BY c.id_category
@@ -893,3 +913,36 @@ if (Tools::isSubmit('getZones'))
 	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_products_list.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -55,7 +55,7 @@ $excludeVirtuals = (bool)Tools::getValue('excludeVirtuals', false);
 
 $sql = 'SELECT p.`id_product`, `reference`, pl.name
 		FROM `'._DB_PREFIX_.'product` p
-		LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.id_product = p.id_product AND pl.id_lang = '.(int)Context::getContext()->language->id.Context::getContext()->shop->addSqlRestrictionOnLang('pl').')
+		LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.id_product = p.id_product AND pl.id_lang = '.(int)Context::getContext()->language->id.Shop::addSqlRestrictionOnLang('pl').')
 		WHERE (pl.name LIKE \'%'.pSQL($query).'%\' OR p.reference LIKE \'%'.pSQL($query).'%\')'.
 		(!empty($excludeIds) ? ' AND p.id_product NOT IN ('.$excludeIds.') ' : ' ').
 		($excludeVirtuals ? 'AND p.id_product NOT IN (SELECT pd.id_product FROM `'._DB_PREFIX_.'product_download` pd WHERE (pd.id_product = p.id_product))' : '');

admin-dev/ajax_send_mail_test.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -33,6 +33,7 @@ require_once(dirname(__FILE__).'/init.php');
 $smtpChecked = (trim($_POST['mailMethod']) ==  'smtp');
 $smtpServer = $_POST['smtpSrv'];
 $content = urldecode($_POST['testMsg']);
+$content = utf8_encode(html_entity_decode($content));
 $subject = urldecode($_POST['testSubject']);
 $type = 'text/html';
 $to =  $_POST['testEmail'];

admin-dev/ajaxfilemanager/inc/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/jscripts/edit_area/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/jscripts/edit_area/reg_syntax/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/jscripts/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/langs/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/session/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/theme/default/css/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/theme/default/images/action/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/theme/default/images/big_icon/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/theme/default/images/file_type/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/theme/default/images/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/theme/default/images/pagination/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/theme/default/images/standard/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/theme/default/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/ajaxfilemanager/theme/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/backup.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/backups/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/cron_currency_rates.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/csv.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/displayImage.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/drawer.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6883 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/export/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/footer.inc.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/functions.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7383 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -147,11 +147,12 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT
 		{
 			$sql = 'SELECT c.id_category, cl.name, cl.link_rewrite
 					FROM '._DB_PREFIX_.'category c
-					LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category'.$context->shop->addSqlRestrictionOnLang('cl').')
+					LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category'.Shop::addSqlRestrictionOnLang('cl').')
 					WHERE c.nleft <= '.(int)$category['nleft'].'
 						AND c.nright >= '.(int)$category['nright'].'
 						AND cl.id_lang = '.(int)$context->language->id.
 						($home ? ' AND c.id_category='.$id_category : '').'
+						AND c.id_category != '.(int)Category::getTopCategory()->id.'
 					GROUP BY c.id_category
 					ORDER BY c.level_depth ASC
 					LIMIT '.(!$home ? (int)($category['level_depth'] + 1) : 1);
@@ -161,7 +162,8 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT
 			$nCategories = (int)sizeof($categories);
 			foreach ($categories AS $category)
 			{
-				$edit = '<a href="'.$urlBase.'&id_category='.(int)$category['id_category'].'&'.(($category['id_category'] == 1 || $home) ? 'viewcategory' : 'updatecategory').'&token='.Tools::getAdminToken('AdminCategories'.(int)(Tab::getIdFromClassName('AdminCategories')).(int)$context->employee->id).'" title="'.($category['id_category'] == 1 ? 'Home' : 'Modify').'"><img src="../img/admin/'.(($category['id_category'] == 1  || $home) ? 'home' : 'edit').'.gif" alt="" /></a> ';
+				$link = Context::getContext()->link->getAdminLink('AdminCategories');
+				$edit = '<a href="'.$link.'&id_category='.(int)$category['id_category'].'&'.(($category['id_category'] == 1 || $home) ? 'viewcategory' : 'updatecategory').'" title="'.($category['id_category'] == 1 ? 'Home' : 'Modify').'"><img src="../img/admin/'.(($category['id_category'] == 1  || $home) ? 'home' : 'edit').'.gif" alt="" /></a> ';
 				$fullPath .= $edit.
 				($n < $nCategories ? '<a href="'.$urlBase.'&id_category='.(int)$category['id_category'].'&viewcategory&token='.Tools::getAdminToken('AdminCategories'.(int)(Tab::getIdFromClassName('AdminCategories')).(int)$context->employee->id).'" title="'.htmlentities($category['name'], ENT_NOQUOTES, 'UTF-8').'">' : '').
 				(!empty($highlight) ? str_ireplace($highlight, '<span class="highlight">'.htmlentities($highlight, ENT_NOQUOTES, 'UTF-8').'</span>', $category['name']) : $category['name']).
@@ -388,47 +390,6 @@ function simpleXMLToArray ($xml, $flattenValues = true, $flattenAttributes = tru
 	return $return;
 }
 
-/**
- * Generate a sweet HTML list for shop selection
- *
- * @todo move in adminTab
- * @return string
- */
-function generateShopList()
-{
-	$tree = Shop::getTree();
-	$context = Context::getContext();
-
-	// Get default value
-	list($shopID, $shopGroupID) = Shop::getContext();
-	if ($shopID)
-		$value = 's-'.$shopID;
-	else if ($shopGroupID)
-		$value = 'g-'.$shopGroupID;
-	else
-		$value = '';
-
-	// Generate HTML
-	$url = $_SERVER['REQUEST_URI'].(($_SERVER['QUERY_STRING']) ? '&' : '?').'setShopContext=';
-	$html = '<select class="shopList" onchange="location.href = \''.$url.'\'+$(this).val();">';
-
-	if ($context->employee->id_profile == _PS_ADMIN_PROFILE_ ||
-					$context->shop->getTotalShopsWhoExists() == Employee::getTotalEmployeeShopById($context->employee->id))
-		$html .= '<option value="" class="first">'.translate('All shops').'</option>';
-	/*$html .= (Context::getContext()->employee->id_profile == _PS_ADMIN_PROFILE_) ? '<option value="" class="first">'.translate('All shops').'</option>' : '';*/
-	foreach ($tree as $gID => $group_data)
-	{
-		$disabled = ($group_data['totalShops'] != count($group_data['shops'])) ? 'disabled="disabled"' : '';
-		$html .= '<option class="group" value="g-'.$gID.'" '.(($value == 'g-'.$gID) ? 'selected="selected"' : '').' '.$disabled.'>'.htmlspecialchars($group_data['name']).'</option>';
-		foreach ($group_data['shops'] as $sID => $shopData)
-			if ($shopData['active'])
-				$html .= '<option value="s-'.$sID.'" class="shop" '.(($value == 's-'.$sID || $context->shop->id == $sID) ? 'selected="selected"' : '').'>&raquo; '.$shopData['name'].'</option>';
-	}
-	$html .= '</select>';
-
-	return $html;
-}
-
 /**
  * for retrocompatibility with old AdminTab, old index.php
  *
@@ -449,7 +410,6 @@ function runAdminTab($tab, $ajaxMode = false)
 	// $tab = $_REQUEST['tab'];
 	if ($adminObj = checkingTab($tab))
 	{
-		$noTabLink = $adminObj->noTabLink;
 		// init is different for new tabs (AdminController) and old tabs (AdminTab)
 		if ($adminObj instanceof AdminController)
 		{
@@ -502,12 +462,12 @@ function runAdminTab($tab, $ajaxMode = false)
 				<a href="?token='.Tools::getAdminToken($tab.intval(Tab::getIdFromClassName($tab)).(int)Context::getContext()->employee->id).'">'.translate('Back Office').'</a>
 				'.$bread.'</div>';
 
-			if (!$ajaxMode && Shop::isFeatureActive() && Context::shop() != Shop::CONTEXT_ALL)
+			if (!$ajaxMode && Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL)
 			{
 				echo '<div class="multishop_info">';
-				if (Context::shop() == Shop::CONTEXT_GROUP)
+				if (Shop::getContext() == Shop::CONTEXT_GROUP)
 					printf(translate('You are configuring your store for group shop %s'), '<b>'.Context::getContext()->shop->getGroup()->name.'</b>');
-				elseif (Context::shop() == Shop::CONTEXT_SHOP)
+				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/get-file-admin.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/grider.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/header.inc.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7048 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -41,6 +41,7 @@ echo '
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'admin.css" />
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'jquery.cluetip.css" />
 		<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/css/admin.css" />
+		<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/plugins/chosen/jquery.chosen.css" />
 		<title>PrestaShop&trade; - '.translate('Administration panel').'</title>
 		<script type="text/javascript">
 			var helpboxes = '.Configuration::get('PS_HELPBOX').';
@@ -53,6 +54,7 @@ echo '
 		<script type="text/javascript" src="'._PS_JS_DIR_.'toggle.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'tools.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'ajax.js"></script>
+		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/plugins/chosen/jquery.chosen.js"></script>
 		<link rel="shortcut icon" href="'._PS_IMG_.'favicon.ico" />
 		'.Hook::exec('displayBackOfficeHeader').'
 		<!--[if IE]>
@@ -147,9 +149,9 @@ echo '
 			';
 			if (Shop::isFeatureActive())
 			{
-				if (Context::shop() == Shop::CONTEXT_ALL)
+				if (Shop::getContext() == Shop::CONTEXT_ALL)
 					$youEditFieldFor = translate('A modification of this field will be applied for all shops');
-				else if (Context::shop() == Shop::CONTEXT_GROUP)
+				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>');
 				else
 					$youEditFieldFor = sprintf(translate('A modification of this field will be applied for the shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
@@ -279,9 +281,6 @@ foreach (QuickAccess::getQuickAccesses(Context::getContext()->language->id) AS $
 echo '			</select>
 			</div>';
 
-		if (Shop::isFeatureActive())
-			echo '<div id="header_shoplist">'.translate('Select your shop:').' '.generateShopList().'</div>';
-
 		echo '</div>';
 			echo Hook::exec('displayBackOfficeTop');
 			echo '<ul id="menu">';
@@ -311,10 +310,6 @@ foreach ($tabs AS $t)
 			<ul class="submenu">';
 		$subTabs = Tab::getTabs(Context::getContext()->language->id, (int)$t['id_tab']);
 
-		// @todo need a better way than using noTabLink property, keeping the fact to avoid db modification
-		if (!in_array($t['class_name'], $noTabLink))
-			array_unshift($subTabs, $t);
-
 		foreach ($subTabs AS $t2)
 			if (checkTabRights($t2['id_tab']) === true AND (bool)$t2['active'])
 				echo '<li><a href="index.php?controller='.$t2['class_name'].'&token='.Tools::getAdminTokenLite($t2['class_name']).'">'.$t2['name'].'</a></li>';
@@ -342,3 +337,11 @@ echo '
 				';
 				if(defined('_PS_MODE_DEV_') && _PS_MODE_DEV_)
 					echo '<div class="warn">This tab is an AdminTab</div>';
+
+if (Shop::isFeatureActive())
+{
+   echo '<div class="multishop_toolbar">
+        <span class="text_multishop">'.translate('Multishop configuration for').'</span>'.
+		Helper::renderShopList();
+    echo '</div>';
+}

admin-dev/import/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7451 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/init.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7227 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -101,14 +101,38 @@ try
 
 	$context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
 
-	$shopID = '';
+	$shop_id = '';
+	Shop::setContext(Shop::CONTEXT_ALL);
 	if ($context->cookie->shopContext)
 	{
 		$split = explode('-', $context->cookie->shopContext);
-		if (count($split) == 2 && $split[0] == 's')
-			$shopID = (int)$split[1];
+		if (count($split) == 2)
+		{
+			if ($split[0] == 'g')
+				Shop::setContext(Shop::CONTEXT_GROUP, $split[1]);
+			else
+			{
+				Shop::setContext(Shop::CONTEXT_SHOP, $split[1]);
+				$shop_id = $split[1];
+			}
+		}
 	}
-	$context->shop = new Shop($shopID);
+	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);
 }
 catch(PrestaShopException $e)
 {

admin-dev/login.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/password.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7310 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/pdf.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/searchcron.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/tabs/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

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

@@ -57,19 +57,18 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #header_infos #header_foaccess{ text-decoration:none; color:#bababa;}
 #header #header_infos #header_foaccess a {color:#bababa !important;}
 #header #header_infos a#header_foaccess:hover { color:#fff;}
-#header #header_search{ float:left; margin-top:15px; position:relative;  }
-#header #header_search #bo_query{ font: 13px Arial,sans-serif; float:left;background: none repeat scroll 0 0 #fff;  border:1px solid #000; border-radius:4px;  padding: 5px 25px 5px 4px; width: 180px; box-shadow: 0 1px 0 #666;}
-#header #header_search #bo_search_type{ font-size:13px; float:left; margin:0 10px 0 0; padding:3px 0 4px; vertical-align:middle;width:auto; border-color: #666666 #CCCCCC #CCCCCC;border-style:solid solid solid none; height:27px; border-width: 1px;}
-#header #header_search #bo_search_submit { background: transparent url('../img/icon-search.png') no-repeat scroll center; border:none; width:27px; height:27px; float:left; font-weight:normal; margin:0; padding:0;  cursor:pointer; text-indent:-9999em; position:absolute; right:0; display:block; /*hacking ie7*/ font-size:0 !ie7; color: transparent !ie;}
+#header #header_search{ background-color:#fff; border:2px solid #000; float:left; margin-top:15px; margin-left:7%; position:relative; height:25px; box-shadow: 0 1px 0 #666666; }
+#header #header_search #bo_query{ font: 13px Arial,sans-serif; float:left;background: none repeat scroll 0 0 transparent;  border:none; box-shadow:none;  padding: 5px 0px 5px 4px; width: 160px; }
+#header #header_search #bo_search_type_chzn{ font-size:13px; float:left; margin:0 23px 0 0; padding:0 4px; vertical-align:middle;width:100px;height:27px; border:none;}
+#header #header_search #bo_search_type_chzn.chzn-container-single .chzn-single { box-shadow:none; border-radius:0px; border:none; border-left:1px dotted #ccc;} 
+#header #header_search #bo_search_submit { background:  url('../img/icon-search2.png') no-repeat scroll center; border:none; width:27px; height:25px; float:left; font-weight:normal; margin:0; padding:0;  cursor:pointer; text-indent:-9999em; position:absolute; right:0; display:block; border-left:1px solid #3079ED; border-radius:0px; /*hacking ie7*/ font-size:0 !ie7; color: transparent !ie;}
 #header #header_quick{float:right; display:block; margin-top:15px;}
-#header #header_quick #quick_select{ font-size:13px; margin:0 10px 0 0; padding:3px 0 4px; vertical-align:middle;width:140px; height:27px;}
-#header #header_shoplist{ background-image:none; clear:both; float: right; color:#fff; margin-top:10px; margin-right:15px;}
-#header #header_shoplist span { float:left; padding:3px;}
+#header #header_quick #quick_select_chzn{ font-size:13px; margin:0 10px 0 0; padding:0px 0 4px;  }
 #header #header_myaccount{background:url('../img/bg-lang.png') no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
 
 
 .path_bar {display:none;}
-#notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:90px;}
+#notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:95px;}
 .notifs { float: left;position: relative;cursor: pointer;margin:0; padding:5px; width: 18px;height: 16px;}
 #orders_notif {background: url('../img/notif_order.png') no-repeat center top;}
 #customers_notif {background: url('../img/notif_customer.png') no-repeat center top;}
@@ -105,7 +104,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #menu li.active span.title, #header #menu li:hover span.title {color:#fff; text-shadow: -1px -1px 0 #3293D6;}
 #header #menu .withLeftBorder{background:transparent url('../img/separator_subnav.png') no-repeat 0 5px}
 #header #menu .submenu{background:#f8f8f8;clear:both;margin:0;padding:0;border:1px solid #d9d9d9;z-index:9999; box-shadow: 1px 5px 5px #CCCCCC; -moz-box-shadow:1px 5px 10px #CCCCCC; -webkit-box-shadow:1px 5px 10px #CCCCCC;}
-#header #menu .submenu li{list-style:none;margin:0;padding:0;display:block;}
+#header #menu .submenu li{list-style:none;margin:0;padding:0;display:block;min-width:150px;}
 #header #menu .submenu li a{ font-size:12px;display:block;padding: 5px 15px 5px 10px; color:#666666;border-top:1px solid #fff; border-bottom:1px solid #ccc;}
 #header #menu .submenu li a:hover { background-color:#eee; text-shadow:0 1px 0 #fff;}
 
@@ -116,6 +115,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 .table_grid {width:100%;}
 .table{ background-color:#fff;border:1px solid #ccc;padding:0: border-radius:3px; -moz-border-radius:3px;-webkit-border-radius:3px;}
 .filter {background-color:#f1f9ff;}
+.table .filter {margin:2px;}
 .table th a{text-decoration:underline}
 .table a:hover{text-decoration:none}
 .table tr th{ background-color: #F1F1F1; text-shadow:0 1px 0 #fff; padding:4px 6px;
@@ -137,7 +137,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 .table tr.last td{border-bottom:none}
 td.col-left {vertical-align:top; padding-right:10px;}
 #tabPane1 td.col-left { width:200px;}
-#product-tab-content-wait{display:block;background:url('../img/bg_loaderSpace.png');position:absolute;width:100%;z-index:100;min-height:600px;padding:5px 10px 10px;}
+#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;}
 td.col-left label { display:block; width:100%; text-align:right;}
 .alt_row{background-color:#f8f8f8}
@@ -146,6 +146,13 @@ td.col-left label { display:block; width:100%; text-align:right;}
 .cat_bar{background-color:#F4E8CD;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:12px;font-weight:700;margin-bottom:20px;padding:5px}
 .cat_bar a{font-weight:700}
 
+.table tr#total_products, 
+.table tr#total_discounts,
+.table tr#total_wrapping,
+.table tr#total_shipping { height:35px;}
+.table tr#total_order { height:50px;}
+
+
 a.action_module{color: #268CCD;text-decoration: underline;}
 a.header_module_toggle{font-weight: bold;color: #268CCD;display:block;}
 a.module_toggle_all{color: #268CCD;}
@@ -168,6 +175,16 @@ a.module_toggle_all{color: #268CCD;}
 /*TABLE STATUS COMMANDE*/
 .table td span.color_field { font-size:11px; padding:2px 5px; border-radius:3px; text-transform:uppercase; color:#fff; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
 
+/*multishop toolbar*/
+.multishop_toolbar { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px; font-size: 18px;}
+.multishop_toolbar span.text_multishop {vertical-align: 7px; padding-right: 5px; }
+.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;}
+
 /*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;}
 .toolbarBox .pageTitle { margin-left:10px; line-height:48px}
@@ -211,13 +228,23 @@ a.module_toggle_all{color: #268CCD;}
 div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}
 
 /*button upload files*/
-.qq-upload-button {
-		background: #e4e4e4 url('../img/bg-button-degrade.png') repeat-x scroll left top;
-		background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
-		background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
-		color:#333; width:180px; font-weight:bold; text-shadow: 0 1px 0 #fff;
-	border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;}
-.qq-upload-button:hover { border:1px solid #939393;}
+#content .qq-upload-button {
+	background: #e4e4e4 url('../img/bg-button-degrade.png') repeat-x scroll left top;
+	background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
+	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
+	color:#333;
+	width:180px;
+	font-weight:bold;
+	text-shadow: 0 1px 0 #fff;
+	border-color: #CCCCCC #BBBBBB #A0A0A0;
+	border-left: 1px solid #BBBBBB;
+	border-radius: 3px 3px 3px 3px;
+	border-right: 1px solid #BBBBBB;
+	border-style: solid;
+	border-width: 1px;
+	color: #000000;
+}
+#content .qq-upload-button:hover { border:1px solid #939393;}
 
 /*leadin*/
 .leadin {}
@@ -285,7 +312,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 .sidebar ul.categorieList li:first-child { border-top:none;}
 .sidebar ul.categorieList li a {color:#3a6ea7; display:block; padding-left:5px;}
 .sidebar ul.categorieList li a:hover { background-color: #EBEDF4;}
-.sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left:5px; overflow:hidden;}
+.sidebar ul.categorieList li div.categorieWidth { overflow:hidden;}
 .sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
 .sidebar .categorieStatus { display:none;}
 
@@ -320,7 +347,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #statsContainer #calendar p, #referrersContainer #calendar p { margin:2px;}
 #statsContainer #calendar p span, #referrersContainer #calendar p span { float:left; display:block; padding:3px;}
 #statsContainer .blocStats { background-color: #EBEDF4;border: 1px solid #C2C4D9; display: block; position:relative; padding: 10px;}
-#statsContainer .blocStats h2 { font-weight:normal; margin:0;}
+#statsContainer .blocStats h2 { font-weight:normal; margin:0; font-size:1.4em}
 #statsContainer .blocStats h2.icon-statsproduct span,
 #statsContainer .blocStats h2.icon-statsbestsuppliers span,
 #statsContainer .blocStats h2.icon-statsforecast span,
@@ -419,8 +446,8 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #modulePosition .table tr th { height:40px;}
 #modulePosition form{ margin-right:270px;}
 #modulePosition .lab_modules_positions h3 { color:#3A6EA7; margin:0 0 0 10px; float:left;}
-#modulePosition .lab_modules_positions p { font-family:Georgia; font-style: italic; font-size:12px; padding-left:40px;}
-#modulePosition .lab_modules_positions span { font-size:12px; padding-left:5px;}
+#modulePosition .lab_modules_positions p { font-family:Georgia; font-style: italic; font-size:12px; padding-left:40px; clear:both;}
+#modulePosition .lab_modules_positions span { font-size:12px; padding-top:4px; padding-left:5px; float:left; }
 
 select#show_modules { font-size:12px;}
 
@@ -463,3 +490,13 @@ ul.listForm li {padding-bottom:3px;}
 .view-modules li.favorites-view-disabled:hover {border-color: #CCCCCC #BBBBBB #A0A0A0;}
 .view-modules li.favorites-view   {border-bottom-left-radius: 0;border-left: 1px solid #fff; border-top-left-radius: 0;}
 .view-modules li.normal-view  {border-bottom-right-radius: 0;border-right: 1px solid #ccc; border-top-right-radius: 0;}
+
+.margin-form select.chosen{width: 200px;}
+
+.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/css/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 8667 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

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

@@ -213,14 +213,15 @@ form#product, form#access_form{   background-color:#ebedf4; border:1px solid #cc
 .sidebar ul.categorieList li { border-top:1px solid #ccc; position:relative; line-height:20px;}
 .sidebar ul.categorieList li:first-child { border-top:none;}
 .sidebar ul.categorieList li a {color:#3a6ea7;}
-.sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left:5px; overflow:hidden;}
+.sidebar ul.categorieList li div.categorieWidth { text-indent:5px; overflow:hidden;}
 .sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
 
 /*MODULECONTAINER*/
 #moduleContainer { margin-left:220px; padding:13px 0 0 20px;}
 #moduleContainer .table tr th { height:40px;}
-#moduleContainer .table tr td { vertical-align:top; padding: 5px 7px 0; border-top:1px dotted #ccc; border-bottom:none;}
+#moduleContainer .table tr td { font-size:12px; vertical-align:top; padding: 5px 7px 0; border-top:1px solid #ccc; border-bottom:none;}
 #moduleContainer .table tr:first-child {border-top:1px solid #ccc}
+#moduleContainer .table tr:hover { background-color:#FFF1B5;}
 #moduleContainer .moduleDesc { font-size:12px; position:relative; margin-bottom:10px;}
 #moduleContainer .moduleDesc h3 { color:#3A6EA7; margin:0;}
 #moduleContainer .moduleDesc .metadata  { float:left; display:block; margin:5px 0;}
@@ -235,7 +236,12 @@ form#product, form#access_form{   background-color:#ebedf4; border:1px solid #cc
 #moduleContainer .row-actions-module span { padding-right:5px;}
 #moduleContainer .row-actions-module span a { font-size:12px;}
 #moduleContainer .button.uninstalled,
-#moduleContainer .button.installed { float:right; clear:both; margin-top:15px; font-size:12px;}
+#moduleContainer .button.installed { float:right; display: inline-block; margin-top:15px; font-size:12px;}
+#moduleContainer .button.updated {  margin-top:15px; display: inline-block; font-size:12px;}
+#list-action-button{width:175px}
+#list-action-button li{margin-left:10px;display: inline;float: left;}
+#moduleContainer .moduleName {font-size:12px; color:#3A6EA7;font-weight:bold;}
+#moduleContainer .moduleFavDesc { font-family:Georgia; font-style:italic; color:#666;}
 
 
 /*FOOTER*/

admin-dev/themes/default/img/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 8667 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/themes/default/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @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
@@ -48,8 +48,8 @@
 			var tabnumber = tout[4];
 			var table = 'table#table_'+id_profile;
 
-			perfect_access_js_gestion(this, perm, id_tab, tabsize, tabnumber, table);
-			
+			perfect_access_js_gestion(this, perm, id_tab, tabsize, tabnumber, table, '{$id_tab_access}');
+
 			$.ajax({
 				url: "{$link->getAdminLink('AdminAccess')}",
 				cache: false,
@@ -62,7 +62,7 @@
 					submitAddAccess: '1',
 					action: 'updateAccess',
 					ajax: '1',
-					token: '{getAdminToken tab='AdminAccess'}',
+					token: '{getAdminToken tab='AdminAccess'}'
 				},
 				success : function(res,textStatus,jqXHR)
 				{
@@ -86,7 +86,7 @@
 			var id_module = tout[0];
 			var perm = tout[1];
 			var id_profile = tout[2];
-			var enabled = $(this).is(':checked')? 1 : 0;
+			var enabled = $(this).is(':checked') ? 1 : 0;
 			var table = 'table#table_module_'+id_profile;
 
 			if (id_module == -1)
@@ -110,7 +110,7 @@
 					changeModuleAccess: '1',
 					action: 'updateModuleAccess',
 					ajax: '1',
-					token: '{getAdminToken tab='AdminAccess'}',
+					token: '{getAdminToken tab='AdminAccess'}'
 				},
 				success : function(res,textStatus,jqXHR)
 				{
@@ -382,7 +382,7 @@
 				<div class="clear">&nbsp;</div>
 
 			{else}
-				{l s='Administrator permissions can\'t be modified.'}
+				{l s='Administrator permissions cannot be modified.'}
 			{/if}
 
 		</div>

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

@@ -0,0 +1,63 @@
+{*
+* 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/common_form.tpl

@@ -1,51 +0,0 @@
-{*
-* 2007-2011 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-2011 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
-*}
-
-{if $existingExport}
-	<div class="hint" style="display:block;">
-		{l s='The last export has been found for this section:'}
-		<a href="{$smarty.server.REQUEST_URI}&download={$type}">{l s='Click here'}</a>
-	</div>
-	<br />
-{/if}
-
-<label for="clientPrefix">{l s='Client prefix:'}</label>
-<div class="margin-form">
-	<input type="text" value="{$clientPrefix|htmlentities}" name="clientPrefix" />
-	<span class="input-error"></span>
-</div>
-
-<label for="beginDate">{l s='Begin to:'}</label>
-<div class="margin-form">
-	<input class="datepicker" id="beginDate_{$type}" type="text" name="beginDate" value="{$begin_date}" />
-	<span class="input-error">{l s='The date has not the right format'}</span>
-</div>
-
-<label for="endDate">{l s='End to:'}</label>
-<div class="margin-form">
-	<input class="datepicker" id="endDate_{$type}" type="text" name="endDate" value="{$end_date}" />
-	<span class="input-error">{l s='The date has not the right format'}</span>
-</div>

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

@@ -0,0 +1,189 @@
+{*
+* 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_export/global_export.tpl

@@ -1,42 +0,0 @@
-{*
-* 2007-2011 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-2011 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="formAccountingExport" id="block_global_export">
-	<fieldset>
-		<legend>{$title}</legend>
-		<form id="reconfiliation_form" action="{$smarty.server.REQUEST_URI}" method="POST">
-			{include file="controllers/accounting_export/common_form.tpl"}
-			<label for="clientPrefix">{l s='Journal:'}</label>
-			<div class="margin-form">
-				<input type="text" name="journal" value="{$journal|htmlentities}"/>
-			</div>	
-			<div class="margin-form">
-				<input id="submitGlobalExport" type="submit" class="button" name="submitAccountingExportType" />
-				<input type="hidden" name="exportType" value="global_export"/>
-			</div>
-		</form>
-	</fieldset>
-</div>

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

@@ -1,117 +0,0 @@
-{*
-* 2007-2011 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-2011 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() {
-		$('#export_menu').find('a').each(function() {
-			$(this).click(function() {
-				blockID = 'block_' + $(this).attr('id');
-				if (!$('#' + blockID).is(':visible'))
-				{
-				
-					$('.formAccountingExport:visible').each(function() {
-						$(this).fadeOut('fast', function() {
-							$('#' + blockID).fadeIn('fast');
-						});			
-					});
-				}
-			});
-		});
-		
-		$('#' + '{$defaultType}').fadeIn('fast');
-	
-		$('.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>
-
-{foreach from=$preventList key=name item=preventType}
-	{if !empty($preventType)}
-		<div class="{$name}">
-			{foreach from=$preventType item=translationPrevent}
-				{$translationPrevent}
-			{/foreach}
-		</div>
-	{/if}
-{/foreach}
-
-<div id="export_menu">
-	<div class="toolbarBox">
-		<div class="pageTitle">
-			<h3>
-				<span id="current_obj" style="font-weight: normal;">{l s='Export:'}</span>
-			</h3>
-			{l s='Select which export you want to do:'}<br />
-			{foreach from=$exportTypeList item=export}
-				<a id="{$export['type']}" class="button" href="javascript:void(0);">{$export['name']}</a>
-			{/foreach}
-		</div>
-	</div>
-</div>

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

@@ -1,63 +0,0 @@
-{*
-* 2007-2011 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-2011 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
-*}
-
-{if !empty($error)}
-	<div class="hint" style="display:block">{$error}</div>
-{else}
-	<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>
-	<fieldset>
-		<legend>{l s='Account number'}</legend>
-		<div class="hint" style="display:block">
-			{l s='Configure the account number by zone for:'} <b>{$shop_details['name']}</b>
-		</div>
-		<br />
-		<form id="{$table}_form" method="POST" action="{$smarty.server.REQUEST_URI}">
-			<label>{l s='Default number for this shop'}</label>
-				<div class="margin-form">
-				<input type="text" name="default_account_number" value="{$shop_details['default_account_number']|htmlentities}" />
-				<p>{l s='If a zone field is empty it will use this default number.'}</p>
-			</div>
-			{foreach from=$shop_details['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']|escape:htmlall|htmlentities}" />
-
-				</div>
-			{/foreach}
-			<div class="margin-form">
-				<input type="submit" class="button" id="{$table}_form_submit_btn" name="UpdateNumbers" value="{l s='Save'}"/>
-			</div>
-		</form>
-		<div class="separation"></div>
-	</fieldset>
-{/if}

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

@@ -0,0 +1,65 @@
+{*
+* 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/addons_catalog/content.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -27,12 +27,26 @@
 {extends file="helpers/form/form.tpl"}
 
 {block name="label"}
+	{if $input.name == 'vat_number'}
+		{if $vat == 'is_applicable'}
+			<div id="vat_area" style="display: visible">
+		{else if $vat == 'management'}
+			<div id="vat_area" style="display: hidden">
+		{else}
+			<div style="display: none;">
+		{/if}
+	{/if}
+
+	{if $input.type == 'text_customer' && !isset($customer)}
+		<label>{l s='Customer e-mail'}</label>
+	{else}
+		{$smarty.block.parent}
+	{/if}
 {/block}
 
-{block name="start_field_block"}
+{block name="field"}
 	{if $input.type == 'text_customer'}
 		{if isset($customer)}
-			<label>{$input.label}</label>
 			<div class="margin-form"><a style="display: block; padding-top: 4px;" href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={$tokenCustomer}">{$customer->lastname} {$customer->firstname} ({$customer->email})</a></div>
 			<input type="hidden" name="id_customer" value="{$customer->id}" />
 			<input type="hidden" name="email" value="{$customer->email}" />
@@ -71,35 +85,14 @@
 				}
 			});
 			</script>
-			<label>{l s='Customer e-mail'}</label>
 			<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>
 			</div>
 		{/if}
-	{else} 
-		{if $input.name == 'vat_number'}		
-			{if $vat == 'is_applicable'}
-				<div id="vat_area" style="display: visible">
-			{else if $vat == 'management'}
-				<div id="vat_area" style="display: hidden">
-			{else}
-				<div style="display: none;">
-			{/if}
-		{else if $input.name == 'id_state'}
-				<div id="contains_states" {if $contains_states}style="display:none;"{/if}>
-		{/if}
-		<label>{$input.label} </label>
-		<div class="margin-form">
+	{else}
+		{$smarty.block.parent}
 	{/if}
-{/block}
-
-{block name="end_field_block"}
-	{* close div margin-form *}
-	{if $input.type != 'text_customer'}
-		</div>
-	{/if}
-	{* close hidden div *}
-	{if $input.name == 'vat_number' || $input.name == 'id_state'}
+	{if $input.name == 'vat_number'}
 		</div>
 	{/if}
 {/block}

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,11 +18,17 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 9197 $
+*  @copyright  2007-2012 PrestaShop SA
+*  @version  Release: $Revision: 10891 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a class="pointer delete" onclick="javascript:deleteProductAttribute('{$id}', '{getAdminToken tab='AdminProducts'}', $(this).parent('td').parent('tr'));" title="{$action}" >
-	<img src="../img/admin/delete.gif" alt="{$action}" />
-</a>
+{extends file="helpers/list/list_header.tpl"}
+{block name='override_header'}
+{if $submit_form_ajax}
+	<script type="text/javascript">
+		parent.getSummary();
+		parent.$.fancybox.close();
+	</script>
+{/if}
+{/block}

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 9197 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -26,7 +26,7 @@
 <script>
 	function confirmProductAttached(productList)
 	{
-		var confirm_text = "{l s='This attachment is used by the following products:'}";
+		var confirm_text = "{l s='This attachment is associated with the following products:'}";
 		if (confirm('{$confirm}'))
 			return confirm(confirm_text + product_list);
 		return false;

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -76,7 +76,7 @@
 <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, click on the "Ctrl", select your attributes and click "Add".'}</div>
+        <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;">
@@ -99,7 +99,7 @@
 			</div>
 		</div>
 		<br />
-		{l s='Add or modify attributes for product:'} <b>{$product_name}</b>
+		{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;">

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @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
@@ -30,25 +30,29 @@
 	{if $input.type == 'color'}
 		<div id="colorAttributeProperties" style="display:{if $colorAttributeProperties}block{else}none{/if}";>
 	{/if}
-	{if isset($input.label)}
-		<label>{$input.label} </label>
-	{/if}
+	{$smarty.block.parent}
 {/block}
 
-
-{block name="end_field_block"}
-		{if $input.type == 'text' && $input.name == 'texture'}
-			</div>
-		{/if}
-	</div>
-		{if $input.name == 'name'}
-			{hook h="displayAttributeForm" id_attribute=$form_id}
-		{/if}
+{block name="field"}
+	{if $input.name == 'current_texture'}
+		<div class="margin-form">
+			{if isset($imageTextureExists) && $imageTextureExists}
+				<img src="{$imageTexture}" alt="{l s='Texture'}" />
+			{else}
+				{l s='None'}
+			{/if}
+		</div>
+	{else}
+		{$smarty.block.parent}
+	{/if}
+	{if $input.name == 'name'}
+		{hook h="displayAttributeForm" id_attribute=$form_id}
+	{/if}
 {/block}
 
 {block name="script"}
 	var attributesGroups = {ldelim}{$strAttributesGroups}{rdelim};
-	
+
 	var displayColorFieldsOption = function() {
 		var val = $('#id_attribute_group').val();
 		if (attributesGroups[val])
@@ -60,5 +64,20 @@
 	displayColorFieldsOption();
 	
 	$('#id_attribute_group').change(displayColorFieldsOption);
-	
+
+	var shop_associations = {$fields[0]['form']['shop_associations']};
+	var changeAssociationGroup = function()
+	{
+		var id_attribute_group = $('#id_attribute_group').val();
+		$('.input_group_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)
+				$(item).attr('disabled', false);
+			else
+				$(item).attr('disabled', true);
+		});
+	};
+	$('#id_attribute_group').change(changeAssociationGroup);
+	changeAssociationGroup();
 {/block}

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 9608 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -27,7 +27,7 @@
 {if count($list)}
 {foreach $list AS $index => $tr}
 	<tr
-	{if $is_dnd_identifier}id="tr_{$tr.id_attribute_group}_{$tr.$identifier}_{if isset($tr.position['position'])}{$tr.position['position']}{else}0{/if}"{/if}
+	{if $position_identifier}id="tr_{$tr.id_attribute_group}_{$tr.$identifier}_{if isset($tr.position['position'])}{$tr.position['position']}{else}0{/if}"{/if}
 	{if $index is odd}class="alt_row"{/if}
 	{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
 	>
@@ -95,7 +95,11 @@
 			{elseif isset($params.callback)}
 				{$tr.$key}
 			{elseif isset($tr.$key) && $key == 'color'}
-				<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div>
+				{if isset($tr.$key['texture']) && $tr.$key['texture']|count_characters > 1}
+					<img src="{$tr.$key.texture}" alt="" />
+				{else}
+					<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div>
+				{/if}
 			{elseif isset($tr.$key)}
 				{$tr.$key|escape:'htmlall':'UTF-8'}
 			{else}

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -26,9 +26,9 @@
 
 {extends file="helpers/form/form.tpl"}
 
-{block name="end_field_block"}
-		</div>
-		{if $input.name == 'public_name'}
-			{hook h="displayAttributeGroupForm" id_attribute_group=$form_id}
-		{/if}
+{block name="field"}
+	{$smarty.block.parent}
+	{if $input.name == 'public_name'}
+		{hook h="displayAttributeGroupForm" id_attribute_group=$form_id}
+	{/if}
 {/block}

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

@@ -1,116 +0,0 @@
-{*
-* 2007-2011 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-2011 PrestaShop SA
-*  @version  Release: $Revision: 9608 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-<tbody>
-{foreach $list AS $index => $tr}
-	<tr
-	{if $is_dnd_identifier}id="tr_{$tr.$identifier}_{$tr.position['position']}"{/if}
-	{if $index is odd}class="alt_row"{/if}
-	{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
-	>
-		<td class="center">
-			{if $bulk_actions}
-				{assign var=bulkActionPossible value=true}
-				{foreach $list_skip_actions as $key => $value}
-					{if in_array($tr.$identifier, $value) == true}
-						{assign var=bulkActionPossible value=false}
-					{/if}
-				{/foreach}
-				{if $bulkActionPossible == true}
-					<input type="checkbox" name="{$table}Box[]" value="{$tr.$identifier}" class="noborder" />
-				{/if}
-			{/if}
-		</td>
-		{foreach $fields_display AS $key => $params}
-			<td
-				{if isset($params.position)}
-					id="td_{if $id_category}{$id_category}{else}0{/if}_{$tr.$identifier}"
-				{/if}
-				class="{if !$no_link}pointer{/if}
-					   {if isset($params.position) && $order_by == 'position'} dragHandle{/if}
-					   {if isset($params.align)} {$params.align}{/if}"
-
-			{if (!isset($params.position) && !$no_link)}
-				onclick="document.location = '{$current_index}&{$identifier}={$tr.$identifier}{if $view}&view{else}&update{/if}{$table}&token={$token}'">{if isset($params.prefix)}{$params.prefix}{/if}
-			{else}
-				>
-			{/if}
-			{if isset($params.active)}
-			    {$tr.$key}
-			{elseif isset($params.activeVisu)}
-				<img src="../img/admin/{if $tr.$key}enabled.gif{else}disabled.gif{/if}"
-				alt="{if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if}" title="{if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if}" />
-			{elseif isset($params.position)}
-				{if $order_by == 'position' && $order_way != 'DESC'}
-					<a href="{$tr.$key.position_url_down}" {if !($tr.$key.position != $positions[count($positions) - 1])}style="display: none;"{/if}>
-						<img src="../img/admin/{if $order_way == 'ASC'}down{else}up{/if}.gif" alt="{l s='Down'}" title="{l s='Down'}" />
-					</a>
-
-					<a href="{$tr.$key.position_url_up}" {if !($tr.$key.position != $positions.0)}style="display: none;"{/if}>
-						<img src="../img/admin/{if $order_way == 'ASC'}up{else}down{/if}.gif" alt="{l s='Up'}" title="{l s='Up'}" />
-					</a>
-				{else}
-					{$tr.$key.position + 1}
-				{/if}
-			{elseif isset($params.image)}
-				{$tr.$key}
-			{elseif (isset($params.icon))}
-				<img src="../img/admin/{$tr[$key]}" alt="{$tr[$key]}" title="{$tr[$key]}" />
-            {elseif isset($params.price)}
-				{$tr.$key}
-			{elseif isset($params.float)}
-				{$tr.$key}
-			{elseif isset($params.type) && $params.type == 'date'}
-				{$tr.$key}
-			{elseif isset($params.type) && $params.type == 'datetime'}
-				{$tr.$key}
-			{elseif isset($params.callback)}
-				{$tr.$key}
-			{elseif isset($tr.$key) && $key == 'color'}
-				<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div>
-			{elseif isset($tr.$key)}
-				{$tr.$key|escape:'htmlall':'UTF-8'}
-			{else}
-				--
-			{/if}
-			{if isset($params.suffix)}{$params.suffix}{/if}
-			</td>
-		{/foreach}
-
-	{if $shop_link_type}
-		<td class="center" {if $name != $tr.shop_name}title="{$tr.shop_name}"{/if}>{if isset($tr.shop_short_name)}{$tr.shop_short_name}{else}{$tr.shop_name}{/if}</td>
-	{/if}
-	{if $has_actions}
-		<td class="center" style="white-space: nowrap;">
-			{foreach $actions AS $action}
-				{if isset($tr.$action)}
-	            	{$tr.$action}
-	            {/if}
-			{/foreach}
-		</td>
-	{/if}
-	</tr>
-{/foreach}
-</tbody>

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,11 +18,17 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 9197 $
+*  @copyright  2007-2012 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a class="pointer default" onclick="javascript:defaultProductAttribute('{$id}', '{getAdminToken tab='AdminProducts'}', $(this).parent('td').parent('tr'));" title="{$action}" >
-	<img src="../img/admin/asterisk.gif" alt="{$action}" />
-</a>
+
+{extends file="helpers/list/list_header.tpl"}
+{block name=leadin}
+	<script type="text/javascript">
+		$(document).ready(function() {
+			$(location.hash).click();
+		});
+	</script>
+{/block}

admin-dev/themes/default/template/controllers/backup/download/view.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @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
@@ -32,37 +32,37 @@
 		<legend><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /> {l s='Download'}</legend>
 		<p style="font-size: 13px;">
 			<a href="{$backup_url}"><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /></a>
-			<b><a href="{$backup_url}">{l s='Download the Backup file'} ({$backup_weight}{l s='Mb'})</a></b><br /><br />
-		{l s='Tip: You can also download this file by FTP, Backup files are located in "admin/backups" directory.'}</p>
+			<b><a href="{$backup_url}">{l s='Download the Backup file'} ({$backup_weight}{l s='MB'})</a></b><br /><br />
+		{l s='Tip: You can also download this file over your FTP. Backup files are located in "admin/backups" directory.'}</p>
 	</fieldset><br /><br />
 
 	<div class="error width1" style="float: left; margin-right: 10px;">
 		<p>{l s='Disclaimer before creating a new Backup'}</p>
 		<ol style="font-size: 11px; font-weight: normal; line-height: 20px; padding-left: 10px;">
-			<li>{l s='PrestaShop is not responsible for your database, Backups, restore and data.'}</li>
-			<li>{l s='PrestaShop is an Open-source software, you are using it at your own risk under the licence agreement.'}</li>
+			<li>{l s='PrestaShop is not responsible for your database, Backups, data and recovery.'}</li>
+			<li>{l s='PrestaShop is Open-source software, you are using it at your own risk under the license agreement.'}</li>
 			<li>{l s='You should Backup your data on a regular basis (both files and database).'}</li>
 			<li>{l s='This function only backs up your database, not your files.'}</li>
-			<li>{l s='By default, your existing database tables will be deleted during Backup restore (see options).'}</li>
-			<li>{l s='Always verify the quality and integrity of your Backups files.'}</li>
-			<li>{l s='Always verify that your Backups files are complete, up-to-date and valid. Even if you had a success message during the Backup process.'}</li>
+			<li>{l s='By default, your existing database tables will be dropped during Backup recovery (see "Backup options" below).'}</li>
+			<li>{l s='Always verify the quality and integrity of your Backup files.'}</li>
+			<li>{l s='Always verify that your Backup files are complete, up-to-date and valid, even if you had a success message during the Backup process.'}</li>
 			<li>{l s='Always check your data.'}</li>
 			<li>{l s='Never restore a Backup on a live site.'}</li>
 		</ol>
 	</div>
 
 	<div class="warn width2" style="float: left;">
-		<p>{l s='How-to restore a database Backup in 10 easy steps'}</p>
+		<p>{l s='How to restore a database Backup in 10 easy steps:'}</p>
 		<ol style="font-size: 11px; font-weight: normal; line-height: 20px;">
-			<li>{l s='Turn off the "Enable Shop" option in the "Preferences" tab.'}</li>
+			<li>{l s='Set "Enable Shop" to "No" in the Preferences > Maintenance tab.'}</li>
 			<li>{l s='Download the Backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
-			<li>{l s='Check the Backup integrity: look for errors, incomplete file. Verify all your data.'}</li>
-			<li>{l s='Ask your hosting provider for a "phpMyAdmin" access to your database'}</li>
+			<li>{l s='Check the Backup integrity: look for errors, incomplete file, etc. Be sure to verify all your data.'}</li>
+			<li>{l s='Ask your hosting provider for "phpMyAdmin" access to your database'}</li>
 			<li>{l s='Connect to "phpMyAdmin" and select your current database'}</li>
 			<li>{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}</li>
-			<li>{l s='At the top of the screen select the tab "Import"'}</li>
+			<li>{l s='At the top of the screen select the "Import" tab'}</li>
 			<li>{l s='Click on the "Browse..." button and select the Backup file from your hard drive'}</li>
-			<li>{l s='Check the max. allowed filesize (ie. Max: 16Mb)'}<br />{l s='If your Backup file exceeds this limit, contact your hosting provider'}</li>
+			<li>{l s='Check the max. allowed filesize (e.g. Max: 16MB)'}<br />{l s='If your Backup file exceeds this limit, contact your hosting provider'}</li>
 			<li>{l s='Click on the "Go" button and wait during the import, the process can take several minutes'}</li>
 		</ol>
 	</div>

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 9639 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -31,36 +31,36 @@
 	<div class="error width1" style="float: left; margin-right: 10px;">
 		<p>{l s='Disclaimer before creating a new Backup'}</p>
 		<ol style="font-size: 11px; font-weight: normal; line-height: 20px; padding-left: 10px;">
-			<li>{l s='PrestaShop is not responsible for your database, Backups, restore and data.'}</li>
-			<li>{l s='PrestaShop is an Open-source software, you are using it at your own risk under the licence agreement.'}</li>
+			<li>{l s='PrestaShop is not responsible for your database, Backups, data and recovery.'}</li>
+			<li>{l s='PrestaShop is Open-source software, you are using it at your own risk under the license agreement.'}</li>
 			<li>{l s='You should Backup your data on a regular basis (both files and database).'}</li>
 			<li>{l s='This function only backs up your database, not your files.'}</li>
-			<li>{l s='By default, your existing database tables will be deleted during Backup restore (see options).'}</li>
-			<li>{l s='Always verify the quality and integrity of your Backups files.'}</li>
-			<li>{l s='Always verify that your Backups files are complete, up-to-date and valid. Even if you had a success message during the Backup process.'}</li>
+			<li>{l s='By default, your existing database tables will be dropped during Backup recovery (see "Backup options" below).'}</li>
+			<li>{l s='Always verify the quality and integrity of your Backup files.'}</li>
+			<li>{l s='Always verify that your Backup files are complete, up-to-date and valid, even if you had a success message during the Backup process.'}</li>
 			<li>{l s='Always check your data.'}</li>
 			<li>{l s='Never restore a Backup on a live site.'}</li>
 		</ol>
 		<br />
 
 		<form action="{$currentIndex}&add{$table}&token={$token}" method="post" style="text-align:center;">
-			<input type="submit" class="button" value="{l s='I read the disclaimer - Create a new Backup'}" style="padding:10px;font-weight:bold;border:1px solid;cursor:pointer;" />
+			<input type="submit" class="button" value="{l s='I have read the disclaimer - Create a new Backup'}" style="padding:10px;font-weight:bold;border:1px solid;cursor:pointer;" />
 		</form>
 
 	</div>
 
 	<div class="warn width2" style="float: left;">
-		<p>{l s='How-to restore a database Backup in 10 easy steps'}</p>
+		<p>{l s='How to restore a database Backup in 10 easy steps:'}</p>
 		<ol style="font-size: 11px; font-weight: normal; line-height: 20px;">
-			<li>{l s='Turn off the "Enable Shop" option in the "Preferences" tab.'}</li>
+			<li>{l s='Set "Enable Shop" to "No" in the Preferences > Maintenance tab.'}</li>
 			<li>{l s='Download the Backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
-			<li>{l s='Check the Backup integrity: look for errors, incomplete file. Verify all your data.'}</li>
-			<li>{l s='Ask your hosting provider for a "phpMyAdmin" access to your database'}</li>
+			<li>{l s='Check the Backup integrity: look for errors, incomplete file, etc. Be sure to verify all your data.'}</li>
+			<li>{l s='Ask your hosting provider for "phpMyAdmin" access to your database'}</li>
 			<li>{l s='Connect to "phpMyAdmin" and select your current database'}</li>
 			<li>{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}</li>
-			<li>{l s='At the top of the screen select the tab "Import"'}</li>
+			<li>{l s='At the top of the screen select the "Import" tab'}</li>
 			<li>{l s='Click on the "Browse..." button and select the Backup file from your hard drive'}</li>
-			<li>{l s='Check the max. allowed filesize (ie. Max: 16Mb)'}<br />{l s='If your Backup file exceeds this limit, contact your hosting provider'}</li>
+			<li>{l s='Check the max. allowed filesize (e.g. Max: 16MB)'}<br />{l s='If your Backup file exceeds this limit, contact your hosting provider'}</li>
 			<li>{l s='Click on the "Go" button and wait during the import, the process can take several minutes'}</li>
 		</ol>
 	</div>

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -30,7 +30,7 @@
 
 	<div class="conf">{l s='Beginning download ...'}</div>
 
-	<p>{l s='Back-up file should automatically download.'}</p>
+	<p>{l s='Backup file should automatically download.'}</p>
 
 	<p>{l s='If not,'} <b><a href="{$url_backup}">{l s='please click here!'}</a></b></p>
 

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @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
@@ -38,14 +38,12 @@
 	{if $input.type == 'select' && $input.name == 'id_tax_rules_group'}
 		<div id="shipping_costs_div" style="display:{if isset($fields_value.is_free) && $fields_value.is_free}none{else}block{/if}">
 	{/if}
-	{if isset($input.label)}
-		<label>{$input.label} </label>
-	{/if}
+	{$smarty.block.parent}
 {/block}
 
-{block name="end_field_block"}
+{block name="field"}
+	{$smarty.block.parent}
 	{if $input.type == 'select' && $input.name == 'range_behavior'}
 		</div>
 	{/if}
-	</div>
 {/block}

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

@@ -15,20 +15,20 @@
 	<label class="t" for="apply_discount_percent"> <img src="../img/admin/enabled.gif" alt="{l s='Enabled'}" title="{l s='Enabled'}" style="cursor:pointer" /> {l s='Percent (%)'}</label>
 	&nbsp;&nbsp;
 	<input type="radio" name="apply_discount" id="apply_discount_amount" value="amount"  {if $currentTab->getFieldValue($currentObject, 'reduction_amount')|intval}checked="checked"{/if} />
-	<label class="t" for="apply_discount_amount"> <img src="../img/admin/enabled.gif" alt="{l s='Enabled'}" title="{l s='Enabled'}" style="cursor:pointer" /> {l s='Amount (¤)'}</label>
+	<label class="t" for="apply_discount_amount"> <img src="../img/admin/enabled.gif" alt="{l s='Enabled'}" title="{l s='Enabled'}" style="cursor:pointer" /> {l s='Amount'}</label>
 	&nbsp;&nbsp;
 	<input type="radio" name="apply_discount" id="apply_discount_off" value="off"  {if !$currentTab->getFieldValue($currentObject, 'reduction_amount')|intval && !$currentTab->getFieldValue($currentObject, 'reduction_percent')|intval}checked="checked"{/if} />
 	<label class="t" for="apply_discount_off"> <img src="../img/admin/disabled.gif" alt="{l s='Disabled'}" title="{l s='Disabled'}" style="cursor:pointer" /> {l s='None'}</label>
 </div>
 <div id="apply_discount_percent_div">
-	<label>{l s='Value (%)'}</label>
+	<label>{l s='Value'}</label>
 	<div class="margin-form">
-		<input type="text" id="reduction_percent" name="reduction_percent" value="{$currentTab->getFieldValue($currentObject, 'reduction_percent')|floatval}" />
+		<input type="text" id="reduction_percent" name="reduction_percent" value="{$currentTab->getFieldValue($currentObject, 'reduction_percent')|floatval}" style="width:40px" /> %
 		<p>{l s='Does not apply to the shipping costs'}</p>
 	</div>
 </div>
 <div id="apply_discount_amount_div">
-	<label>{l s='Value (¤)'}</label>
+	<label>{l s='Amount'}</label>
 	<div class="margin-form">
 		<input type="text" id="reduction_amount" name="reduction_amount" value="{$currentTab->getFieldValue($currentObject, 'reduction_amount')|floatval}" />
 		<select name="reduction_currency">
@@ -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|htmlentities}" style="width:400px" />
+			<input type="text" id="reductionProductFilter" name="reductionProductFilter" value="{$reductionProductFilter|utf8_decode|htmlentities}" style="width:400px" />
 		</div>
 	</div>
 </div>
@@ -73,13 +73,29 @@
 	<input type="radio" name="free_gift" id="free_gift_on" value="1" {if $currentTab->getFieldValue($currentObject, 'gift_product')|intval}checked="checked"{/if} />
 	<label class="t" for="free_gift_on"> <img src="../img/admin/enabled.gif" alt="{l s='Enabled'}" title="{l s='Enabled'}" style="cursor:pointer" /></label>
 	&nbsp;&nbsp;
-	<input type="radio" name="free_gift" id="free_gift_off" value="0"  {if !$currentTab->getFieldValue($currentObject, 'gift_product')|intval}checked="checked"{/if} />
+	<input type="radio" name="free_gift" id="free_gift_off" value="0" {if !$currentTab->getFieldValue($currentObject, 'gift_product')|intval}checked="checked"{/if} />
 	<label class="t" for="free_gift_off"> <img src="../img/admin/disabled.gif" alt="{l s='Disabled'}" title="{l s='Disabled'}" style="cursor:pointer" /></label>
 </div>
 <div id="free_gift_div">
-	<label>{l s='Product'}</label>
+	<label>{l s='Search a product'}</label>
 	<div class="margin-form">
-		<input type="hidden" id="gift_product" name="gift_product" value="{$currentTab->getFieldValue($currentObject, 'gift_product')|intval}" />
-		<input type="text" id="giftProductFilter" name="giftProductFilter" value="{$giftProductFilter|htmlentities}" style="width:400px" />
+		<input type="text" id="giftProductFilter" value="{$giftProductFilter}" style="width:400px" />
 	</div>
-</div>
+	<div id="gift_products_found" {if $gift_product_select == ''}style="display:none"{/if}>
+		<div id="gift_product_list">
+			<label>{l s='Matching products'}</label>
+			<select name="gift_product" id="gift_product" onclick="displayProductAttributes();">
+				{$gift_product_select}
+			</select>
+		</div>
+		<div class="clear">&nbsp;</div>
+		<div id="gift_attributes_list" {if $gift_product_attribute_select == ''}style="display:none"{/if}>
+			<label>{l s='Available combinations'}</label>
+			<div id="gift_attributes_list_select">
+				{$gift_product_attribute_select}
+			</div>
+		</div>
+		<div class="clear">&nbsp;</div>
+	</div>
+	<div id="gift_products_err" class="warn" style="display:none"></div>
+</div>

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

@@ -28,12 +28,12 @@
 		<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 0}selected="selected"{/if}>{l s='Shipping excluded'}</option>
 		<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 1}selected="selected"{/if}>{l s='Shipping included'}</option>
 	</select>
-	<p class="preference_description">{l s='You can choose a minimum amount for the cart either with or without the taxes, with or without shipping.'}</p>
+	<p class="preference_description">{l s='You can choose a minimum amount for the cart either with or without the taxes, and with or without shipping.'}</p>
 </div>
 <label>{l s='Total available'}</label>
 <div class="margin-form">
 	<input type="text" name="quantity" value="{$currentTab->getFieldValue($currentObject, 'quantity')|intval}" />
-	<p class="preference_description">{l s='The cart rule will be applied to the X first customers only.'}</p>
+	<p class="preference_description">{l s='The cart rule will be applied to the first X customers only.'}</p>
 </div>
 <label>{l s='Total available for each user'}</label>
 <div class="margin-form">
@@ -138,7 +138,7 @@
 {/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='Other cart rules compatibility'}</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>
@@ -177,7 +177,7 @@
 		{/foreach}
 	</table>
 	<a href="javascript:addProductRuleGroup();">
-		<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" /> {l s='Add a new rule group'}
+		<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" /> {l s='Product selection'}
 	</a>
 </div>
 {if $shops.unselected|@count + $shops.selected|@count > 1}

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

@@ -1,5 +1,5 @@
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -228,36 +228,6 @@ $('#cart_rule_form').submit(function() {
 		$(this).attr('selected', 'selected');
 	});
 });
-
-$('#giftProductFilter')
-	.autocomplete(
-			'ajax-tab.php', {
-			minChars: 2,
-			max: 50,
-			width: 500,
-			selectFirst: false,
-			scroll: false,
-			dataType: 'json',
-			formatItem: function(data, i, max, value, term) {
-				return value;
-			},
-			parse: function(data) {
-				var mytab = new Array();
-				for (var i = 0; i < data.length; i++)
-					mytab[mytab.length] = { data: data[i], value: (data[i].reference + ' ' + data[i].name).trim() };
-				return mytab;
-			},
-			extraParams: {
-				controller: 'AdminCartRules',
-				token: currentToken,
-				giftProductFilter: 1
-			}
-		}
-	)
-	.result(function(event, data, formatted) {
-		$('#gift_product').val(data.id_product);
-		$('#giftProductFilter').val((data.reference + ' ' + data.name).trim());
-	});
 	
 $('#reductionProductFilter')
 	.autocomplete(
@@ -347,4 +317,75 @@ $('.datepicker').datepicker({
 	prevText: '',
 	nextText: '',
 	dateFormat: 'yy-mm-dd ' + hours + ':' + mins + ':' + secs
-});
+});
+
+$('#giftProductFilter').typeWatch({
+	captureLength: 2,
+	highlight: false,
+	wait: 100,
+	callback: function(){ searchProducts(); }
+});
+
+var gift_product_search = $('#giftProductFilter').val();
+function searchProducts()
+{
+	if ($('#giftProductFilter').val() == gift_product_search)
+		return;
+	gift_product_search = $('#giftProductFilter').val();
+	
+	$.ajax({
+		type: 'POST',
+		url: 'ajax-tab.php',
+		async: true,
+		dataType: 'json',
+		data: {
+			controller: 'AdminCartRules',
+			token: currentToken,
+			action: 'searchProducts',
+			product_search: $('#giftProductFilter').val()
+		},
+		success : function(res)
+		{
+			var products_found = '';
+			var attributes_html = '';
+			stock = {};
+			
+			if (res.found)
+			{
+				$('#gift_products_err').hide();
+				$('#gift_products_found').show();
+				$.each(res.products, function() {
+					products_found += '<option 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 + '" name="ipa_' + this.id_product + '" style="display:none">';
+					$.each(this.combinations, function() {
+						attributes_html += '<option ' + (this.default_on == 1 ? 'selected="selected"' : '') + ' value="' + this.id_product_attribute + '">' + this.attributes + ' - ' + this.formatted_price + '</option>';
+					});
+					attributes_html += '</select>';
+				});
+								
+				$('#gift_product_list #gift_product').html(products_found);
+				$('#gift_attributes_list #gift_attributes_list_select').html(attributes_html);
+				displayProductAttributes();
+			}
+			else
+			{
+				$('#products_found').hide();
+				$('#products_err').html(res.notfound);
+				$('#products_err').show();
+			}
+		}
+	});
+}
+
+function displayProductAttributes()
+{
+	if ($('#ipa_' + $('#gift_product option:selected').val() + ' option').length === 0)
+		$('#gift_attributes_list').hide();
+	else
+	{
+		$('#gift_attributes_list').show();
+		$('.id_product_attribute').hide();
+		$('#ipa_' + $('#gift_product option:selected').val()).show();
+	}
+}

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

@@ -1,6 +1,6 @@
 {if $show_toolbar}
 	<div class="toolbar-placeholder">
-		<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
+		<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
 				{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
 				<div class="pageTitle">
 				<h3>
@@ -33,7 +33,7 @@
 	{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">
-		<h4>{l s='Cart rule informations'}</h4>
+		<h4>{l s='Cart rule information'}</h4>
 		<div class="separation"></div>
 		{include file='controllers/cart_rules/informations.tpl'}
 	</div>

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

@@ -0,0 +1,35 @@
+{*
+* 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: 10891 $
+*  @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/list/list_header.tpl"}
+{block name='override_header'}
+{if $submit_form_ajax}
+	<script type="text/javascript">
+		$('#voucher', window.parent.document).val('{$new_cart_rule->code|escape:htmlall}');
+		parent.add_cart_rule({$new_cart_rule->id|intval});
+		parent.$.fancybox.close();
+	</script>
+{/if}
+{/block}

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

@@ -6,7 +6,8 @@
 				<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)}" />
+						<input type="text" id="name_{$language.id_lang}" name="name_{$language.id_lang}" value="{$currentTab->getFieldValue($currentObject, 'name', $language.id_lang)}" style="width:400px" />
+						<sup>*</sup>
 					</div>
 				{/foreach}
 				</div>

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 9596 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -29,7 +29,7 @@
 {block name="override_tpl"}
 	
 	<div id="container-customer">
-		<h2><img src="../img/admin/basket.png" /><span>{if $customer->id}{$customer->firstname} {$customer->lastname}{else}{l s='Guest'}{/if} - {l s='Cart #'}{$cart->id|string_format:"%06d"}</span><span style="color:#585A69;padding-left:10px;">{l s='from'} {$cart->date_upd}</span></h2>
+		<h2><img src="../img/admin/basket.png" /><span>{if $customer->id}{$customer->firstname} {$customer->lastname}{else}{l s='Guest'}{/if} - {l s='Cart #'}{$cart->id|string_format:"%06d"}</span><span style="color:#585A69;padding-left:10px;">{l s='on'} {$cart->date_upd}</span></h2>
 				<div class="separation"></div>
 	
 	<div class="info-customer-left">
@@ -39,9 +39,9 @@
 			<a href="{$link->getAdminLink('AdminCustomers')}&id_customer={$customer->id}&viewcustomer">{$customer->firstname} {$customer->lastname}</a></span>
 			{l s='#'}{$customer->id}<br />
 			<a style="text-decoration: underline; color:#268CCD;" href="mailto:{$customer->email}">{$customer->email}</a>	<br /><br />
-			{l s='Account registered:'} {dateFormat date=$customer->date_add}<br />
+			{l s='Account registration date:'} {dateFormat date=$customer->date_add}<br />
 			{l s='Valid orders placed:'} <b>{$customer_stats.nb_orders}</b><br />
-			{l s='Total paid since registration:'} <b>{displayWtPriceWithCurrency price=$customer_stats.total_orders currency=$currency}</b><br />
+			{l s='Total spent since registration:'} <b>{displayWtPriceWithCurrency price=$customer_stats.total_orders currency=$currency}</b><br />
 		{else}
 			{l s='Guest not registered'}
 		{/if}
@@ -56,7 +56,7 @@
 			{l s='Made on:'} {dateFormat date=$order->date_add}<br /><br /><br /><br />
 		{else}
 			{l s='No order created from this cart'}</span>
-			<p><a class="button" href="{$link->getAdminLink('AdminOrders')}&id_cart={$cart->id}&addorder">{l s='Create an order with this cart'}</a></p>
+			<p><a class="button" href="{$link->getAdminLink('AdminOrders')}&id_cart={$cart->id}&addorder">{l s='Create an order with from cart'}</a></p>
 		{/if}
 	</div>
 	<br style="clear:both;" />
@@ -70,8 +70,8 @@
 			<tr>
 			<th height="39" align="center" style="width: 60px">&nbsp;</th>
 			<th>{l s='Product'}</th>
-			<th style="width: 80px; text-align: center">{l s='UP'}</th>
-			<th style="width: 20px; text-align: center">{l s='Qty'}</th>
+			<th style="width: 80px; text-align: center">{l s='Unit price'}</th>
+			<th style="width: 20px; text-align: center">{l s='Quantity'}</th>
 			<th style="width: 30px; text-align: center">{l s='Stock'}</th>
 			<th style="width: 90px; text-align: right; font-weight:bold;">{l s='Total'}</th>
 		</tr>
@@ -182,7 +182,7 @@
 	</table>
 	{/if}
 	<div style="float:left; margin-top:15px;">
-	{l s='According to the group of this customer, prices are printed:'} <b>{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC}{l s='tax excluded'}{else}{l s='tax included'}{/if}</b>
+	{l s='For this customer\'s group, prices are displayed as:'} <b>{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC}{l s='tax excluded'}{else}{l s='tax included'}{/if}</b>
 </div>
 	
 	<div class="clear" style="height:20px;">&nbsp;</div>

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,14 +18,15 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @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="end_field_block"}
+{block name="description"}
+	{$smarty.block.parent}
 	{if ($input.name == 'groupBox')}
 		<p class="hint" style="display:block; position:relative; display:inline-block;">
 			<span>{$input.info_introduction}</span><br />
@@ -33,5 +34,5 @@
 			<span>{$input.guest}</span><br />
 			<span>{$input.customer}</span><br />
 		</p>
-	{/if}</div>
+	{/if}
 {/block}

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -50,22 +50,22 @@
 					{if $need_delete_mode}
 						{l s='Do you want to delete products too?'}
 					{else}
-						{l s='Deleting this category will remove products linked with this category and without any others. Are you sure you want to continue?'}
+						{l s='Deleting this category will remove products linked only within this category and no others. Are you sure you want to continue?'}
 					{/if}
 				</h2>
 				{if $need_delete_mode}
 				<ul class="listForm">
 				<li>
 					<input type="radio" name="deleteMode" value="linkanddisable" id="deleteMode_linkanddisable" />
-					<label for="deleteMode_linkanddisable" style="float:none;">{l s='No, I want to link products without others categories with the parent category and disable them.'}</label>
+					<label for="deleteMode_linkanddisable" style="float:none;">{l s='No, I want to link products without other categories within the parent category and then disable them.'}</label>
 				</li>
 				<li>
 					<input type="radio" name="deleteMode" value="link" id="deleteMode_link" />
-					<label for="deleteMode_link" style="float:none;">{l s='No, I want to link products without others categories with the parent category.'}</label>
+					<label for="deleteMode_link" style="float:none;">{l s='No, I want to link products without other categories within the parent category.'}</label>
 				</li>
 				<li>
 					<input type="radio" name="deleteMode" value="delete" id="deleteMode_delete" />
-					<label for="deleteMode_delete" style="float:none">{l s='Yes, I want to remove products linked with this category and without any others categories.'}</label>
+					<label for="deleteMode_delete" style="float:none">{l s='Yes, I want to remove products linked only within this category and no others.'}</label>
 				</li>
 				</ul>
 				{else}
@@ -83,8 +83,8 @@
 					{/if}
 				{/foreach}
 				<br />
-				<input type="submit" name="cancel" class="button" value="{l s='   Cancel   '}" />
-				<input type="submit" class="button" value="{l s='   Validate   '}" />
+				<input type="submit" name="cancel" class="button" value="{l s='Cancel'}" />
+				<input type="submit" class="button" value="{l s='Validate'}" />
 			</div>
 		</form>
 		<div class="clear">&nbsp;</div>

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -47,10 +47,10 @@
 				}
 		}
 		$('#active_on').bind('click', function(){
-			toggleDraftWarning(true);
+			toggleDraftWarning(false);
 		});
 		$('#active_off').bind('click', function(){
-			toggleDraftWarning(false);
+			toggleDraftWarning(true);
 		});		
 	});
 {/block}
@@ -66,12 +66,13 @@
 	</div>
 {/block}
 
-{block name="start_field_block"}
-	<div class="margin-form">
+{block name="input"}
 	{if $input.type == 'select_category'}
 		<select name="{$input.name}">
 			{$input.options.html}
 		</select>
+	{else}
+		{$smarty.block.parent}
 	{/if}
 {/block}
 

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -26,12 +26,13 @@
 
 {extends file="helpers/form/form.tpl"}
 
-{block name="start_field_block"}
-	<div class="margin-form">
+{block name="input"}
 	{if $input.type == 'select_category'}
 		<select name="id_parent">
 			{$input.options.html}
 		</select>
+	{else}
+		{$smarty.block.parent}
 	{/if}
 {/block}
 

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,35 +18,38 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @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="start_field_block"}
-	<div class="margin-form">
-		{if $input.type == 'address_layout'}
+{block name="field"}
+	{if $input.type == 'address_layout'}
+		<div class="margin-form">
 			<div style="float:left">
 				<textarea id="ordered_fields" name="address_layout" style="width: 300px;height: 140px;">{$input.address_layout}</textarea>
 			</div>
 			<div style="float:left; margin-left:20px; width:340px;">
-				{l s='Liable fields for the address information (click to have more details):'} {$input.display_valid_fields}
+				{l s='Required fields for the address (click for more details):'} {$input.display_valid_fields}
 			</div>
 			<div class="clear"></div>
 			<div style="margin:10px 0 10px 0;">
 				<a id="useLastDefaultLayout" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout('{$input.encoding_address_layout}', 'lastDefault');" class="button">
-					{l s='Use the last registered layout'}</a>
+					{l s='Use the last registered format'}</a>
 				<a id="useDefaultLayoutSystem" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout('{$input.encoding_default_layout}', 'defaultSystem');" class="button">
-					{l s='Use a default layout'}</a>
+					{l s='Use the default format'}</a>
 				<a id="useCurrentLastModifiedLayout" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout(lastLayoutModified, 'currentModified')" class="button">
-					{l s='Use my current modified layout'}</a>
+					{l s='Use my current modified format'}</a>
 				<a id="eraseCurrentLayout" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout('', 'erase');" class="button">
-					{l s='Clean layout'}</a>
+					{l s='Clear format'}</a>
 				<div style="margin-top:10px; padding-top:5px; height:10px;" id="explanationText"></div>
 			</div>
-		{/if}
+		</div>
+	{else}
+		{$smarty.block.parent}
+	{/if}
 {/block}
 
 {block name=script}
@@ -65,19 +68,19 @@
 		});
 
 		$('#useLastDefaultLayout').mouseover(function() {
-			switchExplanationText("{l s='Will display back your last registered layout'}");
+			switchExplanationText("{l s='This will restore your last registered address format'}");
 		});
 
 		$('#useDefaultLayoutSystem').mouseover(function() {
-			switchExplanationText("{l s='Will display a default layout for this country'}");
+			switchExplanationText("{l s='This will restore the default address format for this country'}");
 		});
 
 		$('#useCurrentLastModifiedLayout').mouseover(function() {
-			switchExplanationText("{l s='Will display back you\'re current editing layout'}");
+			switchExplanationText("{l s='This will restore your current address format'}");
 		});
 
 		$('#eraseCurrentLayout').mouseover(function() {
-			switchExplanationText("{l s='Will delete the current layout'}");
+			switchExplanationText("{l s='This will delete the current address format'}");
 		});
 
 		$('#need_zip_code_on, #need_zip_code_off').change(function() {
@@ -106,7 +109,7 @@
 	}
 
 	function resetLayout(defaultLayout, type) {
-		if (confirm("{l s='Are you sure to apply this selection ?'}"))
+		if (confirm("{l s='Are you sure you want to restore the default address format for this country?'}"))
 		$("#ordered_fields").val(unescape(defaultLayout.replace(/\+/g, " ")));
 	}
 

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 9432 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 9639 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -55,7 +55,7 @@
 					{/if}
 
 					{if $total_thread == 0}
-						<span class="message-mail">{l s='No new message'}</span>
+						<span class="message-mail">{l s='No new messages'}</span>
 					{else}
 						<a href="{$currentIndex}&token={$token}&id_customer_thread={$id_customer_thread}&viewcustomer_thread" class="button">
 							{$total_thread} 

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 8897 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/themes/default/template/controllers/customer_threads/message.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 8897 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -48,7 +48,7 @@
 		<div class="infoCustomer">
 			{if !empty($message.id_customer) && empty($message.id_employee)}
 			<dl>
-				<dt>{l s='Customer ID:'}&#32;:</dd> 
+				<dt>{l s='Customer ID:'}</dd> 
 				<dd><a href="index.php?tab=AdminCustomers&id_customer={$message.id_customer}&viewcustomer&token={getAdminToken tab='AdminCustomers'}" title="{l s='View customer'}">
 					{$message.id_customer} <img src="../img/admin/search.gif" alt="{l s='view'}" />
 				</a>
@@ -57,21 +57,21 @@
 			{/if}
 			
 			<dl>			
-				<dt>{l s='Sent on:'}&#32;:</dt>
+				<dt>{l s='Sent on:'}</dt>
 				<dd>{$message.date_add}</dd> 
 			
 			</dl>
 
 			{if empty($message.id_employee)}
 			<dl>
-				<dt>{l s='Browser:'}&#32;:</dt>
+				<dt>{l s='Browser:'}</dt>
 				<dd>{$message.user_agent}</dd>
 			</dl>
 			{/if}
 
 			{if !empty($message.file_name) && $file_name}
 			<dl>
-				<dt>{l s='File attachment'}&#32;:</dt> 
+				<dt>{l s='File attachment'}</dt> 
 				<dd><a href="index.php?tab=AdminCustomerThreads&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread&token={getAdminToken tab='AdminCustomerThreads'}&filename={$message.file_name}"
 					title="{l s='View file'}">
 						<img src="../img/admin/search.gif" alt="{l s='view'}" />
@@ -82,7 +82,7 @@
 
 			{if !empty($message.id_order) && empty($message.id_employee)}
 				<dl>
-					<dt>{l s='Order #'}&#32;:</dt> 
+					<dt>{l s='Order #'}</dt> 
 					<dd><a href="index.php?tab=AdminOrders&id_order={$message.id_order}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}">
 					{$message.id_order} <img src="../img/admin/search.gif" alt="{l s='view'}" />
 				</a></dd>
@@ -91,7 +91,7 @@
 
 			{if !empty($message.id_product) && empty($message.id_employee)}
 				<dl>
-					<dt>{l s='Product #'}&#32;:</dt> 
+					<dt>{l s='Product #'}</dt> 
 					<dd><a href="index.php?tab=AdminOrders&id_order={$id_order_product}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}">
 					{$message.id_product} <img src="../img/admin/search.gif" alt="{l s='view'}" />
 				</a></dd>
@@ -143,16 +143,16 @@
 
 {/if}
 		<dl>
-			<dt>{l s='Thread ID:'}&#32;:</dt>
+			<dt>{l s='Thread ID:'}</dt>
 			<dd>{$message.id_customer_thread}</dd>
 		</dl>
 		<dl>
-			<dt>{l s='Message ID:'}&#32;:</dt>
+			<dt>{l s='Message ID:'}</dt>
 			<dd>{$message.id_customer_message}</dd>
 		</dl>
 		<dl>
-			<dt>{l s='Message:'}&#32;:</dt>
-			<dd>{$message.message}</dd>
+			<dt>{l s='Message:'}</dt>
+			<dd>{$message.message|nl2br}</dd>
 		</dl>
 	</div>
 
@@ -167,9 +167,7 @@
 	<div id="reply_to_{$message.id_customer_message}" style="display: none; margin-top: 20px;"">
 		<form action="{$current}&token={getAdminToken tab='AdminCustomerThreads'}&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread" method="post" enctype="multipart/form-data">
 			<p>{l s='Please type your reply below:'}</p>
-			<textarea style="width: 450px; height: 175px;" name="reply_message">'.
-				{$PS_CUSTOMER_SERVICE_SIGNATURE}
-			</textarea>
+			<textarea style="width: 450px; height: 175px;" name="reply_message">{$PS_CUSTOMER_SERVICE_SIGNATURE}</textarea>
 			<div style="width: 450px; text-align: right; font-style: italic; font-size: 9px; margin-top: 2px;">
 				{l s='Your reply will be sent to:'} {$message.email}
 			</div>

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,14 +18,22 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 10891 $
 *  @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/list/list_header.tpl"}
-
+{block name='override_header'}
+{if $submit_form_ajax}
+	<script type="text/javascript">
+		$('#customer', window.parent.document).val('{$new_customer->email|escape:htmlall}');
+		parent.setupCustomer({$new_customer->id|intval});
+		parent.$.fancybox.close();
+	</script>
+{/if}
+{/block}
 {block name=leadin}
 	{if isset($delete_customer) && $delete_customer}
 		<form action="{$REQUEST_URI}" method="post">
@@ -35,7 +43,7 @@
 				<ul class="listForm">
 				<li>
 					<input type="radio" name="deleteMode" value="real" id="deleteMode_real" />
-					<label for="deleteMode_real" style="float:none;">{l s='I want to delete my customer(s) for real, all data will be removed from the database. A customer with the same e-mail address will be able to register again.'}</label>
+					<label for="deleteMode_real" style="float:none;">{l s='I want to delete my customer(s) for real. All data will be removed from the database. A customer with the same e-mail address will be able to register again.'}</label>
 				</li>
 				<li>
 					<input type="radio" name="deleteMode" value="deleted" id="deleteMode_deleted" />
@@ -51,7 +59,7 @@
 						<input type="hidden" name="{$key}" value="{$value}" />
 					{/if}
 				{/foreach}
-				<br /><input type="submit" class="button" value="{l s='   Delete   '}" />
+				<br /><input type="submit" class="button" value="{l s='Delete'}" />
 			</div>
 		</form>
 		<div class="clear">&nbsp;</div>

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @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
@@ -94,11 +94,11 @@
 				{if !$customer_exists}
 					<form method="POST" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
 						<input type="hidden" name="id_lang" value="{$id_lang}" />
-						<p class="center"><input class="button" type="submit" name="submitGuestToCustomer" value="{l s='Transform to customer'}" /></p>
+						<p class="center"><input class="button" type="submit" name="submitGuestToCustomer" value="{l s='Transform to customer account'}" /></p>
 						{l s='This feature generates a random password and sends an e-mail to the customer'}
 					</form>
 				{else}
-					</div><div><b style="color:red;">{l s='A registered customer account exists with the same email address'}</b>
+					</div><div><b style="color:red;">{l s='A registered customer account already exists with this e-mail address'}</b>
 				{/if}
 			</div>
 		{/if}
@@ -111,7 +111,7 @@
 		<h2>
 			<img src="../img/admin/cms.gif" /> {l s='Add a private note'}
 		</h2>
-		<p>{l s='This note will be displayed to all the employees but not to the customer.'}</p>
+		<p>{l s='This note will be displayed to all employees but not to the customer.'}</p>
 		<form action="ajax.php" method="post" onsubmit="saveCustomerNote();return false;" id="customer_note">
 			<textarea name="note" id="noteContent" style="width:600px;height:100px" onkeydown="$('#submitCustomerNote').removeAttr('disabled');">{$customer_note}</textarea><br />
 			<input type="submit" id="submitCustomerNote" class="button" value="{l s='   Save   '}" style="float:left;margin-top:5px" disabled="disabled" />
@@ -201,7 +201,7 @@
 						<th class="left">{l s='Payment'}</th>
 						<th class="left">{l s='State'}</th>
 						<th class="left">{l s='Products'}</th>
-						<th class="left">{l s='Total paid'}</th>
+						<th class="left">{l s='Total spent'}</th>
 						<th class="center">{l s='Actions'}</th>
 					</tr>
 					{foreach $orders_ok AS $key => $order}
@@ -238,7 +238,7 @@
 						<th class="center">{l s='Payment'}</th>
 						<th class="center">{l s='State'}</th>
 						<th class="center">{l s='Products'}</th>
-						<th class="center">{l s='Total paid'}</th>
+						<th class="center">{l s='Total spent'}</th>
 						<th class="center">{l s='Actions'}</th>
 					</tr>
 					{foreach $orders_ko AS $key => $order}

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,18 +18,22 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
 <script type="text/javascript">
-	var textMsg = "{l s='This is a test message, your server is now available to send email'}";
+	var textMsg = "{l s='This is a test message, your server is now configured to send e-mail'}";
 	var textSubject = "{l s='Test message - Prestashop'}";
-	var textSendOk = "{l s='Mail is sent'}";
+	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 errorMail = "{l s='This email address is wrong!'}";
+	var errorMail = "{l s='This e-mail address is invalid'}";
+	$(document).ready(function() {
+		if ($('input[name=PS_MAIL_METHOD]:checked').val() == 2)
+			$('#smtp').show();
+	});
 </script>
 <script type="text/javascript" src="../js/sendMailTest.js"></script>
 

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,15 +18,14 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @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="start_field_block"}
-	<div class="margin-form">
+{block name="input"}
 	{if $input.type == 'select_theme'}
 		<select name="{$input.name}" id="{$input.name}" {if isset($input.multiple)}multiple="multiple" {/if}{if isset($input.onchange)}onchange="{$input.onchange}"{/if}>
 			{foreach $input.options.query AS $option}
@@ -42,7 +41,17 @@
 				>{$option|escape:'htmlall':'UTF-8'}</option>
 			{/foreach}
 		</select>
-		{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
+	{elseif $input.type == 'default_tab'}
+	<select name="{$input.name}" id="{$input.name}">
+		{foreach $input.options AS $option}
+			<optgroup label="{$option.name|escape:'htmlall':'UTF-8'}"></optgroup>
+			{foreach $option.children AS $children}
+				<option value="{$children.id_tab}" {if $fields_value[$input.name] == $children.id_tab}selected="selected"{/if}>&nbsp;&nbsp;{$children.name|escape:'htmlall':'UTF-8'}</option>
+			{/foreach}
+		{/foreach}
+	</select>
+	{else}
+		{$smarty.block.parent}
 	{/if}
 {/block}
 

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,15 +18,15 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @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="end_field_block"}
-	</div>
+{block name="field"}
+	{$smarty.block.parent}
 	{if $input.name == 'id_feature'}
 		{hook h="displayFeatureValueForm" id_feature_value=$feature_value->id}
 	{/if}