diff --git a/404.php b/404.php index 9e74447eb..856c99e72 100644 --- a/404.php +++ b/404.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/address.php b/address.php index 8a871c4ac..8d2a7ee75 100644 --- a/address.php +++ b/address.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/addresses.php b/addresses.php index 16bd7eace..71a0007c2 100644 --- a/addresses.php +++ b/addresses.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajax-tab.php b/admin-dev/ajax-tab.php index c92a2383d..d3b865930 100755 --- a/admin-dev/ajax-tab.php +++ b/admin-dev/ajax-tab.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php index 66e6b3276..01c35c7db 100644 --- a/admin-dev/ajax.php +++ b/admin-dev/ajax.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajax_products_list.php b/admin-dev/ajax_products_list.php index 9bd8a159b..f3c747e18 100644 --- a/admin-dev/ajax_products_list.php +++ b/admin-dev/ajax_products_list.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/inc/index.php b/admin-dev/ajaxfilemanager/inc/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/inc/index.php +++ b/admin-dev/ajaxfilemanager/inc/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/index.php b/admin-dev/ajaxfilemanager/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/index.php +++ b/admin-dev/ajaxfilemanager/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php b/admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/jscripts/edit_area/index.php b/admin-dev/ajaxfilemanager/jscripts/edit_area/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/jscripts/edit_area/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/edit_area/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php b/admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/jscripts/edit_area/reg_syntax/index.php b/admin-dev/ajaxfilemanager/jscripts/edit_area/reg_syntax/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/jscripts/edit_area/reg_syntax/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/edit_area/reg_syntax/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/jscripts/index.php b/admin-dev/ajaxfilemanager/jscripts/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/jscripts/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/langs/index.php b/admin-dev/ajaxfilemanager/langs/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/langs/index.php +++ b/admin-dev/ajaxfilemanager/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/session/index.php b/admin-dev/ajaxfilemanager/session/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/session/index.php +++ b/admin-dev/ajaxfilemanager/session/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/theme/default/css/index.php b/admin-dev/ajaxfilemanager/theme/default/css/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/theme/default/css/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/css/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/theme/default/images/action/index.php b/admin-dev/ajaxfilemanager/theme/default/images/action/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/action/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/action/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/theme/default/images/big_icon/index.php b/admin-dev/ajaxfilemanager/theme/default/images/big_icon/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/big_icon/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/big_icon/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/theme/default/images/file_type/index.php b/admin-dev/ajaxfilemanager/theme/default/images/file_type/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/file_type/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/file_type/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/theme/default/images/index.php b/admin-dev/ajaxfilemanager/theme/default/images/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/theme/default/images/pagination/index.php b/admin-dev/ajaxfilemanager/theme/default/images/pagination/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/pagination/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/pagination/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/theme/default/images/standard/index.php b/admin-dev/ajaxfilemanager/theme/default/images/standard/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/standard/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/standard/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/theme/default/index.php b/admin-dev/ajaxfilemanager/theme/default/index.php index d377b4cba..7a626751d 100644 --- a/admin-dev/ajaxfilemanager/theme/default/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/ajaxfilemanager/theme/index.php b/admin-dev/ajaxfilemanager/theme/index.php index d377b4cba..7a626751d 100644 --- a/admin-dev/ajaxfilemanager/theme/index.php +++ b/admin-dev/ajaxfilemanager/theme/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/autoupgrade/index.php b/admin-dev/autoupgrade/index.php index d11b574fe..4c1db9e4c 100644 --- a/admin-dev/autoupgrade/index.php +++ b/admin-dev/autoupgrade/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/backup.php b/admin-dev/backup.php index 97d588ff9..bf13d08ad 100644 --- a/admin-dev/backup.php +++ b/admin-dev/backup.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/backups/index.php b/admin-dev/backups/index.php index 60bc2ce27..88e934d59 100644 --- a/admin-dev/backups/index.php +++ b/admin-dev/backups/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/cron_currency_rates.php b/admin-dev/cron_currency_rates.php index 0e83921a7..36015d7e5 100644 --- a/admin-dev/cron_currency_rates.php +++ b/admin-dev/cron_currency_rates.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/displayImage.php b/admin-dev/displayImage.php index 2a2cfda2f..17ac32918 100644 --- a/admin-dev/displayImage.php +++ b/admin-dev/displayImage.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/drawer.php b/admin-dev/drawer.php index 3d20711e6..6d6c78384 100644 --- a/admin-dev/drawer.php +++ b/admin-dev/drawer.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/export/index.php b/admin-dev/export/index.php index 60bc2ce27..88e934d59 100644 --- a/admin-dev/export/index.php +++ b/admin-dev/export/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/footer.inc.php b/admin-dev/footer.inc.php index 94f238f9b..e41c93db3 100644 --- a/admin-dev/footer.inc.php +++ b/admin-dev/footer.inc.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/functions.php b/admin-dev/functions.php index 8e92616a0..a79749b62 100644 --- a/admin-dev/functions.php +++ b/admin-dev/functions.php @@ -20,7 +20,6 @@ * * @author 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 */ @@ -105,8 +104,8 @@ function rewriteSettingsFile($baseUrls = NULL, $theme = NULL, $arrayDB = NULL) $content = " $value) $content .= 'define(\''.$k.'\', \''.addslashes($value).'\');'."\n"; - $content .= "\n?>"; - if ($fd = @fopen(_PS_ADMIN_DIR_.'/../config/settings.inc.php', 'w')) + copy(_PS_ADMIN_DIR_.'/../config/settings.inc.php', _PS_ADMIN_DIR_.'/../config/settings.old.php'); + if ($fd = fopen(_PS_ADMIN_DIR_.'/../config/settings.inc.php', 'w')) { fwrite($fd, $content); fclose($fd); diff --git a/admin-dev/get-file-admin.php b/admin-dev/get-file-admin.php index 8692b266e..bc9e28e82 100644 --- a/admin-dev/get-file-admin.php +++ b/admin-dev/get-file-admin.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/grider.php b/admin-dev/grider.php index ff9dc8026..4fffad24a 100644 --- a/admin-dev/grider.php +++ b/admin-dev/grider.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/header.inc.php b/admin-dev/header.inc.php index 8f2b272c4..0f92567d4 100644 --- a/admin-dev/header.inc.php +++ b/admin-dev/header.inc.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/import/index.php b/admin-dev/import/index.php index 60bc2ce27..88e934d59 100644 --- a/admin-dev/import/index.php +++ b/admin-dev/import/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/index.php b/admin-dev/index.php index 0f92fbc54..434381128 100644 --- a/admin-dev/index.php +++ b/admin-dev/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/init.php b/admin-dev/init.php index 2dbefa1ac..251a7de65 100644 --- a/admin-dev/init.php +++ b/admin-dev/init.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/login.php b/admin-dev/login.php index 6d0d746c0..b391ae5b9 100644 --- a/admin-dev/login.php +++ b/admin-dev/login.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/password.php b/admin-dev/password.php index b32d5779b..292f1cce5 100644 --- a/admin-dev/password.php +++ b/admin-dev/password.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/pdf.php b/admin-dev/pdf.php index 1ce614865..50f2f772c 100644 --- a/admin-dev/pdf.php +++ b/admin-dev/pdf.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/searchcron.php b/admin-dev/searchcron.php index 1677bd33d..ce922f1e3 100644 --- a/admin-dev/searchcron.php +++ b/admin-dev/searchcron.php @@ -20,12 +20,13 @@ * * @author 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 */ +define('_PS_ADMIN_DIR_', getcwd()); include(dirname(__FILE__).'/../config/config.inc.php'); +Context::getContext()->shop->setContext(Shop::CONTEXT_ALL); if (substr(_COOKIE_KEY_, 34, 8) != Tools::getValue('token')) die; diff --git a/admin-dev/tabs/index.php b/admin-dev/tabs/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/tabs/index.php +++ b/admin-dev/tabs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index 3f548a1eb..6af3dd8d4 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -213,6 +213,7 @@ a.module_toggle_all{color: #268CCD;} .toolbarBox .process-icon-new-url { background-image: url('../img/process-icon-new-url.png');} .toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png');} .toolbarBox .process-icon-save-and-preview { background-image: url('../img/process-icon-preview.png');} +.toolbarBox .process-icon-import { background-image: url('../img/process-icon-export-csv.png');} .toolbarBox .process-icon-export { background-image: url('../img/process-icon-export-csv.png');} .toolbarBox .process-icon-export-all { background-image: url('../img/process-icon-export-csv-details.png');} .toolbarBox .process-icon-export-stock-state-quantities-csv { background-image: url('../img/process-icon-export-csv.png');} diff --git a/admin-dev/themes/default/css/index.php b/admin-dev/themes/default/css/index.php index 20a9e8b6f..ec45b2dfe 100755 --- a/admin-dev/themes/default/css/index.php +++ b/admin-dev/themes/default/css/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/img/index.php b/admin-dev/themes/default/img/index.php index 20a9e8b6f..ec45b2dfe 100755 --- a/admin-dev/themes/default/img/index.php +++ b/admin-dev/themes/default/img/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/img/process-icon-import.png b/admin-dev/themes/default/img/process-icon-import.png new file mode 100644 index 000000000..4ce1583b1 Binary files /dev/null and b/admin-dev/themes/default/img/process-icon-import.png differ diff --git a/admin-dev/themes/default/index.php b/admin-dev/themes/default/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/admin-dev/themes/default/index.php +++ b/admin-dev/themes/default/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/content.tpl b/admin-dev/themes/default/template/content.tpl index 210d4689f..731e612dd 100644 --- a/admin-dev/themes/default/template/content.tpl +++ b/admin-dev/themes/default/template/content.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl index 36d1f4e0e..395075159 100644 --- a/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/access/helpers/form/index.php b/admin-dev/themes/default/template/controllers/access/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/access/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/access/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/access/helpers/index.php b/admin-dev/themes/default/template/controllers/access/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/access/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/access/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/access/index.php b/admin-dev/themes/default/template/controllers/access/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/access/index.php +++ b/admin-dev/themes/default/template/controllers/access/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/addons_catalog/content.tpl b/admin-dev/themes/default/template/controllers/addons_catalog/content.tpl index 4f272029c..88b1e19b2 100644 --- a/admin-dev/themes/default/template/controllers/addons_catalog/content.tpl +++ b/admin-dev/themes/default/template/controllers/addons_catalog/content.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/addons_catalog/index.php b/admin-dev/themes/default/template/controllers/addons_catalog/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/addons_catalog/index.php +++ b/admin-dev/themes/default/template/controllers/addons_catalog/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl index 12f05aa0c..b68f5d043 100644 --- a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/form/index.php b/admin-dev/themes/default/template/controllers/addresses/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/addresses/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/addresses/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/index.php b/admin-dev/themes/default/template/controllers/addresses/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/addresses/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/addresses/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/list/index.php b/admin-dev/themes/default/template/controllers/addresses/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/addresses/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/addresses/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/addresses/helpers/list/list_header.tpl index 9400b6a9a..ef9e05328 100644 --- a/admin-dev/themes/default/template/controllers/addresses/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/addresses/helpers/list/list_header.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/addresses/index.php b/admin-dev/themes/default/template/controllers/addresses/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/addresses/index.php +++ b/admin-dev/themes/default/template/controllers/addresses/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/attachments/index.php b/admin-dev/themes/default/template/controllers/attachments/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/attachments/index.php +++ b/admin-dev/themes/default/template/controllers/attachments/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/attachments/list_action_delete.tpl b/admin-dev/themes/default/template/controllers/attachments/list_action_delete.tpl index dbb0862aa..8a791fd1e 100644 --- a/admin-dev/themes/default/template/controllers/attachments/list_action_delete.tpl +++ b/admin-dev/themes/default/template/controllers/attachments/list_action_delete.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl index 153fe7c0b..c528e0682 100644 --- a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl +++ b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/attribute_generator/index.php b/admin-dev/themes/default/template/controllers/attribute_generator/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/attribute_generator/index.php +++ b/admin-dev/themes/default/template/controllers/attribute_generator/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl index a1a847635..223dd2efb 100644 --- a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/form/index.php b/admin-dev/themes/default/template/controllers/attributes/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/attributes/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/attributes/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/index.php b/admin-dev/themes/default/template/controllers/attributes/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/attributes/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/attributes/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/list/index.php b/admin-dev/themes/default/template/controllers/attributes/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/attributes/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/attributes/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl b/admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl index f9d43084c..82c4ab594 100644 --- a/admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl +++ b/admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/attributes/index.php b/admin-dev/themes/default/template/controllers/attributes/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/attributes/index.php +++ b/admin-dev/themes/default/template/controllers/attributes/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl index 7072c440d..177b0dba8 100644 --- a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/index.php b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/index.php b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/index.php b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/list_header.tpl index ffe48dd32..fb1241629 100644 --- a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/list_header.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/index.php b/admin-dev/themes/default/template/controllers/attributes_groups/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/attributes_groups/index.php +++ b/admin-dev/themes/default/template/controllers/attributes_groups/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/backup/download/index.php b/admin-dev/themes/default/template/controllers/backup/download/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/backup/download/index.php +++ b/admin-dev/themes/default/template/controllers/backup/download/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/backup/download/view.tpl b/admin-dev/themes/default/template/controllers/backup/download/view.tpl index de5351434..b668bcee9 100644 --- a/admin-dev/themes/default/template/controllers/backup/download/view.tpl +++ b/admin-dev/themes/default/template/controllers/backup/download/view.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/backup/helpers/index.php b/admin-dev/themes/default/template/controllers/backup/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/backup/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/backup/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/backup/helpers/list/index.php b/admin-dev/themes/default/template/controllers/backup/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/backup/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/backup/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl index 162072058..f260b4a54 100644 --- a/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/backup/helpers/view/index.php b/admin-dev/themes/default/template/controllers/backup/helpers/view/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/backup/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/backup/helpers/view/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl index 35725b933..2f38441fe 100644 --- a/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/backup/index.php b/admin-dev/themes/default/template/controllers/backup/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/backup/index.php +++ b/admin-dev/themes/default/template/controllers/backup/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl index fadf161ac..0f29b842c 100644 --- a/admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/carriers/helpers/form/index.php b/admin-dev/themes/default/template/controllers/carriers/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/carriers/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/carriers/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/carriers/helpers/index.php b/admin-dev/themes/default/template/controllers/carriers/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/carriers/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/carriers/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/carriers/index.php b/admin-dev/themes/default/template/controllers/carriers/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/carriers/index.php +++ b/admin-dev/themes/default/template/controllers/carriers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.js b/admin-dev/themes/default/template/controllers/cart_rules/form.js index 523939095..5a426fb4e 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/form.js +++ b/admin-dev/themes/default/template/controllers/cart_rules/form.js @@ -19,7 +19,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/cart_rules/helpers/index.php b/admin-dev/themes/default/template/controllers/cart_rules/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/cart_rules/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/index.php b/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/list_header.tpl index ce7f479bf..29e706c33 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/list_header.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/cart_rules/index.php b/admin-dev/themes/default/template/controllers/cart_rules/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/index.php +++ b/admin-dev/themes/default/template/controllers/cart_rules/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl index de1b93b60..45e17277e 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl @@ -24,6 +24,18 @@ {l s='(Click to generate random code)'}

{l s='Caution! The rule will automatically be applied if you leave this field blank.'}

+ +
+    + getFieldValue($currentObject, 'highlight')|intval}checked="checked"{/if} /> + +    + getFieldValue($currentObject, 'highlight')|intval}checked="checked"{/if} /> + +

+ {l s='If the voucher is not yet in the cart, it will be displayed under the cart in the cart summary.'} +

+
   diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/index.php b/admin-dev/themes/default/template/controllers/carts/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/carts/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/carts/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/view/index.php b/admin-dev/themes/default/template/controllers/carts/helpers/view/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/carts/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/carts/helpers/view/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl index baa6a93f2..0d15aa3a8 100755 --- a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/carts/index.php b/admin-dev/themes/default/template/controllers/carts/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/carts/index.php +++ b/admin-dev/themes/default/template/controllers/carts/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl index 96fc46050..ee35a72d0 100644 --- a/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/form/index.php b/admin-dev/themes/default/template/controllers/categories/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/categories/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/categories/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/index.php b/admin-dev/themes/default/template/controllers/categories/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/categories/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/categories/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/list/index.php b/admin-dev/themes/default/template/controllers/categories/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/categories/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/categories/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl index 845c60066..c2cc39d0f 100644 --- a/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/categories/index.php b/admin-dev/themes/default/template/controllers/categories/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/categories/index.php +++ b/admin-dev/themes/default/template/controllers/categories/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl index 2c2468a2c..8b43b1153 100644 --- a/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl @@ -19,13 +19,25 @@ * * @author 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 *} {extends file="helpers/form/form.tpl"} - +{block name="input"} + {if $input.name == "link_rewrite"} + + {$smarty.block.parent} + {else} + {$smarty.block.parent} + {/if} +{/block} {block name="script"} $(document).ready(function() { if (btn_submit.length > 0) diff --git a/admin-dev/themes/default/template/controllers/cms/helpers/form/index.php b/admin-dev/themes/default/template/controllers/cms/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/cms/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/cms/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/cms/helpers/index.php b/admin-dev/themes/default/template/controllers/cms/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/cms/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/cms/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/cms/index.php b/admin-dev/themes/default/template/controllers/cms/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/cms/index.php +++ b/admin-dev/themes/default/template/controllers/cms/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl index f18717841..7a3381f36 100644 --- a/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl @@ -19,13 +19,25 @@ * * @author 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 *} {extends file="helpers/form/form.tpl"} - +{block name="input"} + {if $input.name == "link_rewrite"} + + {$smarty.block.parent} + {else} + {$smarty.block.parent} + {/if} +{/block} {block name="input"} {if $input.type == 'select_category'} active || !$product->isAssociatedToShop()}checked="checked" {/if} /> + active || !$product->isAssociatedToShop()}checked="checked" {/if} />
  • - active && $product->isAssociatedToShop()}checked="checked"{/if} /> + active && $product->isAssociatedToShop()}checked="checked"{/if} />
    • + + + {include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""} + + + + + + {l s='404 : Not Found = Product does not exist and no redirect'}
    + {l s='301 : Moved Permanently = Product Moved Permanently'}
    + {l s='302 : Moved Temporarily = Product moved temporarily'} +     + + + + + {include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""} + + + + + +

    + + {l s='No related product'} + +

    + + {include file="controllers/products/multishop/checkbox.tpl" field="visibility" type="default"} diff --git a/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl b/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl index ae9cc3d43..67d3dc937 100644 --- a/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl +++ b/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/products/multishop/check_fields.tpl b/admin-dev/themes/default/template/controllers/products/multishop/check_fields.tpl index e0be72257..50dffff2b 100644 --- a/admin-dev/themes/default/template/controllers/products/multishop/check_fields.tpl +++ b/admin-dev/themes/default/template/controllers/products/multishop/check_fields.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @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 *} diff --git a/admin-dev/themes/default/template/controllers/products/multishop/checkbox.tpl b/admin-dev/themes/default/template/controllers/products/multishop/checkbox.tpl index 362ff030b..0e118f3be 100644 --- a/admin-dev/themes/default/template/controllers/products/multishop/checkbox.tpl +++ b/admin-dev/themes/default/template/controllers/products/multishop/checkbox.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @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 *} diff --git a/admin-dev/themes/default/template/controllers/products/multishop/index.php b/admin-dev/themes/default/template/controllers/products/multishop/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/products/multishop/index.php +++ b/admin-dev/themes/default/template/controllers/products/multishop/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/products/pack.tpl b/admin-dev/themes/default/template/controllers/products/pack.tpl index 9e0ffaca4..6913978c2 100644 --- a/admin-dev/themes/default/template/controllers/products/pack.tpl +++ b/admin-dev/themes/default/template/controllers/products/pack.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 11204 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/products/prices.tpl b/admin-dev/themes/default/template/controllers/products/prices.tpl index 69cbd8d4a..087123c60 100644 --- a/admin-dev/themes/default/template/controllers/products/prices.tpl +++ b/admin-dev/themes/default/template/controllers/products/prices.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/products/quantities.tpl b/admin-dev/themes/default/template/controllers/products/quantities.tpl index 5ee247c9f..852c15a66 100644 --- a/admin-dev/themes/default/template/controllers/products/quantities.tpl +++ b/admin-dev/themes/default/template/controllers/products/quantities.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 11069 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -27,6 +26,7 @@ {if isset($product->id)}

    {l s='Available quantities for sale'}

    + {include file="controllers/products/multishop/check_fields.tpl" product_tab="Quantities"}

    {l s='This interface allows you to manage the available quantities for sale of the current product and its combinations on the current shop.'}

    @@ -207,8 +207,11 @@ {/if} - - + + {include file="controllers/products/multishop/checkbox.tpl" field="available_now" type="default" multilang="true"} + + + {include file="controllers/products/input_text_lang.tpl" languages=$languages input_value=$product->available_now @@ -217,8 +220,11 @@ - - + + {include file="controllers/products/multishop/checkbox.tpl" field="available_later" type="default" multilang="true"} + + + {include file="controllers/products/input_text_lang.tpl" languages=$languages input_value=$product->available_later diff --git a/admin-dev/themes/default/template/controllers/products/seo.tpl b/admin-dev/themes/default/template/controllers/products/seo.tpl index f4766d4ed..dd709e71c 100644 --- a/admin-dev/themes/default/template/controllers/products/seo.tpl +++ b/admin-dev/themes/default/template/controllers/products/seo.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 11204 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/products/shipping.tpl b/admin-dev/themes/default/template/controllers/products/shipping.tpl index 9fac9f124..bfe6f09c4 100644 --- a/admin-dev/themes/default/template/controllers/products/shipping.tpl +++ b/admin-dev/themes/default/template/controllers/products/shipping.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/products/suppliers.tpl b/admin-dev/themes/default/template/controllers/products/suppliers.tpl index d6ec9ec1a..fac301e8a 100644 --- a/admin-dev/themes/default/template/controllers/products/suppliers.tpl +++ b/admin-dev/themes/default/template/controllers/products/suppliers.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 11069 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/products/textarea_lang.tpl b/admin-dev/themes/default/template/controllers/products/textarea_lang.tpl index 26eedb665..c79816de4 100644 --- a/admin-dev/themes/default/template/controllers/products/textarea_lang.tpl +++ b/admin-dev/themes/default/template/controllers/products/textarea_lang.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl index c76d32b21..0e203d424 100644 --- a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl +++ b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 11204 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/products/warehouses.tpl b/admin-dev/themes/default/template/controllers/products/warehouses.tpl index 2c218035f..3c892c4f7 100644 --- a/admin-dev/themes/default/template/controllers/products/warehouses.tpl +++ b/admin-dev/themes/default/template/controllers/products/warehouses.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 11069 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/referrers/calendar.tpl b/admin-dev/themes/default/template/controllers/referrers/calendar.tpl index fe2ed9cbc..8686c2433 100644 --- a/admin-dev/themes/default/template/controllers/referrers/calendar.tpl +++ b/admin-dev/themes/default/template/controllers/referrers/calendar.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl b/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl index a173b7770..a83da06ae 100644 --- a/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl +++ b/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl index 8988bfc8f..6f3d1c991 100644 --- a/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9795 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/form/index.php b/admin-dev/themes/default/template/controllers/referrers/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/referrers/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/referrers/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/index.php b/admin-dev/themes/default/template/controllers/referrers/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/referrers/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/referrers/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/list/index.php b/admin-dev/themes/default/template/controllers/referrers/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/referrers/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/referrers/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/list/list_header.tpl index 3c9e1db8e..eab26dcea 100644 --- a/admin-dev/themes/default/template/controllers/referrers/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/referrers/helpers/list/list_header.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/view/index.php b/admin-dev/themes/default/template/controllers/referrers/helpers/view/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/referrers/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/referrers/helpers/view/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl index 34578552e..256448580 100644 --- a/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/referrers/index.php b/admin-dev/themes/default/template/controllers/referrers/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/referrers/index.php +++ b/admin-dev/themes/default/template/controllers/referrers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl index 18461f935..0251ba6b0 100644 --- a/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/request_sql/helpers/form/index.php b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/request_sql/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/request_sql/helpers/index.php b/admin-dev/themes/default/template/controllers/request_sql/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/request_sql/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/request_sql/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/request_sql/helpers/view/index.php b/admin-dev/themes/default/template/controllers/request_sql/helpers/view/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/request_sql/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/request_sql/helpers/view/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/request_sql/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/request_sql/helpers/view/view.tpl index 610a4b634..4377120b7 100644 --- a/admin-dev/themes/default/template/controllers/request_sql/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/request_sql/helpers/view/view.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/request_sql/index.php b/admin-dev/themes/default/template/controllers/request_sql/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/request_sql/index.php +++ b/admin-dev/themes/default/template/controllers/request_sql/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/request_sql/list_action_export.tpl b/admin-dev/themes/default/template/controllers/request_sql/list_action_export.tpl index d3590535e..38fae8a6e 100644 --- a/admin-dev/themes/default/template/controllers/request_sql/list_action_export.tpl +++ b/admin-dev/themes/default/template/controllers/request_sql/list_action_export.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl index 1d9d6510b..ad5c94fd2 100644 --- a/admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/return/helpers/form/index.php b/admin-dev/themes/default/template/controllers/return/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/return/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/return/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/return/helpers/index.php b/admin-dev/themes/default/template/controllers/return/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/return/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/return/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/return/index.php b/admin-dev/themes/default/template/controllers/return/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/return/index.php +++ b/admin-dev/themes/default/template/controllers/return/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/scenes/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/scenes/helpers/form/form.tpl index 72f5ec648..79a37dc51 100644 --- a/admin-dev/themes/default/template/controllers/scenes/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/scenes/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/scenes/helpers/form/index.php b/admin-dev/themes/default/template/controllers/scenes/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/scenes/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/scenes/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/scenes/helpers/index.php b/admin-dev/themes/default/template/controllers/scenes/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/scenes/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/scenes/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/scenes/index.php b/admin-dev/themes/default/template/controllers/scenes/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/scenes/index.php +++ b/admin-dev/themes/default/template/controllers/scenes/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/search/helpers/index.php b/admin-dev/themes/default/template/controllers/search/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/search/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/search/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/search/helpers/view/index.php b/admin-dev/themes/default/template/controllers/search/helpers/view/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/search/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/search/helpers/view/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl index 316f4c03a..3917e511a 100644 --- a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl @@ -19,7 +19,6 @@ * * @author 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 *} @@ -41,7 +40,7 @@ $(function() { {else}

    {l s='Features matching your query'} : {$query}

    - {foreach $features key=key item=feature } + {foreach $features key=key item=feature} {foreach $feature key=k item=val name=feature_list} @@ -55,13 +54,29 @@ $(function() {
     
    {/if} {/if} +{if isset($modules)} + {if !$modules} +

    {l s='No modules matching your query'} : {$query}

    + {else} +

    {l s='Modules matching your query'} : {$query}

    +
    {if $smarty.foreach.feature_list.first}{$key}{/if}
    + {foreach $modules key=key item=module} + + + + + {/foreach} +
    {$module->displayName}{$module->description}
    +
     
    + {/if} +{/if} {if isset($categories)} {if !$categories}

    {l s='No categories matching your query'} : {$query}

    {else}

    {l s='Categories matching your query'} : {$query}

    - {foreach $categories key=key item=category } + {foreach $categories key=key item=category} diff --git a/admin-dev/themes/default/template/controllers/search/index.php b/admin-dev/themes/default/template/controllers/search/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/search/index.php +++ b/admin-dev/themes/default/template/controllers/search/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/shipping/content.tpl b/admin-dev/themes/default/template/controllers/shipping/content.tpl index 9f987c54d..01b9d17be 100644 --- a/admin-dev/themes/default/template/controllers/shipping/content.tpl +++ b/admin-dev/themes/default/template/controllers/shipping/content.tpl @@ -19,7 +19,6 @@ * * @author 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 *} @@ -78,7 +77,7 @@ type="text" class="fees_{$range[$rangeIdentifier]}" onchange="this.value = this.value.replace(/,/g, \'.\');" name="fees_{$zone['id_zone']}_{$range[$rangeIdentifier]}" onkeyup="clearAllFees({$range[$rangeIdentifier]})" - value="{$price|string_format:"%.2f"}" + value="{$price|string_format:"%.6f"}" style="width: 45px;" /> {$currency->getSign('right')} {l s='(tax excl.)'} diff --git a/admin-dev/themes/default/template/controllers/shipping/index.php b/admin-dev/themes/default/template/controllers/shipping/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/shipping/index.php +++ b/admin-dev/themes/default/template/controllers/shipping/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/shop/content.tpl b/admin-dev/themes/default/template/controllers/shop/content.tpl index 37fcaa94b..0ad7cb462 100644 --- a/admin-dev/themes/default/template/controllers/shop/content.tpl +++ b/admin-dev/themes/default/template/controllers/shop/content.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14740 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl index cb43c89d0..1f812981f 100644 --- a/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} @@ -120,10 +119,16 @@ {/foreach} $(document).ready(function() { $('input[name=useImportData]').click(function() { - if ($(this).attr('id') == 'useImportData_on') - $('#shop_list, #data_list').slideDown('slow'); - else - $('#shop_list, #data_list').slideUp('slow'); + if ($(this).attr('id') == 'useImportData_on') + { + $('input[name^="importData["]').prop('checked', true); + $('#shop_list, #data_list').slideDown('slow'); + } + else + { + $('input[name^="importData["]').prop('checked', false); + $('#shop_list, #data_list').slideUp('slow'); + } }); $('#id_category, #importFromShop').change(function(){ shop_id = $('#importFromShop').val(); diff --git a/admin-dev/themes/default/template/controllers/shop/helpers/form/index.php b/admin-dev/themes/default/template/controllers/shop/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/shop/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/shop/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/shop/helpers/index.php b/admin-dev/themes/default/template/controllers/shop/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/shop/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/shop/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/shop/helpers/list/index.php b/admin-dev/themes/default/template/controllers/shop/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/shop/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/shop/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/shop/helpers/list/list_action_delete.tpl b/admin-dev/themes/default/template/controllers/shop/helpers/list/list_action_delete.tpl index b8083d1cc..9080542b2 100644 --- a/admin-dev/themes/default/template/controllers/shop/helpers/list/list_action_delete.tpl +++ b/admin-dev/themes/default/template/controllers/shop/helpers/list/list_action_delete.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/shop/helpers/list/list_content.tpl b/admin-dev/themes/default/template/controllers/shop/helpers/list/list_content.tpl index 008271889..a2f32493f 100644 --- a/admin-dev/themes/default/template/controllers/shop/helpers/list/list_content.tpl +++ b/admin-dev/themes/default/template/controllers/shop/helpers/list/list_content.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/shop/index.php b/admin-dev/themes/default/template/controllers/shop/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/shop/index.php +++ b/admin-dev/themes/default/template/controllers/shop/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/shop/tree.tpl b/admin-dev/themes/default/template/controllers/shop/tree.tpl index 633ef1b9b..a778665f6 100644 --- a/admin-dev/themes/default/template/controllers/shop/tree.tpl +++ b/admin-dev/themes/default/template/controllers/shop/tree.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14740 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/shop_group/content.tpl b/admin-dev/themes/default/template/controllers/shop_group/content.tpl index c364b671b..4cebfa51a 100644 --- a/admin-dev/themes/default/template/controllers/shop_group/content.tpl +++ b/admin-dev/themes/default/template/controllers/shop_group/content.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14740 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/shop_group/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/shop_group/helpers/form/form.tpl index 39faab89b..415b2f36c 100644 --- a/admin-dev/themes/default/template/controllers/shop_group/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/shop_group/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/shop_group/helpers/form/index.php b/admin-dev/themes/default/template/controllers/shop_group/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/shop_group/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/shop_group/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/shop_group/helpers/index.php b/admin-dev/themes/default/template/controllers/shop_group/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/shop_group/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/shop_group/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/shop_group/index.php b/admin-dev/themes/default/template/controllers/shop_group/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/shop_group/index.php +++ b/admin-dev/themes/default/template/controllers/shop_group/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/shop_url/content.tpl b/admin-dev/themes/default/template/controllers/shop_url/content.tpl index c364b671b..4cebfa51a 100644 --- a/admin-dev/themes/default/template/controllers/shop_url/content.tpl +++ b/admin-dev/themes/default/template/controllers/shop_url/content.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14740 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/shop_url/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/shop_url/helpers/form/form.tpl index 013be1c54..1a7edeba8 100644 --- a/admin-dev/themes/default/template/controllers/shop_url/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/shop_url/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/shop_url/helpers/form/index.php b/admin-dev/themes/default/template/controllers/shop_url/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/shop_url/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/shop_url/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/shop_url/helpers/index.php b/admin-dev/themes/default/template/controllers/shop_url/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/shop_url/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/shop_url/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/shop_url/helpers/list/index.php b/admin-dev/themes/default/template/controllers/shop_url/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/shop_url/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/shop_url/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/shop_url/helpers/list/list_content.tpl b/admin-dev/themes/default/template/controllers/shop_url/helpers/list/list_content.tpl index 75b037c60..9eee1c3e6 100644 --- a/admin-dev/themes/default/template/controllers/shop_url/helpers/list/list_content.tpl +++ b/admin-dev/themes/default/template/controllers/shop_url/helpers/list/list_content.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/shop_url/index.php b/admin-dev/themes/default/template/controllers/shop_url/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/shop_url/index.php +++ b/admin-dev/themes/default/template/controllers/shop_url/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/slip/_print_pdf_icon.tpl b/admin-dev/themes/default/template/controllers/slip/_print_pdf_icon.tpl index 3d5e614a6..3153667f8 100755 --- a/admin-dev/themes/default/template/controllers/slip/_print_pdf_icon.tpl +++ b/admin-dev/themes/default/template/controllers/slip/_print_pdf_icon.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9589 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/slip/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/slip/helpers/form/form.tpl index 0f8779444..126718103 100644 --- a/admin-dev/themes/default/template/controllers/slip/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/slip/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/slip/helpers/form/index.php b/admin-dev/themes/default/template/controllers/slip/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/slip/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/slip/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/slip/helpers/index.php b/admin-dev/themes/default/template/controllers/slip/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/slip/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/slip/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/slip/index.php b/admin-dev/themes/default/template/controllers/slip/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/slip/index.php +++ b/admin-dev/themes/default/template/controllers/slip/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl index afcee7b7b..fd9d2f6fb 100755 --- a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/index.php b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/index.php b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/specific_price_rule/index.php b/admin-dev/themes/default/template/controllers/specific_price_rule/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/specific_price_rule/index.php +++ b/admin-dev/themes/default/template/controllers/specific_price_rule/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/states/list_footer.tpl b/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl similarity index 98% rename from admin-dev/themes/default/template/controllers/states/list_footer.tpl rename to admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl index 676ec0e27..6c3c0aef7 100644 --- a/admin-dev/themes/default/template/controllers/states/list_footer.tpl +++ b/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/states/index.php b/admin-dev/themes/default/template/controllers/states/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/states/index.php +++ b/admin-dev/themes/default/template/controllers/states/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stats/calendar.tpl b/admin-dev/themes/default/template/controllers/stats/calendar.tpl index 9c7742e0a..4d71ef530 100644 --- a/admin-dev/themes/default/template/controllers/stats/calendar.tpl +++ b/admin-dev/themes/default/template/controllers/stats/calendar.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/stats/engines.tpl b/admin-dev/themes/default/template/controllers/stats/engines.tpl index 8600163ca..41710c7ed 100644 --- a/admin-dev/themes/default/template/controllers/stats/engines.tpl +++ b/admin-dev/themes/default/template/controllers/stats/engines.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/stats/helpers/index.php b/admin-dev/themes/default/template/controllers/stats/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/stats/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/stats/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stats/helpers/view/index.php b/admin-dev/themes/default/template/controllers/stats/helpers/view/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/stats/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/stats/helpers/view/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stats/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/stats/helpers/view/view.tpl index 99cfe2bd0..3f4ea41ff 100644 --- a/admin-dev/themes/default/template/controllers/stats/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/stats/helpers/view/view.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/stats/index.php b/admin-dev/themes/default/template/controllers/stats/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/stats/index.php +++ b/admin-dev/themes/default/template/controllers/stats/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stats/menu.tpl b/admin-dev/themes/default/template/controllers/stats/menu.tpl index b9d77e3b6..b3fbe8bd3 100644 --- a/admin-dev/themes/default/template/controllers/stats/menu.tpl +++ b/admin-dev/themes/default/template/controllers/stats/menu.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/stats/stats.tpl b/admin-dev/themes/default/template/controllers/stats/stats.tpl index 59e151ca1..798fcd42d 100644 --- a/admin-dev/themes/default/template/controllers/stats/stats.tpl +++ b/admin-dev/themes/default/template/controllers/stats/stats.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl index 6f18ec90a..0a352595c 100644 --- a/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/statuses/helpers/form/index.php b/admin-dev/themes/default/template/controllers/statuses/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/statuses/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/statuses/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/statuses/helpers/index.php b/admin-dev/themes/default/template/controllers/statuses/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/statuses/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/statuses/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/statuses/index.php b/admin-dev/themes/default/template/controllers/statuses/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/statuses/index.php +++ b/admin-dev/themes/default/template/controllers/statuses/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stock_cover/helpers/index.php b/admin-dev/themes/default/template/controllers/stock_cover/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/stock_cover/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/stock_cover/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/index.php b/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl index 5aeafdf77..b9cd30848 100644 --- a/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9795 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/stock_cover/index.php b/admin-dev/themes/default/template/controllers/stock_cover/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/stock_cover/index.php +++ b/admin-dev/themes/default/template/controllers/stock_cover/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/index.php b/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/index.php b/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl index cba562337..55f11b6f0 100644 --- a/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9795 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/stock_instant_state/index.php b/admin-dev/themes/default/template/controllers/stock_instant_state/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/stock_instant_state/index.php +++ b/admin-dev/themes/default/template/controllers/stock_instant_state/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stock_mvt/helpers/index.php b/admin-dev/themes/default/template/controllers/stock_mvt/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/stock_mvt/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/stock_mvt/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/index.php b/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl index 90ff60f5b..3fdc0b389 100644 --- a/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9795 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/stock_mvt/index.php b/admin-dev/themes/default/template/controllers/stock_mvt/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/stock_mvt/index.php +++ b/admin-dev/themes/default/template/controllers/stock_mvt/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl index 0f7be8c52..a33819d77 100644 --- a/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/stores/helpers/form/index.php b/admin-dev/themes/default/template/controllers/stores/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/stores/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/stores/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stores/helpers/index.php b/admin-dev/themes/default/template/controllers/stores/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/stores/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/stores/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stores/helpers/options/index.php b/admin-dev/themes/default/template/controllers/stores/helpers/options/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/stores/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/stores/helpers/options/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl index a33333afa..3c2d8dc28 100644 --- a/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/stores/index.php b/admin-dev/themes/default/template/controllers/stores/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/stores/index.php +++ b/admin-dev/themes/default/template/controllers/stores/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/suppliers/helpers/index.php b/admin-dev/themes/default/template/controllers/suppliers/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/suppliers/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/suppliers/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/suppliers/helpers/view/index.php b/admin-dev/themes/default/template/controllers/suppliers/helpers/view/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/suppliers/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/suppliers/helpers/view/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl index dc8647370..9f881fe57 100644 --- a/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/suppliers/index.php b/admin-dev/themes/default/template/controllers/suppliers/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/suppliers/index.php +++ b/admin-dev/themes/default/template/controllers/suppliers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl index d9743ce02..b2b7d6147 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9795 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/index.php b/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/index.php b/admin-dev/themes/default/template/controllers/supply_orders/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/index.php b/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl index 18c966331..7ac56c93d 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/index.php b/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl index b36bfa2ba..274f8cfbc 100755 --- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9795 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/supply_orders/index.php b/admin-dev/themes/default/template/controllers/supply_orders/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders/index.php +++ b/admin-dev/themes/default/template/controllers/supply_orders/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl index 2b970091d..b80aac9be 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/index.php b/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/index.php b/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/supply_orders_change_state/index.php b/admin-dev/themes/default/template/controllers/supply_orders_change_state/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders_change_state/index.php +++ b/admin-dev/themes/default/template/controllers/supply_orders_change_state/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/index.php b/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/list/index.php b/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/list/list_header.tpl index 4d0d0cf1a..977e21468 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/list/list_header.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 10055 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/index.php b/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/index.php +++ b/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/tags/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/tags/helpers/form/form.tpl index 2ee3a90f4..1116f35e2 100644 --- a/admin-dev/themes/default/template/controllers/tags/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/tags/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/tags/helpers/form/index.php b/admin-dev/themes/default/template/controllers/tags/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/tags/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/tags/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/tags/helpers/index.php b/admin-dev/themes/default/template/controllers/tags/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/tags/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/tags/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/tags/index.php b/admin-dev/themes/default/template/controllers/tags/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/tags/index.php +++ b/admin-dev/themes/default/template/controllers/tags/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/tax_rules/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/tax_rules/helpers/form/form.tpl index 8c8e57b15..7225bc0fa 100644 --- a/admin-dev/themes/default/template/controllers/tax_rules/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/tax_rules/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/tax_rules/helpers/form/index.php b/admin-dev/themes/default/template/controllers/tax_rules/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/tax_rules/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/tax_rules/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/tax_rules/helpers/index.php b/admin-dev/themes/default/template/controllers/tax_rules/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/tax_rules/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/tax_rules/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/index.php b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_action_edit.tpl b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_action_edit.tpl index 7bca55918..42083c32f 100644 --- a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_action_edit.tpl +++ b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_action_edit.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl index 51a81fde8..7e7a524d0 100644 --- a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl +++ b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl index 5ca79ab0b..88074cd3b 100644 --- a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/tax_rules/index.php b/admin-dev/themes/default/template/controllers/tax_rules/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/tax_rules/index.php +++ b/admin-dev/themes/default/template/controllers/tax_rules/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/tax_rules_group/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/tax_rules_group/helpers/form/form.tpl index 3a03f5063..0420ccb08 100644 --- a/admin-dev/themes/default/template/controllers/tax_rules_group/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/tax_rules_group/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/tax_rules_group/helpers/form/index.php b/admin-dev/themes/default/template/controllers/tax_rules_group/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/tax_rules_group/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/tax_rules_group/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/tax_rules_group/helpers/index.php b/admin-dev/themes/default/template/controllers/tax_rules_group/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/tax_rules_group/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/tax_rules_group/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/tax_rules_group/index.php b/admin-dev/themes/default/template/controllers/tax_rules_group/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/tax_rules_group/index.php +++ b/admin-dev/themes/default/template/controllers/tax_rules_group/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/themes/helpers/index.php b/admin-dev/themes/default/template/controllers/themes/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/themes/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/themes/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/themes/helpers/options/index.php b/admin-dev/themes/default/template/controllers/themes/helpers/options/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/themes/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/themes/helpers/options/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl index 20b0377c3..02fb828a2 100644 --- a/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9920 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/themes/index.php b/admin-dev/themes/default/template/controllers/themes/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/themes/index.php +++ b/admin-dev/themes/default/template/controllers/themes/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/tracking/helpers/index.php b/admin-dev/themes/default/template/controllers/tracking/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/tracking/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/tracking/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/tracking/helpers/list/index.php b/admin-dev/themes/default/template/controllers/tracking/helpers/list/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/tracking/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/tracking/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/tracking/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/tracking/helpers/list/list_header.tpl index 7c94e91aa..3fc3a49d4 100644 --- a/admin-dev/themes/default/template/controllers/tracking/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/tracking/helpers/list/list_header.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/tracking/index.php b/admin-dev/themes/default/template/controllers/tracking/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/tracking/index.php +++ b/admin-dev/themes/default/template/controllers/tracking/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/translations/auto_translate.tpl b/admin-dev/themes/default/template/controllers/translations/auto_translate.tpl index 24f175c20..f4d8b4788 100644 --- a/admin-dev/themes/default/template/controllers/translations/auto_translate.tpl +++ b/admin-dev/themes/default/template/controllers/translations/auto_translate.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/index.php b/admin-dev/themes/default/template/controllers/translations/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/translations/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/translations/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/index.php b/admin-dev/themes/default/template/controllers/translations/helpers/view/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/translations/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl index dc3d9f1dd..23f20329d 100644 --- a/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl +++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl index 6287b435a..56267f0dd 100644 --- a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl +++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl index aa4f4a1d9..fea1a67e1 100644 --- a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl +++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl index 25fedcfe8..c5c28d953 100644 --- a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl +++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl index 9032609b0..ba6075252 100644 --- a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl +++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/translations/index.php b/admin-dev/themes/default/template/controllers/translations/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/translations/index.php +++ b/admin-dev/themes/default/template/controllers/translations/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/warehouses/helpers/index.php b/admin-dev/themes/default/template/controllers/warehouses/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/warehouses/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/warehouses/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/warehouses/helpers/view/index.php b/admin-dev/themes/default/template/controllers/warehouses/helpers/view/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/warehouses/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/warehouses/helpers/view/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl index 7a3a95299..b85ea0371 100644 --- a/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/warehouses/index.php b/admin-dev/themes/default/template/controllers/warehouses/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/warehouses/index.php +++ b/admin-dev/themes/default/template/controllers/warehouses/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/webservice/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/webservice/helpers/form/form.tpl index 5c949bb28..24c440845 100644 --- a/admin-dev/themes/default/template/controllers/webservice/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/webservice/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/controllers/webservice/helpers/form/index.php b/admin-dev/themes/default/template/controllers/webservice/helpers/form/index.php index 52007a42a..8e4de11e4 100644 --- a/admin-dev/themes/default/template/controllers/webservice/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/webservice/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/webservice/helpers/index.php b/admin-dev/themes/default/template/controllers/webservice/helpers/index.php index 63e0af4de..b4a66917e 100644 --- a/admin-dev/themes/default/template/controllers/webservice/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/webservice/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/controllers/webservice/index.php b/admin-dev/themes/default/template/controllers/webservice/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/controllers/webservice/index.php +++ b/admin-dev/themes/default/template/controllers/webservice/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/footer.tpl b/admin-dev/themes/default/template/footer.tpl index d7fed1ae1..7953dc1d5 100644 --- a/admin-dev/themes/default/template/footer.tpl +++ b/admin-dev/themes/default/template/footer.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/form_submit_ajax.tpl b/admin-dev/themes/default/template/form_submit_ajax.tpl index c2dca2c11..c59f6e012 100644 --- a/admin-dev/themes/default/template/form_submit_ajax.tpl +++ b/admin-dev/themes/default/template/form_submit_ajax.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl index 20cb2289c..a4bd6b25d 100644 --- a/admin-dev/themes/default/template/header.tpl +++ b/admin-dev/themes/default/template/header.tpl @@ -19,7 +19,6 @@ * * @author 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 *} @@ -169,6 +168,7 @@ + diff --git a/admin-dev/themes/default/template/helpers/form/assoshop.tpl b/admin-dev/themes/default/template/helpers/form/assoshop.tpl index 45cf60cf9..ff1d3f9d8 100644 --- a/admin-dev/themes/default/template/helpers/form/assoshop.tpl +++ b/admin-dev/themes/default/template/helpers/form/assoshop.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl index d562c3165..86d6a63c0 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -19,7 +19,6 @@ * * @author 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 *} @@ -60,7 +59,7 @@
    {block name="input"} {if $input.type == 'text' || $input.type == 'tags'} - {if isset($input.lang)} + {if isset($input.lang) AND $input.lang}
    {foreach $languages as $language}
    @@ -209,7 +208,7 @@ {if isset($value.p) && $value.p}

    {$value.p}

    {/if} {/foreach} {elseif $input.type == 'textarea'} - {if isset($input.lang)} + {if isset($input.lang) AND $input.lang}
    {foreach $languages as $language}
    diff --git a/admin-dev/themes/default/template/helpers/form/form_category.tpl b/admin-dev/themes/default/template/helpers/form/form_category.tpl index d6915f9a3..e46be38b2 100644 --- a/admin-dev/themes/default/template/helpers/form/form_category.tpl +++ b/admin-dev/themes/default/template/helpers/form/form_category.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/form/form_group.tpl b/admin-dev/themes/default/template/helpers/form/form_group.tpl index a864426a7..38face12b 100644 --- a/admin-dev/themes/default/template/helpers/form/form_group.tpl +++ b/admin-dev/themes/default/template/helpers/form/form_group.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/form/index.php b/admin-dev/themes/default/template/helpers/form/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/helpers/form/index.php +++ b/admin-dev/themes/default/template/helpers/form/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/helpers/help_access/index.php b/admin-dev/themes/default/template/helpers/help_access/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/helpers/help_access/index.php +++ b/admin-dev/themes/default/template/helpers/help_access/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/helpers/index.php b/admin-dev/themes/default/template/helpers/index.php index f18b9ff6e..c8e76a5e8 100644 --- a/admin-dev/themes/default/template/helpers/index.php +++ b/admin-dev/themes/default/template/helpers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/helpers/list/index.php b/admin-dev/themes/default/template/helpers/list/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/helpers/list/index.php +++ b/admin-dev/themes/default/template/helpers/list/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/helpers/list/list.tpl b/admin-dev/themes/default/template/helpers/list/list.tpl index 9c9fe40ff..5d19e0acd 100644 --- a/admin-dev/themes/default/template/helpers/list/list.tpl +++ b/admin-dev/themes/default/template/helpers/list/list.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl b/admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl index 7d63b237f..be47ecf09 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_default.tpl b/admin-dev/themes/default/template/helpers/list/list_action_default.tpl index c59ad102d..29c4e69ce 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_default.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_default.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl b/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl index 529511536..42130d3d3 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_details.tpl b/admin-dev/themes/default/template/helpers/list/list_action_details.tpl index abeea1456..8220a3c4c 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_details.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_details.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9597 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl b/admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl index 603022ba7..7f58faa48 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_edit.tpl b/admin-dev/themes/default/template/helpers/list/list_action_edit.tpl index 88abfc8e6..ce21fce1a 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_edit.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_edit.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_enable.tpl b/admin-dev/themes/default/template/helpers/list/list_action_enable.tpl index 53de78d7b..d408217de 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_enable.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_enable.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl b/admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl index e67e30368..796e15b82 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl index badc535fe..801f21c6e 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl index 9a0b537b7..8c200bda5 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl index 15442321e..9de56c9a1 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl index 131aa1c30..801f21c6e 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9930 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl b/admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl index 21eece4f9..f7711bdd6 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_view.tpl b/admin-dev/themes/default/template/helpers/list/list_action_view.tpl index 4a10be1e5..1ad9c4fe2 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_view.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_view.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_content.tpl b/admin-dev/themes/default/template/helpers/list/list_content.tpl index a17de7de2..c7555753d 100644 --- a/admin-dev/themes/default/template/helpers/list/list_content.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/helpers/list/list_footer.tpl index f614ca500..4137cba8b 100644 --- a/admin-dev/themes/default/template/helpers/list/list_footer.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_footer.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl index f13fdcf83..a1b7b5715 100644 --- a/admin-dev/themes/default/template/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/helpers/options/index.php b/admin-dev/themes/default/template/helpers/options/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/helpers/options/index.php +++ b/admin-dev/themes/default/template/helpers/options/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl index 6cd0eadfb..efbc3e0d4 100644 --- a/admin-dev/themes/default/template/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/helpers/options/options.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9548 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -124,6 +123,15 @@ {$field['title']}
    {/if} + {elseif $field['type'] == 'color'} + {elseif $field['type'] == 'price'} {$currency_left_sign}{$currency_right_sign} {l s='(tax excl.)'} {elseif $field['type'] == 'textLang' || $field['type'] == 'textareaLang' || $field['type'] == 'selectLang'} diff --git a/admin-dev/themes/default/template/helpers/required_fields.tpl b/admin-dev/themes/default/template/helpers/required_fields.tpl index 21f0d1fca..e628fdf14 100644 --- a/admin-dev/themes/default/template/helpers/required_fields.tpl +++ b/admin-dev/themes/default/template/helpers/required_fields.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 11256 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/helpers/view/index.php b/admin-dev/themes/default/template/helpers/view/index.php index 6644723cb..3d0287ee8 100644 --- a/admin-dev/themes/default/template/helpers/view/index.php +++ b/admin-dev/themes/default/template/helpers/view/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/helpers/view/view.tpl b/admin-dev/themes/default/template/helpers/view/view.tpl index 0fda6f5dc..1988f3162 100644 --- a/admin-dev/themes/default/template/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/helpers/view/view.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/index.php b/admin-dev/themes/default/template/index.php index d377b4cba..7a626751d 100644 --- a/admin-dev/themes/default/template/index.php +++ b/admin-dev/themes/default/template/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/themes/default/template/invalid_token.tpl b/admin-dev/themes/default/template/invalid_token.tpl index 45907d884..e0fa97961 100644 --- a/admin-dev/themes/default/template/invalid_token.tpl +++ b/admin-dev/themes/default/template/invalid_token.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/layout-ajax.tpl b/admin-dev/themes/default/template/layout-ajax.tpl index 2e7069acd..0fa192493 100644 --- a/admin-dev/themes/default/template/layout-ajax.tpl +++ b/admin-dev/themes/default/template/layout-ajax.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/layout.tpl b/admin-dev/themes/default/template/layout.tpl index d4607ae5a..9551a83a4 100644 --- a/admin-dev/themes/default/template/layout.tpl +++ b/admin-dev/themes/default/template/layout.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/default/template/toolbar.tpl b/admin-dev/themes/default/template/toolbar.tpl index 8fa40388b..b9b5742f5 100644 --- a/admin-dev/themes/default/template/toolbar.tpl +++ b/admin-dev/themes/default/template/toolbar.tpl @@ -19,7 +19,6 @@ * * @author 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 *} diff --git a/admin-dev/themes/index.php b/admin-dev/themes/index.php index d377b4cba..7a626751d 100644 --- a/admin-dev/themes/index.php +++ b/admin-dev/themes/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/uploadProductFile.php b/admin-dev/uploadProductFile.php index 8b1d264a7..0824d6851 100644 --- a/admin-dev/uploadProductFile.php +++ b/admin-dev/uploadProductFile.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/admin-dev/uploadProductFileAttribute.php b/admin-dev/uploadProductFileAttribute.php index 75ba928b6..65aa87d81 100644 --- a/admin-dev/uploadProductFileAttribute.php +++ b/admin-dev/uploadProductFileAttribute.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/attachment.php b/attachment.php index 730085182..91234b618 100644 --- a/attachment.php +++ b/attachment.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/authentication.php b/authentication.php index d5a20585d..b4353fc5b 100644 --- a/authentication.php +++ b/authentication.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/best-sales.php b/best-sales.php index 777797183..91eb2ebb2 100644 --- a/best-sales.php +++ b/best-sales.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/cache/cachefs/index.php b/cache/cachefs/index.php index a9bf4a463..7a626751d 100644 --- a/cache/cachefs/index.php +++ b/cache/cachefs/index.php @@ -1,6 +1,6 @@ * @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 */ diff --git a/cache/index.php b/cache/index.php index a9bf4a463..7a626751d 100644 --- a/cache/index.php +++ b/cache/index.php @@ -1,6 +1,6 @@ * @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 */ diff --git a/cache/sandbox/index.php b/cache/sandbox/index.php new file mode 100644 index 000000000..88e934d59 --- /dev/null +++ b/cache/sandbox/index.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; diff --git a/cache/smarty/cache/index.php b/cache/smarty/cache/index.php index 15aba8204..88e934d59 100644 --- a/cache/smarty/cache/index.php +++ b/cache/smarty/cache/index.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); diff --git a/cache/smarty/compile/index.php b/cache/smarty/compile/index.php index 15aba8204..88e934d59 100644 --- a/cache/smarty/compile/index.php +++ b/cache/smarty/compile/index.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); diff --git a/cache/smarty/index.php b/cache/smarty/index.php index 15aba8204..88e934d59 100644 --- a/cache/smarty/index.php +++ b/cache/smarty/index.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); diff --git a/cache/tcpdf/index.php b/cache/tcpdf/index.php index 15aba8204..af0ec9eab 100755 --- a/cache/tcpdf/index.php +++ b/cache/tcpdf/index.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); diff --git a/cart.php b/cart.php index ffef546f1..821b7074a 100644 --- a/cart.php +++ b/cart.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/category.php b/category.php index b78861946..441327494 100644 --- a/category.php +++ b/category.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/changecurrency.php b/changecurrency.php index 61c359265..c70d9a63c 100644 --- a/changecurrency.php +++ b/changecurrency.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Address.php b/classes/Address.php index 6e0fe679e..616b44dac 100644 --- a/classes/Address.php +++ b/classes/Address.php @@ -20,7 +20,6 @@ * * @author 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 */ @@ -338,12 +337,6 @@ class AddressCore extends ObjectModel */ public static function initialize($id_address = null) { - // set the default address - $address = new Address(); - $address->id_country = (int)Context::getContext()->country->id; - $address->id_state = 0; - $address->postcode = 0; - // if an id_address has been specified retrieve the address if ($id_address) { @@ -352,6 +345,14 @@ class AddressCore extends ObjectModel if (!Validate::isLoadedObject($address)) throw new PrestaShopException('Invalid address'); } + else + { + // set the default address + $address = new Address(); + $address->id_country = (int)Context::getContext()->country->id; + $address->id_state = 0; + $address->postcode = 0; + } return $address; } diff --git a/classes/AddressFormat.php b/classes/AddressFormat.php index 66cde89ce..4bda5caa7 100644 --- a/classes/AddressFormat.php +++ b/classes/AddressFormat.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/AdminTab.php b/classes/AdminTab.php index e5d935e4c..85867d1b3 100644 --- a/classes/AdminTab.php +++ b/classes/AdminTab.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7499 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/Alias.php b/classes/Alias.php index d72ad755e..3aa107f29 100644 --- a/classes/Alias.php +++ b/classes/Alias.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Attachment.php b/classes/Attachment.php index 37dbb587b..24c602235 100644 --- a/classes/Attachment.php +++ b/classes/Attachment.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Attribute.php b/classes/Attribute.php index 08e64d94b..b6ac51e39 100644 --- a/classes/Attribute.php +++ b/classes/Attribute.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -48,7 +47,6 @@ class AttributeCore extends ObjectModel 'color' => array('type' => self::TYPE_STRING, 'validate' => 'isColor'), 'position' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), - // Lang fields 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 64), ) ); @@ -131,7 +129,7 @@ class AttributeCore extends ObjectModel return array(); return Db::getInstance()->executeS(' - SELECT ag.*, agl.*, a.`id_attribute`, al.`name`, agl.`name` AS `attribute_group` + SELECT DISTINCT ag.*, agl.*, a.`id_attribute`, al.`name`, agl.`name` AS `attribute_group` FROM `'._DB_PREFIX_.'attribute_group` ag LEFT JOIN `'._DB_PREFIX_.'attribute_group_lang` agl ON (ag.`id_attribute_group` = agl.`id_attribute_group` AND agl.`id_lang` = '.(int)$id_lang.') diff --git a/classes/AttributeGroup.php b/classes/AttributeGroup.php index 5518c64a3..98b943a84 100644 --- a/classes/AttributeGroup.php +++ b/classes/AttributeGroup.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Autoload.php b/classes/Autoload.php index 9e2a23673..4b6e74ac6 100644 --- a/classes/Autoload.php +++ b/classes/Autoload.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Backup.php b/classes/Backup.php index fe2bae991..31c5bab0f 100644 --- a/classes/Backup.php +++ b/classes/Backup.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Blowfish.php b/classes/Blowfish.php index fa213afc2..d940c52cb 100644 --- a/classes/Blowfish.php +++ b/classes/Blowfish.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/CMS.php b/classes/CMS.php index ed9cd718b..391a3e8b1 100644 --- a/classes/CMS.php +++ b/classes/CMS.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7040 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/CMSCategory.php b/classes/CMSCategory.php index 4ecd52c75..fb78e3fb7 100644 --- a/classes/CMSCategory.php +++ b/classes/CMSCategory.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7040 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/CSV.php b/classes/CSV.php index 18e11195a..e6df279b3 100644 --- a/classes/CSV.php +++ b/classes/CSV.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Carrier.php b/classes/Carrier.php index 5e99d2327..6beb272b0 100644 --- a/classes/Carrier.php +++ b/classes/Carrier.php @@ -20,7 +20,6 @@ * * @author 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 */ @@ -843,6 +842,8 @@ class CarrierCore extends ObjectModel SET `id_reference` = '.(int)$id_reference.' WHERE `id_carrier` = '.(int)$this->id); + $this->id_reference = (int)$id_reference; + // Copy tax rules group Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'carrier_tax_rules_group_shop` (`id_carrier`, `id_tax_rules_group`, `id_shop`) (SELECT '.(int)$this->id.', `id_tax_rules_group`, `id_shop` diff --git a/classes/Cart.php b/classes/Cart.php index c3bf595c2..0a62438f7 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7506 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -155,7 +154,6 @@ class CartCore extends ObjectModel $customer = Context::getContext()->customer; else $customer = new Customer((int)$this->id_customer); - $this->_taxCalculationMethod = Group::getPriceDisplayMethod((int)$customer->id_default_group); if ((!$this->secure_key || $this->secure_key == '-1') && $customer->secure_key) { @@ -163,8 +161,7 @@ class CartCore extends ObjectModel $this->save(); } } - else - $this->_taxCalculationMethod = Group::getDefaultPriceDisplayMethod(); + $this->_taxCalculationMethod = Group::getPriceDisplayMethod(Group::getCurrent()->id); } @@ -417,15 +414,6 @@ class CartCore extends ObjectModel return $this->_products; } - $shop_group = Shop::getGroupFromShop(Shop::getContextShopID(), false); - if ($shop_group['share_order']) - $id_shop = 'cp.id_shop'; - else - $id_shop = (int)Shop::getContextShopID(); - - if (!$id_country) - $id_country = Context::getContext()->country->id; - // Build query $sql = new DbQuery(); @@ -443,16 +431,16 @@ class CartCore extends ObjectModel // Build JOIN $sql->leftJoin('product', 'p', 'p.`id_product` = cp.`id_product`'); - $sql->innerJoin('product_shop', 'product_shop', '(product_shop.id_shop='.$id_shop.' AND product_shop.id_product = p.id_product)'); + $sql->innerJoin('product_shop', 'product_shop', '(product_shop.id_shop=cp.id_shop AND product_shop.id_product = p.id_product)'); $sql->leftJoin('product_lang', 'pl', ' p.`id_product` = pl.`id_product` - AND pl.`id_lang` = '.(int)$this->id_lang.Shop::addSqlRestrictionOnLang('pl', $id_shop) + AND pl.`id_lang` = '.(int)$this->id_lang.Shop::addSqlRestrictionOnLang('pl', 'cp.id_shop') ); $sql->leftJoin('category_lang', 'cl', ' product_shop.`id_category_default` = cl.`id_category` - AND cl.`id_lang` = '.(int)$this->id_lang.Shop::addSqlRestrictionOnLang('cl', $id_shop) + AND cl.`id_lang` = '.(int)$this->id_lang.Shop::addSqlRestrictionOnLang('cl', 'cp.id_shop') ); // @todo test if everything is ok, then refactorise call of this method @@ -493,7 +481,7 @@ class CartCore extends ObjectModel '); $sql->leftJoin('product_attribute', 'pa', 'pa.`id_product_attribute` = cp.`id_product_attribute`'); - $sql->leftJoin('product_attribute_shop', 'product_attribute_shop', '(product_attribute_shop.id_shop='.$id_shop.' AND product_attribute_shop.id_product_attribute = pa.id_product_attribute)'); + $sql->leftJoin('product_attribute_shop', 'product_attribute_shop', '(product_attribute_shop.id_shop=cp.id_shop AND product_attribute_shop.id_product_attribute = pa.id_product_attribute)'); $sql->leftJoin('product_attribute_image', 'pai', 'pai.`id_product_attribute` = pa.`id_product_attribute`'); $sql->leftJoin('image_lang', 'il', 'il.id_image = pai.id_image AND il.id_lang = '.(int)$this->id_lang); } @@ -842,6 +830,13 @@ class CartCore extends ObjectModel $id_product_attribute = (int)$id_product_attribute; $product = new Product($id_product, false, Configuration::get('PS_LANG_DEFAULT'), $shop->id); + if ($id_product_attribute) + { + $combination = new Combination((int)$id_product_attribute); + if ($combination->id_product != $id_product) + return false; + } + /* If we have a product combination, the minimal quantity is set with the one of this combination */ if (!empty($id_product_attribute)) $minimal_quantity = (int)Attribute::getAttributeMinimalQty($id_product_attribute); @@ -1459,15 +1454,7 @@ class CartCore extends ObjectModel // Wrapping Fees $wrapping_fees = 0; if ($this->gift) - { - $wrapping_fees = (float)Configuration::get('PS_GIFT_WRAPPING_PRICE'); - if ($with_taxes) - { - $wrapping_fees_tax = new Tax(Configuration::get('PS_GIFT_WRAPPING_TAX')); - $wrapping_fees *= 1 + ((float)$wrapping_fees_tax->rate / 100); - } - $wrapping_fees = Tools::convertPrice(Tools::ps_round($wrapping_fees, 2), Currency::getCurrencyInstance((int)$this->id_currency)); - } + $wrapping_fees = Tools::convertPrice(Tools::ps_round($this->getGiftWrappingPrice($with_taxes), 2), Currency::getCurrencyInstance((int)$this->id_currency)); $order_total_discount = 0; if (!in_array($type, array(Cart::ONLY_SHIPPING, Cart::ONLY_PRODUCTS)) && CartRule::isFeatureActive()) @@ -1519,9 +1506,8 @@ class CartCore extends ObjectModel // If the cart rule offers a reduction, the amount is prorated (with the products in the package) if ($cart_rule['obj']->reduction_percent > 0 || $cart_rule['obj']->reduction_amount > 0) - { $order_total_discount += Tools::ps_round($cart_rule['obj']->getContextualValue($with_taxes, $virtual_context, CartRule::FILTER_ACTION_REDUCTION, $package, $use_cache), 2); - } + } $order_total_discount = min(Tools::ps_round($order_total_discount, 2), $wrapping_fees + $order_total_products + $shipping_fees); @@ -1545,6 +1531,32 @@ class CartCore extends ObjectModel return Tools::ps_round((float)$order_total, 2); } + + /** + * Get the gift wrapping price + * @param boolean $with_taxes With or without taxes + * @return gift wrapping price + */ + public function getGiftWrappingPrice($with_taxes = true, $id_address = null) + { + static $address = null; + + if ($id_address === null) + $id_address = (int)$this->{Configuration::get('PS_TAX_ADDRESS_TYPE')}; + + if ($address === null) + $address = Address::initialize($id_address); + + $wrapping_fees = (float)Configuration::get('PS_GIFT_WRAPPING_PRICE'); + if ($with_taxes && $wrapping_fees > 0) + { + $tax_manager = TaxManagerFactory::getManager($address, (int)Configuration::get('PS_GIFT_WRAPPING_TAX_RULES_GROUP')); + $tax_calculator = $tax_manager->getTaxCalculator(); + $wrapping_fees = $tax_calculator->addTaxes($wrapping_fees); + } + + return $wrapping_fees; + } /** * Get the number of packages @@ -2425,9 +2437,9 @@ class CartCore extends ObjectModel if (isset($delivery_option_list[$id_address][$key]['carrier_list'][$id_carrier])) { if ($useTax) - $total_shipping += $delivery_option_list[$id_address][$key]['carrier_list'][$id_carrier]['total_price_with_tax']; + $total_shipping += $delivery_option_list[$id_address][$key]['carrier_list'][$id_carrier]['price_with_tax']; else - $total_shipping += $delivery_option_list[$id_address][$key]['carrier_list'][$id_carrier]['total_price_without_tax']; + $total_shipping += $delivery_option_list[$id_address][$key]['carrier_list'][$id_carrier]['price_without_tax']; } } @@ -2481,7 +2493,7 @@ class CartCore extends ObjectModel if (!Address::addressExists($address_id)) $address_id = null; - $cache_id = 'getPackageShippingCost_'.(int)$address_id.'_'.(int)$id_carrier.'_'.(int)$use_tax.'_'.(int)$default_country->id; + $cache_id = 'getPackageShippingCost_'.(int)$this->id.'_'.(int)$address_id.'_'.(int)$id_carrier.'_'.(int)$use_tax.'_'.(int)$default_country->id; if ($products) foreach ($products as $product) $cache_id .= '_'.(int)$product['id_product'].'_'.(int)$product['id_product_attribute']; @@ -2610,7 +2622,10 @@ class CartCore extends ObjectModel // Select carrier tax if ($use_tax && !Tax::excludeTaxeOption()) - $carrier_tax = $carrier->getTaxesRate(new Address((int)$address_id)); + { + $address = Address::initialize((int)$address_id); + $carrier_tax = $carrier->getTaxesRate($address); + } $configuration = Configuration::getMultiple(array( 'PS_SHIPPING_FREE_PRICE', @@ -3097,7 +3112,7 @@ class CartCore extends ObjectModel SELECT * FROM '._DB_PREFIX_.'cart c WHERE c.`id_customer` = '.(int)$id_customer.' - '.(!$with_order ? 'AND id_cart NOT IN (SELECT id_cart FROM '._DB_PREFIX_.'orders o WHERE o.`id_customer` = '.(int)$id_customer.')' : '').' + '.(!$with_order ? 'AND id_cart NOT IN (SELECT id_cart FROM '._DB_PREFIX_.'orders o)' : '').' ORDER BY c.`date_add` DESC'); } diff --git a/classes/CartRule.php b/classes/CartRule.php index a8a7419b5..08f9460bd 100644 --- a/classes/CartRule.php +++ b/classes/CartRule.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7040 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -65,6 +64,7 @@ class CartRuleCore extends ObjectModel public $reduction_product; public $gift_product; public $gift_product_attribute; + public $highlight; public $active = 1; public $date_add; public $date_upd; @@ -104,6 +104,7 @@ class CartRuleCore extends ObjectModel 'reduction_product' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), 'gift_product' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'gift_product_attribute' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), + 'highlight' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), 'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), @@ -216,6 +217,7 @@ class CartRuleCore extends ObjectModel cr.`id_customer` = '.(int)$id_customer.' '.($includeGeneric ? 'OR cr.`id_customer` = 0' : '').' ) + AND highlight = 1 '.($active ? 'AND cr.`active` = 1' : '').' '.($inStock ? 'AND cr.`quantity` > 0' : '')); diff --git a/classes/Category.php b/classes/Category.php index b7238464f..e25760a40 100644 --- a/classes/Category.php +++ b/classes/Category.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7515 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -211,7 +210,7 @@ class CategoryCore extends ObjectModel if (!isset($this->doNotRegenerateNTree) || !$this->doNotRegenerateNTree) { Category::regenerateEntireNtree(); - $this->recalculateLevelDepth($this->id_category); + $this->recalculateLevelDepth($this->id); } Hook::exec('actionCategoryUpdate', array('category' => $this)); return $ret; @@ -265,7 +264,7 @@ class CategoryCore extends ObjectModel $this->description = Category::getDescriptionClean($this->description); return array( - 'id' => (int)$this->id_category, + 'id' => (int)$this->id, 'link' => Context::getContext()->link->getCategoryLink($this->id, $this->link_rewrite), 'name' => $this->name, 'desc'=> $this->description, @@ -608,7 +607,7 @@ class CategoryCore extends ObjectModel return (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql); } - $sql = 'SELECT p.*, product_shop.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, product_attribute_shop.`id_product_attribute`, pl.`description`, pl.`description_short`, pl.`available_now`, + $sql = 'SELECT p.*, product_shop.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, product_attribute_shop.`id_product_attribute`, product_attribute_shop.minimal_quantity AS product_attribute_minimal_quantity, pl.`description`, pl.`description_short`, pl.`available_now`, pl.`available_later`, pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`, pl.`name`, image_shop.`id_image`, il.`legend`, m.`name` AS manufacturer_name, cl.`name` AS category_default, DATEDIFF(product_shop.`date_add`, DATE_SUB(NOW(), @@ -658,7 +657,7 @@ class CategoryCore extends ObjectModel Tools::orderbyPrice($result, $order_way); if (!$result) - return false; + return array(); /* Modify SQL result */ return Product::getProductsProperties($id_lang, $result); @@ -965,8 +964,8 @@ class CategoryCore extends ObjectModel $root_category = Category::getRootCategory(); if (Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP && (!Tools::isSubmit('id_category') || - (int)Tools::getValue('id_category') == (int)$root_category->id_category || - (int)$root_category->id_category == (int)$context->shop->id_category)) + (int)Tools::getValue('id_category') == (int)$root_category->id || + (int)$root_category->id == (int)$context->shop->id_category)) $sql .= ' AND c.`id_parent` != 0'; diff --git a/classes/Chart.php b/classes/Chart.php index 3bffdb3d6..3fa7333da 100644 --- a/classes/Chart.php +++ b/classes/Chart.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Collection.php b/classes/Collection.php index a8476bc96..241f116f5 100644 --- a/classes/Collection.php +++ b/classes/Collection.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Combination.php b/classes/Combination.php index d7b955ca2..74e3543c9 100644 --- a/classes/Combination.php +++ b/classes/Combination.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/CompareProduct.php b/classes/CompareProduct.php index b7880892f..7558db59a 100644 --- a/classes/CompareProduct.php +++ b/classes/CompareProduct.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Configuration.php b/classes/Configuration.php index 0d63e10f9..0b09665f8 100644 --- a/classes/Configuration.php +++ b/classes/Configuration.php @@ -20,7 +20,6 @@ * * @author 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 */ @@ -324,7 +323,7 @@ class ConfigurationCore extends ObjectModel $result &= Db::getInstance()->update('configuration', array( 'value' => pSQL($value, $html), 'date_upd' => date('Y-m-d H:i:s'), - ), '`name` = \''.pSQL($key).'\''.Configuration::sqlRestriction($id_shop_group, $id_shop), true, true); + ), '`name` = \''.pSQL($key).'\''.Configuration::sqlRestriction($id_shop_group, $id_shop), 1, true); } else { @@ -369,12 +368,9 @@ class ConfigurationCore extends ObjectModel )); } } - if (!$is_i18n) - Configuration::set($key, $value, $id_shop_group, $id_shop); } - if ($is_i18n) - Configuration::set($key, $values, $id_shop_group, $id_shop); + Configuration::set($key, $values, $id_shop_group, $id_shop); return $result; } @@ -505,7 +501,7 @@ class ConfigurationCore extends ObjectModel { if ($id_shop) return ' AND id_shop = '.(int)$id_shop; - else if ($id_shop_group) + elseif ($id_shop_group) return ' AND id_shop_group = '.(int)$id_shop_group.' AND id_shop IS NULL'; else return ' AND id_shop_group IS NULL AND id_shop IS NULL'; diff --git a/classes/ConfigurationTest.php b/classes/ConfigurationTest.php index 45efe8a86..6adb493a7 100644 --- a/classes/ConfigurationTest.php +++ b/classes/ConfigurationTest.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Connection.php b/classes/Connection.php index 00a0d80d9..55ebde070 100644 --- a/classes/Connection.php +++ b/classes/Connection.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/ConnectionsSource.php b/classes/ConnectionsSource.php index caa22f3ef..234a2e329 100644 --- a/classes/ConnectionsSource.php +++ b/classes/ConnectionsSource.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Contact.php b/classes/Contact.php index c8d90a302..be3b4ee48 100644 --- a/classes/Contact.php +++ b/classes/Contact.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Context.php b/classes/Context.php index cc0a564d2..a8090d83f 100644 --- a/classes/Context.php +++ b/classes/Context.php @@ -20,7 +20,6 @@ * * @author 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 */ @@ -112,22 +111,27 @@ class ContextCore $this->mobile_device = false; if ($this->checkMobileContext()) { - require_once(_PS_TOOL_DIR_.'mobile_Detect/Mobile_Detect.php'); - $this->mobile_detect = new Mobile_Detect(); - switch ((int)Configuration::get('PS_ALLOW_MOBILE_DEVICE')) + if(isset(Context::getContext()->cookie->no_mobile) && Context::getContext()->cookie->no_mobile == false AND (int)Configuration::get('PS_ALLOW_MOBILE_DEVICE') != 0) + $this->mobile_device = true; + else { - case 1: // Only for mobile device - if ($this->mobile_detect->isMobile() && !$this->mobile_detect->isTablet()) - $this->mobile_device = true; - break; - case 2: // Only for touchpads - if ($this->mobile_detect->isTablet() && $this->mobile_detect->isMobile()) - $this->mobile_device = true; - break; - case 3: // For touchpad or mobile devices - if ($this->mobile_detect->isMobile() || $this->mobile_detect->isTablet()) - $this->mobile_device = true; - break; + require_once(_PS_TOOL_DIR_.'mobile_Detect/Mobile_Detect.php'); + $this->mobile_detect = new Mobile_Detect(); + switch ((int)Configuration::get('PS_ALLOW_MOBILE_DEVICE')) + { + case 1: // Only for mobile device + if ($this->mobile_detect->isMobile() && !$this->mobile_detect->isTablet()) + $this->mobile_device = true; + break; + case 2: // Only for touchpads + if ($this->mobile_detect->isTablet() && $this->mobile_detect->isMobile()) + $this->mobile_device = true; + break; + case 3: // For touchpad or mobile devices + if ($this->mobile_detect->isMobile() || $this->mobile_detect->isTablet()) + $this->mobile_device = true; + break; + } } } } diff --git a/classes/ControllerFactory.php b/classes/ControllerFactory.php index 06af2e065..1ceb4036b 100644 --- a/classes/ControllerFactory.php +++ b/classes/ControllerFactory.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Cookie.php b/classes/Cookie.php index 18f21c3fa..117b5cfd9 100644 --- a/classes/Cookie.php +++ b/classes/Cookie.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7040 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -52,6 +51,8 @@ class CookieCore protected $_iv; protected $_modified = false; + + protected $_allow_writing; /** * Get data if the cookie exists and else initialize an new one @@ -62,7 +63,7 @@ class CookieCore public function __construct($name, $path = '', $expire = null, $shared_urls = null) { $this->_content = array(); - $this->_expire = isset($expire) ? (int)($expire) : (time() + 1728000); + $this->_expire = is_null($expire) ? time() + 1728000 : (int)$expire; $this->_name = md5(_PS_VERSION_.$name); $this->_path = trim(Context::getContext()->shop->physical_uri.$path, '/\\').'/'; if ($this->_path{0} != '/') $this->_path = '/'.$this->_path; @@ -72,6 +73,7 @@ class CookieCore $this->_key = _COOKIE_KEY_; $this->_iv = _COOKIE_IV_; $this->_domain = $this->getDomain($shared_urls); + $this->_allow_writing = true; if (Configuration::get('PS_CIPHER_ALGORITHM')) $this->_cipherTool = new Rijndael(_RIJNDAEL_KEY_, _RIJNDAEL_IV_); else @@ -79,6 +81,11 @@ class CookieCore $this->update(); } + public function disallowWriting() + { + $this->_allow_writing = false; + } + protected function getDomain($shared_urls = null) { $r = '!(?:(\w+)://)?(?:(\w+)\:(\w+)@)?([^/:]+)?(?:\:(\d*))?([^#?]+)?(?:\?([^#]+))?(?:#(.+$))?!i'; @@ -92,7 +99,7 @@ class CookieCore return false; if (!strstr(Tools::getHttpHost(false, false), '.')) return false; - + $domain = false; if ($shared_urls !== null) { @@ -326,7 +333,7 @@ class CookieCore */ public function write() { - if (!$this->_modified || headers_sent()) + if (!$this->_modified || headers_sent() || !$this->_allow_writing) return; $cookie = ''; diff --git a/classes/Country.php b/classes/Country.php index 0363180ed..2ed891b27 100644 --- a/classes/Country.php +++ b/classes/Country.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/County.php b/classes/County.php index 8fa357b72..769d49d9d 100644 --- a/classes/County.php +++ b/classes/County.php @@ -20,8 +20,7 @@ * * @author 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) +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/Currency.php b/classes/Currency.php index 46e77b188..89dfa31cc 100644 --- a/classes/Currency.php +++ b/classes/Currency.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7503 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -74,7 +73,7 @@ class CurrencyCore extends ObjectModel 'sign' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 8), 'format' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'decimals' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool', 'required' => true), - 'conversion_rate' =>array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true), + 'conversion_rate' =>array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true, 'shop' => true), 'deleted' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), 'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), ), diff --git a/classes/Customer.php b/classes/Customer.php index 14d0e6ed1..e1e3051dc 100644 --- a/classes/Customer.php +++ b/classes/Customer.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7499 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -299,7 +298,7 @@ class CustomerCore extends ObjectModel * @param string $passwd Password is also checked if specified * @return Customer instance */ - public function getByEmail($email, $passwd = null) + public function getByEmail($email, $passwd = null, $ignore_guest = true) { if (!Validate::isEmail($email) || ($passwd && !Validate::isPasswd($passwd))) die (Tools::displayError()); @@ -309,8 +308,9 @@ class CustomerCore extends ObjectModel WHERE `email` = \''.pSQL($email).'\' '.Shop::addSqlRestriction(Shop::SHARE_CUSTOMER).' '.(isset($passwd) ? 'AND `passwd` = \''.Tools::encrypt($passwd).'\'' : '').' - AND `deleted` = 0 - AND `is_guest` = 0'; + AND `deleted` = 0'. + ($ignore_guest ? ' AND `is_guest` = 0' : ''); + $result = Db::getInstance()->getRow($sql); if (!$result) @@ -372,8 +372,13 @@ class CustomerCore extends ObjectModel public static function customerExists($email, $return_id = false, $ignore_guest = true) { if (!Validate::isEmail($email)) - die (Tools::displayError()); - + { + if (defined('_PS_MODE_DEV_') && _PS_MODE_DEV_) + die (Tools::displayError('Invalid email')); + else + return false; + } + $sql = 'SELECT `id_customer` FROM `'._DB_PREFIX_.'customer` WHERE `email` = \''.pSQL($email).'\' @@ -426,6 +431,7 @@ class CustomerCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'country` c ON (a.`id_country` = c.`id_country`) LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country`) LEFT JOIN `'._DB_PREFIX_.'state` s ON (s.`id_state` = a.`id_state`) + '.(Context::getContext()->shop->getGroup()->share_order ? '' : Shop::addSqlAssociation('country', 'c')).' WHERE `id_lang` = '.(int)$id_lang.' AND `id_customer` = '.(int)$this->id.' AND a.`deleted` = 0'; return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } diff --git a/classes/CustomerMessage.php b/classes/CustomerMessage.php index 812642d72..77bbf64e6 100644 --- a/classes/CustomerMessage.php +++ b/classes/CustomerMessage.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/CustomerThread.php b/classes/CustomerThread.php index 30594fdf6..0c7d3c407 100644 --- a/classes/CustomerThread.php +++ b/classes/CustomerThread.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Customization.php b/classes/Customization.php index eb476ed50..1c4a9e825 100644 --- a/classes/Customization.php +++ b/classes/Customization.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/DateRange.php b/classes/DateRange.php index 8c297cf23..70ee2dd4b 100644 --- a/classes/DateRange.php +++ b/classes/DateRange.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Delivery.php b/classes/Delivery.php index aceaa0198..10df4b7b0 100644 --- a/classes/Delivery.php +++ b/classes/Delivery.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Discount.php b/classes/Discount.php index 136d4c3e4..8c4155c11 100644 --- a/classes/Discount.php +++ b/classes/Discount.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7040 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php index 861bedab1..756893238 100644 --- a/classes/Dispatcher.php +++ b/classes/Dispatcher.php @@ -20,7 +20,6 @@ * * @author 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 */ @@ -46,24 +45,6 @@ class DispatcherCore * @var array List of default routes */ public $default_routes = array( - 'product_rule' => array( - 'controller' => 'product', - 'rule' => '{category:/}{id}-{rewrite}{-:ean13}.html', - 'keywords' => array( - 'id' => array('regexp' => '[0-9]+', 'param' => 'id_product'), - 'rewrite' => array('regexp' => '[_a-zA-Z0-9-\pL]*'), - 'ean13' => array('regexp' => '[0-9\pL]*'), - 'category' => array('regexp' => '[_a-zA-Z0-9-\pL]*'), - 'categories' => array('regexp' => '[/_a-zA-Z0-9-\pL]*'), - 'reference' => array('regexp' => '[_a-zA-Z0-9-\pL]*'), - 'meta_keywords' => array('regexp' => '[_a-zA-Z0-9-\pL]*'), - 'meta_title' => array('regexp' => '[_a-zA-Z0-9-\pL]*'), - 'manufacturer' => array('regexp' => '[_a-zA-Z0-9-\pL]*'), - 'supplier' => array('regexp' => '[_a-zA-Z0-9-\pL]*'), - 'price' => array('regexp' => '[0-9\.,]*'), - 'tags' => array('regexp' => '[a-zA-Z0-9-\pL]*'), - ), - ), 'layered_rule' => array( 'controller' => 'category', 'rule' => '{id}-{rewrite}{/:selected_filters}', @@ -137,6 +118,24 @@ class DispatcherCore 'fc' => 'module', ), ), + 'product_rule' => array( + 'controller' => 'product', + 'rule' => '{category:/}{id}-{rewrite}{-:ean13}.html', + 'keywords' => array( + 'id' => array('regexp' => '[0-9]+', 'param' => 'id_product'), + 'rewrite' => array('regexp' => '[_a-zA-Z0-9-\pL]*'), + 'ean13' => array('regexp' => '[0-9\pL]*'), + 'category' => array('regexp' => '[_a-zA-Z0-9-\pL]*'), + 'categories' => array('regexp' => '[/_a-zA-Z0-9-\pL]*'), + 'reference' => array('regexp' => '[_a-zA-Z0-9-\pL]*'), + 'meta_keywords' => array('regexp' => '[_a-zA-Z0-9-\pL]*'), + 'meta_title' => array('regexp' => '[_a-zA-Z0-9-\pL]*'), + 'manufacturer' => array('regexp' => '[_a-zA-Z0-9-\pL]*'), + 'supplier' => array('regexp' => '[_a-zA-Z0-9-\pL]*'), + 'price' => array('regexp' => '[0-9\.,]*'), + 'tags' => array('regexp' => '[a-zA-Z0-9-\pL]*'), + ), + ), ); /** @@ -244,7 +243,6 @@ class DispatcherCore $this->getController(); if (!$this->controller) $this->controller = $this->default_controller; - // Dispatch with right front controller switch ($this->front_controller) { @@ -385,18 +383,20 @@ class DispatcherCore { $context = Context::getContext(); - // Set default routes - foreach (Language::getLanguages() as $lang) - foreach ($this->default_routes as $id => $route) - $this->addRoute( - $id, - $route['rule'], - $route['controller'], - $lang['id_lang'], - $route['keywords'], - isset($route['params']) ? $route['params'] : array() - ); + // Load custom routes from modules + $modules_routes = Hook::exec('moduleRoutes', array(), null, true, false); + if (is_array($modules_routes) && count($modules_routes)) + foreach($modules_routes as $module_route) + foreach($module_route as $route => $route_details) + if (array_key_exists('controller', $route_details) && array_key_exists('rule', $route_details) + && array_key_exists('keywords', $route_details) && array_key_exists('params', $route_details)) + { + if (!isset($this->default_routes[$route])) + $this->default_routes[$route] = array(); + $this->default_routes[$route] = array_merge($this->default_routes[$route], $route_details); + } + // Load the custom routes prior the defaults to avoid infinite loops if ($this->use_routes) { // Get iso lang @@ -438,6 +438,18 @@ class DispatcherCore isset($route_data['params']) ? $route_data['params'] : array() ); } + + // Set default routes + foreach (Language::getLanguages() as $lang) + foreach ($this->default_routes as $id => $route) + $this->addRoute( + $id, + $route['rule'], + $route['controller'], + $lang['id_lang'], + $route['keywords'], + isset($route['params']) ? $route['params'] : array() + ); } /** @@ -579,7 +591,8 @@ class DispatcherCore if (!array_key_exists($key, $params)) die('Dispatcher::createUrl() miss required parameter "'.$key.'" for route "'.$route_id.'"'); - $query_params[$this->default_routes[$route_id]['keywords'][$key]['param']] = $params[$key]; + if (isset($this->default_routes[$route_id])) + $query_params[$this->default_routes[$route_id]['keywords'][$key]['param']] = $params[$key]; } // Build an url which match a route @@ -633,10 +646,13 @@ class DispatcherCore * @return string */ public function getController() - { + { if ($this->controller) + { + $_GET['controller'] = $this->controller; return $this->controller; - + } + $controller = Tools::getValue('controller'); if (isset($controller) && is_string($controller) && preg_match('/^([0-9a-z_-]+)\?(.*)=(.*)$/Ui', $controller, $m)) diff --git a/classes/Employee.php b/classes/Employee.php index 69f8aa068..763b94c68 100644 --- a/classes/Employee.php +++ b/classes/Employee.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Feature.php b/classes/Feature.php index e29c3766b..192d417e7 100644 --- a/classes/Feature.php +++ b/classes/Feature.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/FeatureValue.php b/classes/FeatureValue.php index 3f7ccbf0b..8917b3bab 100644 --- a/classes/FeatureValue.php +++ b/classes/FeatureValue.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/FileUploader.php b/classes/FileUploader.php index 4345c0725..8958cec67 100755 --- a/classes/FileUploader.php +++ b/classes/FileUploader.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7331 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -163,14 +162,13 @@ class QqUploadedFileXhr public function upload($path) { $input = fopen('php://input', 'r'); - $temp = tmpfile(); - $realSize = stream_copy_to_stream($input, $temp); - fclose($input); + $target = fopen($path, 'w'); + + $realSize = stream_copy_to_stream($input, $target); if ($realSize != $this->getSize()) return false; - $target = fopen($path, 'w'); - fseek($temp, 0, SEEK_SET); - stream_copy_to_stream($temp, $target); + + fclose($input); fclose($target); return true; diff --git a/classes/Gender.php b/classes/Gender.php index 06fdf7cde..41cf0eba1 100644 --- a/classes/Gender.php +++ b/classes/Gender.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Group.php b/classes/Group.php index 9e7805a24..2f6b05a66 100644 --- a/classes/Group.php +++ b/classes/Group.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7040 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/GroupReduction.php b/classes/GroupReduction.php index 739372938..f24915685 100644 --- a/classes/GroupReduction.php +++ b/classes/GroupReduction.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Guest.php b/classes/Guest.php index 688cf95dd..debbf5702 100644 --- a/classes/Guest.php +++ b/classes/Guest.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/HelpAccess.php b/classes/HelpAccess.php index d868dfb19..893b99b35 100644 --- a/classes/HelpAccess.php +++ b/classes/HelpAccess.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Hook.php b/classes/Hook.php index d3b53d18a..54892a996 100644 --- a/classes/Hook.php +++ b/classes/Hook.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7025 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -358,7 +357,7 @@ class HookCore extends ObjectModel * @param int $id_module Execute hook for this module only * @return string modules output */ - public static function exec($hook_name, $hook_args = array(), $id_module = null) + public static function exec($hook_name, $hook_args = array(), $id_module = null, $array_return = false, $check_exceptions = true) { // Check arguments validity if (($id_module && !is_numeric($id_module)) || !Validate::isHookName($hook_name)) @@ -397,11 +396,14 @@ class HookCore extends ObjectModel continue; // Check permissions - $exceptions = $moduleInstance->getExceptions($array['id_hook']); - if (in_array(Dispatcher::getInstance()->getController(), $exceptions)) - continue; - if (Validate::isLoadedObject($context->employee) && !$moduleInstance->getPermission('view', $context->employee)) - continue; + if ($check_exceptions) + { + $exceptions = $moduleInstance->getExceptions($array['id_hook']); + if (in_array(Dispatcher::getInstance()->getController(), $exceptions)) + continue; + if (Validate::isLoadedObject($context->employee) && !$moduleInstance->getPermission('view', $context->employee)) + continue; + } // Check which / if method is callable $hook_callable = is_callable(array($moduleInstance, 'hook'.$hook_name)); @@ -416,19 +418,22 @@ class HookCore extends ObjectModel else if ($hook_retro_callable) $display = $moduleInstance->{'hook'.$retro_hook_name}($hook_args); // Live edit - if ($array['live_edit'] && Tools::isSubmit('live_edit') && Tools::getValue('ad') && Tools::getValue('liveToken') == Tools::getAdminToken('AdminModulesPositions'.(int)Tab::getIdFromClassName('AdminModulesPositions').(int)Tools::getValue('id_employee'))) + if (!$array_return && $array['live_edit'] && Tools::isSubmit('live_edit') && Tools::getValue('ad') && Tools::getValue('liveToken') == Tools::getAdminToken('AdminModulesPositions'.(int)Tab::getIdFromClassName('AdminModulesPositions').(int)Tools::getValue('id_employee'))) { $live_edit = true; $output .= self::wrapLiveEdit($display, $moduleInstance, $array['id_hook']); } + else if ($array_return) + $output[] = $display; else $output .= $display; } } - - // Return html string - return ($live_edit ? ' -
    ' : '').$output.($live_edit ? '
    ' : ''); + if ($array_return) + return $output; + else + return ($live_edit ? ' +
    ' : '').$output.($live_edit ? '
    ' : '');// Return html string } public static function wrapLiveEdit($display, $moduleInstance, $id_hook) diff --git a/classes/Image.php b/classes/Image.php index 4ffc68ba7..75c0a7f52 100644 --- a/classes/Image.php +++ b/classes/Image.php @@ -20,7 +20,6 @@ * * @author 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 */ @@ -410,9 +409,8 @@ class ImageCore extends ObjectModel // Delete auto-generated images $image_types = ImageType::getImagesTypes(); foreach ($image_types as $image_type) - { $files_to_delete[] = $this->image_dir.$this->getExistingImgPath().'-'.$image_type['name'].'.'.$this->image_format; - } + // Delete watermark image $files_to_delete[] = $this->image_dir.$this->getExistingImgPath().'-watermark.'.$this->image_format; // delete index.php @@ -534,11 +532,11 @@ class ImageCore extends ObjectModel if (!file_exists(_PS_PROD_IMG_DIR_.$this->getImgFolder())) { // Apparently sometimes mkdir cannot set the rights, and sometimes chmod can't. Trying both. - $success = @mkdir(_PS_PROD_IMG_DIR_.$this->getImgFolder(), self::$access_rights, true) - || @chmod(_PS_PROD_IMG_DIR_.$this->getImgFolder(), self::$access_rights); + $success = @mkdir(_PS_PROD_IMG_DIR_.$this->getImgFolder(), self::$access_rights, true); + $chmod = @chmod(_PS_PROD_IMG_DIR_.$this->getImgFolder(), self::$access_rights); // Create an index.php file in the new folder - if ($success + if (($success || $chmod) && !file_exists(_PS_PROD_IMG_DIR_.$this->getImgFolder().'index.php') && file_exists($this->source_index)) return @copy($this->source_index, _PS_PROD_IMG_DIR_.$this->getImgFolder().'index.php'); diff --git a/classes/ImageManager.php b/classes/ImageManager.php index c7a5ecb83..e81535939 100644 --- a/classes/ImageManager.php +++ b/classes/ImageManager.php @@ -20,7 +20,6 @@ * * @author 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 */ @@ -120,7 +119,7 @@ class ImageManagerCore */ public static function resize($src_file, $dst_file, $dst_width = null, $dst_height = null, $file_type = 'jpg', $force_type = false) { - if (!file_exists($src_file)) + if (!file_exists($src_file) || !filesize($src_file)) return false; list($src_width, $src_height, $type) = getimagesize($src_file); @@ -411,4 +410,33 @@ class ImageManagerCore @chmod($filename, 0664); return $success; } + + /** + * Return the mime type by the file extension + * + * @param string $file_name + * @return string + */ + public static function getMimeTypeByExtension($file_name) + { + $types = array( + 'image/gif' => array('gif'), + 'image/jpeg' => array('jpg', 'jpeg'), + 'image/png' => array('png') + ); + $extension = substr($file_name, strrpos($file_name, '.') + 1); + + $mime_type = null; + foreach ($types as $mime => $exts) + if (in_array($extension, $exts)) + { + $mime_type = $mime; + break; + } + + if ($mime_type === null) + $mime_type = 'image/jpeg'; + + return $mime_type; + } } diff --git a/classes/ImageType.php b/classes/ImageType.php index 81f3e1d20..cd9fc3f64 100644 --- a/classes/ImageType.php +++ b/classes/ImageType.php @@ -20,7 +20,6 @@ * * @author 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 */ @@ -79,6 +78,8 @@ class ImageTypeCore extends ObjectModel * @var array Image types cache */ protected static $images_types_cache = array(); + + protected static $images_types_name_cache = array(); protected $webserviceParameters = array(); @@ -88,20 +89,17 @@ class ImageTypeCore extends ObjectModel * @param string|null Image type * @return array Image type definitions */ - public static function getImagesTypes($type = null, $id_theme = false) + public static function getImagesTypes($type = null) { - if (!isset(self::$images_types_cache[$type.($id_theme ? '-'.$id_theme : '')])) + if (!isset(self::$images_types_cache[$type])) { $where = 'WHERE 1'; - if ($id_theme) - $where .= ' AND id_theme='.(int)$id_theme; if (!empty($type)) $where .= ' AND '.pSQL($type).' = 1 '; $query = 'SELECT * FROM `'._DB_PREFIX_.'image_type`'.$where.' ORDER BY `name` ASC'; self::$images_types_cache[$type] = Db::getInstance()->executeS($query); } - return self::$images_types_cache[$type]; } @@ -117,9 +115,9 @@ class ImageTypeCore extends ObjectModel die(Tools::displayError()); Db::getInstance()->executeS(' - SELECT `id_image_type` - FROM `'._DB_PREFIX_.'image_type` - WHERE `name` = \''.pSQL($typeName).'\''); + SELECT `id_image_type` + FROM `'._DB_PREFIX_.'image_type` + WHERE `name` = \''.pSQL($typeName).'\''); return Db::getInstance()->NumRows(); } @@ -129,9 +127,29 @@ class ImageTypeCore extends ObjectModel * @param string $name * @param string $type */ - public static function getByNameNType($name, $type) + public static function getByNameNType($name, $type = null) { - return Db::getInstance()->getRow('SELECT `id_image_type`, `name`, `width`, `height`, `products`, `categories`, `manufacturers`, `suppliers`, `scenes` FROM `'._DB_PREFIX_.'image_type` WHERE `name` = \''.pSQL($name).'\' AND `'.pSQL($type).'` = 1'); + if (!isset(self::$images_types_name_cache[$name.'_'.$type])) + { + self::$images_types_name_cache[$name.'_'.$type] = Db::getInstance()->getRow(' + SELECT `id_image_type`, `name`, `width`, `height`, `products`, `categories`, `manufacturers`, `suppliers`, `scenes` + FROM `'._DB_PREFIX_.'image_type` + WHERE `name` = \''.pSQL($name).'\' '.(!is_null($type) ? 'AND `'.pSQL($type).'` = 1' : '')); + } + return self::$images_types_name_cache[$name.'_'.$type]; } - -} + + public static function getFormatedName($name) + { + $theme_name = Context::getContext()->shop->theme_name; + $name_without_theme_name = str_replace(array('_'.$theme_name, $theme_name.'_'), '', $name); + //check if the theme name is already in $name if yes only return $name + if (strstr($name, $theme_name) && self::getByNameNType($name)) + return $name; + else if (self::getByNameNType($name_without_theme_name.'_'.$theme_name)) + return $name_without_theme_name.'_'.$theme_name; + else + return $theme_name.'_'.$name_without_theme_name; + } + +} \ No newline at end of file diff --git a/classes/Language.php b/classes/Language.php index 83393a6a4..c285ef4bd 100644 --- a/classes/Language.php +++ b/classes/Language.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7040 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -517,11 +516,11 @@ class LanguageCore extends ObjectModel // delete images $files_copy = array( '/en.jpg', - '/en-default-thickbox_default.jpg', - '/en-default-home_default.jpg', - '/en-default-large_default.jpg', - '/en-default-medium_default.jpg', - '/en-default-small_default.jpg' + '/en-default-'.ImageType::getFormatedName('thickbox').'.jpg', + '/en-default-'.ImageType::getFormatedName('home').'.jpg', + '/en-default-'.ImageType::getFormatedName('large').'.jpg', + '/en-default-'.ImageType::getFormatedName('medium').'.jpg', + '/en-default-'.ImageType::getFormatedName('small').'.jpg' ); $tos = array(_PS_CAT_IMG_DIR_, _PS_MANU_IMG_DIR_, _PS_PROD_IMG_DIR_, _PS_SUPP_IMG_DIR_); foreach ($tos as $to) @@ -727,12 +726,12 @@ class LanguageCore extends ObjectModel $files_copy = array( '/en.jpg', - '/en-default-thickbox_default.jpg', - '/en-default-home_default.jpg', - '/en-default-large_default.jpg', - '/en-default-medium_default.jpg', - '/en-default-small_default.jpg', - '/en-default-scene_default.jpg' + '/en-default-'.ImageType::getFormatedName('thickbox').'.jpg', + '/en-default-'.ImageType::getFormatedName('home').'.jpg', + '/en-default-'.ImageType::getFormatedName('large').'.jpg', + '/en-default-'.ImageType::getFormatedName('medium').'.jpg', + '/en-default-'.ImageType::getFormatedName('small').'.jpg', + '/en-default-'.ImageType::getFormatedName('scene').'.jpg' ); foreach (array(_PS_CAT_IMG_DIR_, _PS_MANU_IMG_DIR_, _PS_PROD_IMG_DIR_, _PS_SUPP_IMG_DIR_) as $to) foreach ($files_copy as $file) diff --git a/classes/Link.php b/classes/Link.php index 5eff92baa..0c7e56951 100644 --- a/classes/Link.php +++ b/classes/Link.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7465 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -124,6 +123,9 @@ class LinkCore if ($dispatcher->hasKeyword('product_rule', $id_lang, 'tags')) $params['tags'] = Tools::str2url($product->getTags($id_lang)); + if ($dispatcher->hasKeyword('product_rule', $id_lang, 'category')) + $params['category'] = Tools::str2url($product->category); + if ($dispatcher->hasKeyword('product_rule', $id_lang, 'reference')) $params['reference'] = Tools::str2url($product->reference); @@ -167,7 +169,7 @@ class LinkCore $params['meta_title'] = Tools::str2url($category->meta_title); // Selected filters is used by the module blocklayered - $selected_filters = is_null($selected_filters) ? Tools::getValue('selected_filters') : $selected_filters; + $selected_filters = is_null($selected_filters) ? '' : $selected_filters; if (empty($selected_filters)) $rule = 'category_rule'; @@ -322,10 +324,7 @@ class LinkCore // If the module has its own route ... just use it ! if (Dispatcher::getInstance()->hasRoute('module-'.$module.'-'.$controller, $id_lang)) - { - unset($params['module']); return $this->getPageLink('module-'.$module.'-'.$controller, $ssl, $id_lang, $params); - } else return $url.Dispatcher::getInstance()->createUrl('module', $id_lang, $params, $this->allow); } @@ -413,7 +412,6 @@ class LinkCore $request = urlencode($request); parse_str($request, $request); } - unset($request['controller']); $uri_path = Dispatcher::getInstance()->createUrl($controller, $id_lang, $request); $url = ($ssl && $this->ssl_enable) ? Tools::getShopDomainSsl(true) : Tools::getShopDomain(true); diff --git a/classes/LocalizationPack.php b/classes/LocalizationPack.php index 46253a362..9623838b1 100644 --- a/classes/LocalizationPack.php +++ b/classes/LocalizationPack.php @@ -20,8 +20,7 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7040 $ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/Logger.php b/classes/Logger.php index 0e259f36f..f5f6a0be1 100644 --- a/classes/Logger.php +++ b/classes/Logger.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Mail.php b/classes/Mail.php index 9a5d5e398..e6a7dddae 100644 --- a/classes/Mail.php +++ b/classes/Mail.php @@ -20,7 +20,6 @@ * * @author 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 */ @@ -205,38 +204,54 @@ class MailCore $template_path = $theme_path.'mails/'; $override_mail = true; } - else if (!file_exists($template_path.$template.'.txt') || !file_exists($template_path.$template.'.html')) + else if (!file_exists($template_path.$template.'.txt') && ($configuration['PS_MAIL_TYPE'] == Mail::TYPE_BOTH || $configuration['PS_MAIL_TYPE'] == Mail::TYPE_TEXT)) { Tools::dieOrLog(Tools::displayError('Error - The following e-mail template is missing:').' '.$template_path.$template.'.txt', $die); return false; } + else if (!file_exists($template_path.$template.'.html') && ($configuration['PS_MAIL_TYPE'] == Mail::TYPE_BOTH || $configuration['PS_MAIL_TYPE'] == Mail::TYPE_HTML)) + { + Tools::dieOrLog(Tools::displayError('Error - The following e-mail template is missing:').' '.$template_path.$template.'.html', $die); + return false; + } $template_html = file_get_contents($template_path.$template.'.html'); $template_txt = strip_tags(html_entity_decode(file_get_contents($template_path.$template.'.txt'), null, 'utf-8')); if ($override_mail && file_exists($template_path.$iso.'/lang.php')) include_once($template_path.$iso.'/lang.php'); - else if ($module_name && file_exists($template_path.$iso.'/lang.php')) + else if ($module_name && file_exists($theme_path.'mails/'.$iso.'/lang.php')) include_once($theme_path.'mails/'.$iso.'/lang.php'); else - include_once(dirname(__FILE__).'/../mails/'.$iso.'/lang.php'); + include_once(_PS_MAIL_DIR_.$iso.'/lang.php'); /* Create mail and attach differents parts */ $message = new Swift_Message('['.Configuration::get('PS_SHOP_NAME').'] '.$subject); + + /* Set Message-ID - getmypid() is blocked on some hosting */ + $message->setId(Mail::generateId()); + $message->headers->setEncoding('Q'); if (Configuration::get('PS_LOGO_MAIL') !== false && file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO_MAIL'))) - $template_vars['{shop_logo}'] = $message->attach(new Swift_Message_Image(new Swift_File(_PS_IMG_DIR_.Configuration::get('PS_LOGO_MAIL')))); + $logo = _PS_IMG_DIR_.Configuration::get('PS_LOGO_MAIL'); else - if (file_exists(_PS_IMG_DIR_.'logo.jpg')) - $template_vars['{shop_logo}'] = $message->attach(new Swift_Message_Image(new Swift_File(_PS_IMG_DIR_.Configuration::get('PS_LOGO')))); + { + if (file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO'))) + $logo = _PS_IMG_DIR_.Configuration::get('PS_LOGO'); else $template_vars['{shop_logo}'] = ''; + } + + /* don't attach the logo as */ + if (isset($logo)) + $template_vars['{shop_logo}'] = $message->attach(new Swift_Message_EmbeddedFile(new Swift_File($logo), null, ImageManager::getMimeTypeByExtension($logo))); $template_vars['{shop_name}'] = Tools::safeOutput(Configuration::get('PS_SHOP_NAME')); $template_vars['{shop_url}'] = Tools::getShopDomain(true, true).__PS_BASE_URI__.'index.php'; $template_vars['{my_account_url}'] = Context::getContext()->link->getPageLink('my-account', true, Context::getContext()->language->id); $template_vars['{guest_tracking_url}'] = Context::getContext()->link->getPageLink('guest-tracking', true, Context::getContext()->language->id); $template_vars['{history_url}'] = Context::getContext()->link->getPageLink('history', true, Context::getContext()->language->id); + $template_vars['{color}'] = Tools::safeOutput(Configuration::get('PS_MAIL_COLOR')); $swift->attachPlugin(new Swift_Plugin_Decorator(array($to_plugin => $template_vars)), 'decorator'); if ($configuration['PS_MAIL_TYPE'] == Mail::TYPE_BOTH || $configuration['PS_MAIL_TYPE'] == Mail::TYPE_TEXT) $message->attach(new Swift_Message_Part($template_txt, 'text/plain', '8bit', 'utf-8')); @@ -335,4 +350,17 @@ class MailCore return str_replace('"', '"', stripslashes($str)); } + + /* Rewrite of Swift_Message::generateId() without getmypid() */ + protected static function generateId($idstring = null) + { + $midparams = array( + "utctime" => gmstrftime("%Y%m%d%H%M%S"), + "randint" => mt_rand(), + "customstr" => (preg_match("/^(? (isset($_SERVER["SERVER_NAME"]) ? $_SERVER["SERVER_NAME"] : php_uname("n")), + ); + return vsprintf("<%s.%d.%s@%s>", $midparams); + } + } diff --git a/classes/Manufacturer.php b/classes/Manufacturer.php index 42b258999..5a688a0c6 100644 --- a/classes/Manufacturer.php +++ b/classes/Manufacturer.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/classes/Media.php b/classes/Media.php index 49e7f430c..ebf4448ff 100755 --- a/classes/Media.php +++ b/classes/Media.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7521 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -75,25 +74,6 @@ class MediaCore $html_content = str_replace(chr(194).chr(160), ' ', $html_content); $html_content = Minify_HTML::minify($html_content, array('xhtml', 'cssMinifier', 'jsMinifier')); - if (Configuration::get('PS_HIGH_HTML_THEME_COMPRESSION')) - { - //$html_content = preg_replace('/"([^\>\s"]*)"/i', '$1', $html_content);//FIXME create a js bug - $html_content = preg_replace('/]*dtd\">/is', '', $html_content); - $html_content = preg_replace('/\s\>/is', '>', $html_content); - $html_content = str_replace('', '', $html_content); - $html_content = str_replace('', '', $html_content); - $html_content = str_replace('', '', $html_content); - $html_content = str_replace('', '', $html_content); - $html_content = str_replace('', '', $html_content); - $html_content = str_replace('', '', $html_content); - $html_content = str_replace('', '', $html_content); - //$html_content = str_replace('

    ', '', $html_content);//FIXME doesnt work... - $html_content = str_replace("\n", '', $html_content);//TODO with bellow - $html_content = str_replace('', '', $html_content); - $html_content = str_replace(' \ No newline at end of file diff --git a/install-dev/theme/views/header.phtml b/install-dev/theme/views/header.phtml index 3d8aa5896..31ff38e01 100644 --- a/install-dev/theme/views/header.phtml +++ b/install-dev/theme/views/header.phtml @@ -17,6 +17,7 @@ + step.'.js')): ?> @@ -82,5 +83,4 @@
  • isStepFinished($step)): ?>class="ok">l('menu_'.$this->step) ?>
    • -
    - +
    \ No newline at end of file diff --git a/install-dev/theme/views/index.php b/install-dev/theme/views/index.php index d4b603ff4..04675e9e1 100644 --- a/install-dev/theme/views/index.php +++ b/install-dev/theme/views/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/classes/AbstractLogger.php b/install-dev/upgrade/classes/AbstractLogger.php index 2e0bf0006..c040dfbd0 100644 --- a/install-dev/upgrade/classes/AbstractLogger.php +++ b/install-dev/upgrade/classes/AbstractLogger.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/classes/AddConfToFile.php b/install-dev/upgrade/classes/AddConfToFile.php index 48459117b..d8ace06ca 100644 --- a/install-dev/upgrade/classes/AddConfToFile.php +++ b/install-dev/upgrade/classes/AddConfToFile.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/classes/FileLogger.php b/install-dev/upgrade/classes/FileLogger.php index 7dddadfd1..653c9befd 100644 --- a/install-dev/upgrade/classes/FileLogger.php +++ b/install-dev/upgrade/classes/FileLogger.php @@ -20,10 +20,10 @@ * * @author 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 */ + class FileLoggerCore extends AbstractLogger { protected $filename = ''; diff --git a/install-dev/upgrade/classes/ToolsInstall.php b/install-dev/upgrade/classes/ToolsInstall.php index ca50e7ce9..904955905 100644 --- a/install-dev/upgrade/classes/ToolsInstall.php +++ b/install-dev/upgrade/classes/ToolsInstall.php @@ -20,13 +20,10 @@ * * @author 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 */ - - class ToolsInstall { /** diff --git a/install-dev/upgrade/classes/index.php b/install-dev/upgrade/classes/index.php index d4b603ff4..04675e9e1 100644 --- a/install-dev/upgrade/classes/index.php +++ b/install-dev/upgrade/classes/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/index.php b/install-dev/upgrade/index.php index d11b574fe..92c90babb 100644 --- a/install-dev/upgrade/index.php +++ b/install-dev/upgrade/index.php @@ -20,17 +20,16 @@ * * @author 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 */ - -header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); -header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); - -header('Cache-Control: no-store, no-cache, must-revalidate'); -header('Cache-Control: post-check=0, pre-check=0', false); -header('Pragma: no-cache'); - -header('Location: ../../'); + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); exit; \ No newline at end of file diff --git a/install-dev/upgrade/php/add_accounting_tab.php b/install-dev/upgrade/php/add_accounting_tab.php index 31ff6ef63..938838f3c 100644 --- a/install-dev/upgrade/php/add_accounting_tab.php +++ b/install-dev/upgrade/php/add_accounting_tab.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ function add_accounting_tab() { diff --git a/install-dev/upgrade/php/add_attribute_position.php b/install-dev/upgrade/php/add_attribute_position.php index ff2a7a13c..7e55f595e 100755 --- a/install-dev/upgrade/php/add_attribute_position.php +++ b/install-dev/upgrade/php/add_attribute_position.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/add_carrier_position.php b/install-dev/upgrade/php/add_carrier_position.php index 752f58271..e8a738c80 100755 --- a/install-dev/upgrade/php/add_carrier_position.php +++ b/install-dev/upgrade/php/add_carrier_position.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/add_column_order_state_deleted_if_not_exists.php b/install-dev/upgrade/php/add_column_order_state_deleted_if_not_exists.php index b145a1382..61c05dbe3 100644 --- a/install-dev/upgrade/php/add_column_order_state_deleted_if_not_exists.php +++ b/install-dev/upgrade/php/add_column_order_state_deleted_if_not_exists.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/add_column_orders_reference_if_not_exists.php b/install-dev/upgrade/php/add_column_orders_reference_if_not_exists.php index ee9c8d978..db50eff8a 100644 --- a/install-dev/upgrade/php/add_column_orders_reference_if_not_exists.php +++ b/install-dev/upgrade/php/add_column_orders_reference_if_not_exists.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/add_default_restrictions_modules_groups.php b/install-dev/upgrade/php/add_default_restrictions_modules_groups.php index ffd29501a..bcde7785a 100644 --- a/install-dev/upgrade/php/add_default_restrictions_modules_groups.php +++ b/install-dev/upgrade/php/add_default_restrictions_modules_groups.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 10056 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/add_feature_position.php b/install-dev/upgrade/php/add_feature_position.php index 2bec8ffa2..d85d547b8 100644 --- a/install-dev/upgrade/php/add_feature_position.php +++ b/install-dev/upgrade/php/add_feature_position.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/add_group_attribute_position.php b/install-dev/upgrade/php/add_group_attribute_position.php index 136e62dd3..fc36cf6b7 100644 --- a/install-dev/upgrade/php/add_group_attribute_position.php +++ b/install-dev/upgrade/php/add_group_attribute_position.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/add_id_shop_to_shipper_lang_index.php b/install-dev/upgrade/php/add_id_shop_to_shipper_lang_index.php index fca65141e..f513b6c15 100644 --- a/install-dev/upgrade/php/add_id_shop_to_shipper_lang_index.php +++ b/install-dev/upgrade/php/add_id_shop_to_shipper_lang_index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/add_missing_columns_customer.php b/install-dev/upgrade/php/add_missing_columns_customer.php index b31e75944..16cef6049 100644 --- a/install-dev/upgrade/php/add_missing_columns_customer.php +++ b/install-dev/upgrade/php/add_missing_columns_customer.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 13573 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/add_missing_image_key.php b/install-dev/upgrade/php/add_missing_image_key.php index 94c88138a..448d772b4 100644 --- a/install-dev/upgrade/php/add_missing_image_key.php +++ b/install-dev/upgrade/php/add_missing_image_key.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ function add_missing_image_key() { diff --git a/install-dev/upgrade/php/add_missing_rewrite_value.php b/install-dev/upgrade/php/add_missing_rewrite_value.php index 9e2812825..badf00be6 100644 --- a/install-dev/upgrade/php/add_missing_rewrite_value.php +++ b/install-dev/upgrade/php/add_missing_rewrite_value.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7373 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/add_missing_shop_column_pagenotfound.php b/install-dev/upgrade/php/add_missing_shop_column_pagenotfound.php index 1dbea4b4c..20a00d376 100644 --- a/install-dev/upgrade/php/add_missing_shop_column_pagenotfound.php +++ b/install-dev/upgrade/php/add_missing_shop_column_pagenotfound.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 13573 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/add_module_to_hook.php b/install-dev/upgrade/php/add_module_to_hook.php index 851fcbe88..f6dda587f 100644 --- a/install-dev/upgrade/php/add_module_to_hook.php +++ b/install-dev/upgrade/php/add_module_to_hook.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 12447 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/add_new_groups.php b/install-dev/upgrade/php/add_new_groups.php index 3c4362812..34ca6be7d 100644 --- a/install-dev/upgrade/php/add_new_groups.php +++ b/install-dev/upgrade/php/add_new_groups.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/add_new_tab.php b/install-dev/upgrade/php/add_new_tab.php index 2130c596d..9276e2eb1 100644 --- a/install-dev/upgrade/php/add_new_tab.php +++ b/install-dev/upgrade/php/add_new_tab.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 12447 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/add_order_reference_in_order_payment.php b/install-dev/upgrade/php/add_order_reference_in_order_payment.php index 982fa5bd3..7319dc017 100644 --- a/install-dev/upgrade/php/add_order_reference_in_order_payment.php +++ b/install-dev/upgrade/php/add_order_reference_in_order_payment.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/add_order_state.php b/install-dev/upgrade/php/add_order_state.php index 96f7bdd07..ad5fb0a48 100644 --- a/install-dev/upgrade/php/add_order_state.php +++ b/install-dev/upgrade/php/add_order_state.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/add_required_customization_field_flag.php b/install-dev/upgrade/php/add_required_customization_field_flag.php index c0b178fd6..30c957943 100644 --- a/install-dev/upgrade/php/add_required_customization_field_flag.php +++ b/install-dev/upgrade/php/add_required_customization_field_flag.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/add_stock_tab.php b/install-dev/upgrade/php/add_stock_tab.php index 756fb230a..5cfd8f3f5 100644 --- a/install-dev/upgrade/php/add_stock_tab.php +++ b/install-dev/upgrade/php/add_stock_tab.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7387 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/add_unknown_gender.php b/install-dev/upgrade/php/add_unknown_gender.php index 74a197410..ffa672f4b 100644 --- a/install-dev/upgrade/php/add_unknown_gender.php +++ b/install-dev/upgrade/php/add_unknown_gender.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/alter_blocklink.php b/install-dev/upgrade/php/alter_blocklink.php index e70876477..ed746598c 100644 --- a/install-dev/upgrade/php/alter_blocklink.php +++ b/install-dev/upgrade/php/alter_blocklink.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/alter_cms_block.php b/install-dev/upgrade/php/alter_cms_block.php index 3ffadc179..4814014e7 100644 --- a/install-dev/upgrade/php/alter_cms_block.php +++ b/install-dev/upgrade/php/alter_cms_block.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/alter_productcomments_guest_index.php b/install-dev/upgrade/php/alter_productcomments_guest_index.php index aad51e52a..c02aa8bbb 100644 --- a/install-dev/upgrade/php/alter_productcomments_guest_index.php +++ b/install-dev/upgrade/php/alter_productcomments_guest_index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/attribute_group_clean_combinations.php b/install-dev/upgrade/php/attribute_group_clean_combinations.php index dcd95a48b..b5d2e7669 100644 --- a/install-dev/upgrade/php/attribute_group_clean_combinations.php +++ b/install-dev/upgrade/php/attribute_group_clean_combinations.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/block_category_1521.php b/install-dev/upgrade/php/block_category_1521.php index 7c508023e..9ac573f48 100644 --- a/install-dev/upgrade/php/block_category_1521.php +++ b/install-dev/upgrade/php/block_category_1521.php @@ -1,6 +1,28 @@ - +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ function block_category_1521() { diff --git a/install-dev/upgrade/php/blocknewsletter.php b/install-dev/upgrade/php/blocknewsletter.php index 23effb77f..74f5d6d12 100644 --- a/install-dev/upgrade/php/blocknewsletter.php +++ b/install-dev/upgrade/php/blocknewsletter.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/blocknewsletter1530.php b/install-dev/upgrade/php/blocknewsletter1530.php index cc6f0ba61..9550abf37 100644 --- a/install-dev/upgrade/php/blocknewsletter1530.php +++ b/install-dev/upgrade/php/blocknewsletter1530.php @@ -20,12 +20,10 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 13573 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ - function blocknewsletter1530() { include_once(_PS_INSTALL_PATH_.'upgrade/php/generic_add_missing_column.php'); diff --git a/install-dev/upgrade/php/category_product_index_unique.php b/install-dev/upgrade/php/category_product_index_unique.php index 29b239564..fbde8cc25 100644 --- a/install-dev/upgrade/php/category_product_index_unique.php +++ b/install-dev/upgrade/php/category_product_index_unique.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/check_webservice_account_table.php b/install-dev/upgrade/php/check_webservice_account_table.php index f4e9f4368..b5f37da95 100644 --- a/install-dev/upgrade/php/check_webservice_account_table.php +++ b/install-dev/upgrade/php/check_webservice_account_table.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/clean_category_product.php b/install-dev/upgrade/php/clean_category_product.php index eec4a2173..8fd27801d 100644 --- a/install-dev/upgrade/php/clean_category_product.php +++ b/install-dev/upgrade/php/clean_category_product.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14012 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/clean_tabs_15.php b/install-dev/upgrade/php/clean_tabs_15.php index d159efc13..36cf6c161 100644 --- a/install-dev/upgrade/php/clean_tabs_15.php +++ b/install-dev/upgrade/php/clean_tabs_15.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ function clean_tabs_15() { diff --git a/install-dev/upgrade/php/cms_block.php b/install-dev/upgrade/php/cms_block.php index 08946ace2..3f7597b4d 100644 --- a/install-dev/upgrade/php/cms_block.php +++ b/install-dev/upgrade/php/cms_block.php @@ -20,10 +20,10 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ + function cms_block() { if (!Db::getInstance()->execute('SELECT `display_store` FROM `'._DB_PREFIX_.'cms_block` LIMIT 1')) diff --git a/install-dev/upgrade/php/configuration_double_cleaner.php b/install-dev/upgrade/php/configuration_double_cleaner.php index f0638aa02..7f71fb48e 100644 --- a/install-dev/upgrade/php/configuration_double_cleaner.php +++ b/install-dev/upgrade/php/configuration_double_cleaner.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/convert_product_price.php b/install-dev/upgrade/php/convert_product_price.php index 086eea482..41ae109e6 100644 --- a/install-dev/upgrade/php/convert_product_price.php +++ b/install-dev/upgrade/php/convert_product_price.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/country_to_timezone.php b/install-dev/upgrade/php/country_to_timezone.php index fe64df251..8d43a8075 100644 --- a/install-dev/upgrade/php/country_to_timezone.php +++ b/install-dev/upgrade/php/country_to_timezone.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/create_multistore.php b/install-dev/upgrade/php/create_multistore.php index c5a1687fe..673ae879f 100755 --- a/install-dev/upgrade/php/create_multistore.php +++ b/install-dev/upgrade/php/create_multistore.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'add_new_tab.php'); diff --git a/install-dev/upgrade/php/deactivate_custom_modules.php b/install-dev/upgrade/php/deactivate_custom_modules.php index 4054d2deb..dd01eedfa 100644 --- a/install-dev/upgrade/php/deactivate_custom_modules.php +++ b/install-dev/upgrade/php/deactivate_custom_modules.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7389 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/delivery_number_set.php b/install-dev/upgrade/php/delivery_number_set.php index babff4a89..ff2caf82d 100644 --- a/install-dev/upgrade/php/delivery_number_set.php +++ b/install-dev/upgrade/php/delivery_number_set.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/drop_image_type_non_unique_index.php b/install-dev/upgrade/php/drop_image_type_non_unique_index.php index b686e5124..7094d8f5e 100644 --- a/install-dev/upgrade/php/drop_image_type_non_unique_index.php +++ b/install-dev/upgrade/php/drop_image_type_non_unique_index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/ecotax_tax_application_fix.php b/install-dev/upgrade/php/ecotax_tax_application_fix.php index 301c71e94..e242114dd 100644 --- a/install-dev/upgrade/php/ecotax_tax_application_fix.php +++ b/install-dev/upgrade/php/ecotax_tax_application_fix.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/editorial_update.php b/install-dev/upgrade/php/editorial_update.php index cb7616273..a1bc2c967 100644 --- a/install-dev/upgrade/php/editorial_update.php +++ b/install-dev/upgrade/php/editorial_update.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/editorial_update_multishop.php b/install-dev/upgrade/php/editorial_update_multishop.php index 1c3735dee..3001cddaf 100644 --- a/install-dev/upgrade/php/editorial_update_multishop.php +++ b/install-dev/upgrade/php/editorial_update_multishop.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/fix_cms_shop_1520.php b/install-dev/upgrade/php/fix_cms_shop_1520.php index 4630c844c..10806fb0f 100755 --- a/install-dev/upgrade/php/fix_cms_shop_1520.php +++ b/install-dev/upgrade/php/fix_cms_shop_1520.php @@ -1,5 +1,4 @@ * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 15469 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ + function fix_cms_shop_1520() { $res = true; diff --git a/install-dev/upgrade/php/fix_unique_specific_price.php b/install-dev/upgrade/php/fix_unique_specific_price.php index 0e794fa4e..7bd47f844 100644 --- a/install-dev/upgrade/php/fix_unique_specific_price.php +++ b/install-dev/upgrade/php/fix_unique_specific_price.php @@ -1,5 +1,4 @@ * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 15469 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/generate_ntree.php b/install-dev/upgrade/php/generate_ntree.php index f42bcb481..a9fd19714 100644 --- a/install-dev/upgrade/php/generate_ntree.php +++ b/install-dev/upgrade/php/generate_ntree.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/generate_root_category_for_multishop.php b/install-dev/upgrade/php/generate_root_category_for_multishop.php index aac342bbb..0bec6752c 100644 --- a/install-dev/upgrade/php/generate_root_category_for_multishop.php +++ b/install-dev/upgrade/php/generate_root_category_for_multishop.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ require_once('generate_ntree.php'); diff --git a/install-dev/upgrade/php/generate_tax_rules.php b/install-dev/upgrade/php/generate_tax_rules.php index d8eced1e8..0884b1777 100644 --- a/install-dev/upgrade/php/generate_tax_rules.php +++ b/install-dev/upgrade/php/generate_tax_rules.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/generic_add_missing_column.php b/install-dev/upgrade/php/generic_add_missing_column.php index fdcb3fcd0..99dba79f9 100644 --- a/install-dev/upgrade/php/generic_add_missing_column.php +++ b/install-dev/upgrade/php/generic_add_missing_column.php @@ -1,18 +1,39 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ function generic_add_missing_column($table, $column_to_add) { - $column = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.$table.'`'); + $column_exist = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.$table.'`'); $column_formated = array(); foreach($column_exist as $c) $column_formated[] = $c['Field'] ; - + $res = true; foreach($column_to_add as $name => $details) if (!in_array($name, $column_formated)) - $res &= Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.$table'` ADD COLUMN `'.$name.'` '.$details); - + $res &= Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.$table.'` ADD COLUMN `'.$name.'` '.$details); return $res; } \ No newline at end of file diff --git a/install-dev/upgrade/php/gridextjs_deprecated.php b/install-dev/upgrade/php/gridextjs_deprecated.php index 13941fb02..a96c5aff2 100644 --- a/install-dev/upgrade/php/gridextjs_deprecated.php +++ b/install-dev/upgrade/php/gridextjs_deprecated.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8238 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/group_reduction_column_fix.php b/install-dev/upgrade/php/group_reduction_column_fix.php index db0426eec..4e3b0df8d 100644 --- a/install-dev/upgrade/php/group_reduction_column_fix.php +++ b/install-dev/upgrade/php/group_reduction_column_fix.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/hook_blocksearch_on_header.php b/install-dev/upgrade/php/hook_blocksearch_on_header.php index ea5a425b1..38e699fec 100644 --- a/install-dev/upgrade/php/hook_blocksearch_on_header.php +++ b/install-dev/upgrade/php/hook_blocksearch_on_header.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/id_currency_country_fix.php b/install-dev/upgrade/php/id_currency_country_fix.php index d11516bc7..f7ec099c5 100644 --- a/install-dev/upgrade/php/id_currency_country_fix.php +++ b/install-dev/upgrade/php/id_currency_country_fix.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/image_shop1510.php b/install-dev/upgrade/php/image_shop1510.php new file mode 100644 index 000000000..bfe850068 --- /dev/null +++ b/install-dev/upgrade/php/image_shop1510.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +function image_shop1510() +{ + include_once(_PS_INSTALL_PATH_.'upgrade/php/generic_add_missing_column.php'); + + $column_to_add = array( + 'cover' => 'TINYINT(1) UNSIGNED NOT NULL AFTER `id_shop`'); + + return generic_add_missing_column('image_shop', $column_to_add); +} diff --git a/install-dev/upgrade/php/index.php b/install-dev/upgrade/php/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/install-dev/upgrade/php/index.php +++ b/install-dev/upgrade/php/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/invoice_number_set.php b/install-dev/upgrade/php/invoice_number_set.php index 8ac556df8..8a2f66cdf 100644 --- a/install-dev/upgrade/php/invoice_number_set.php +++ b/install-dev/upgrade/php/invoice_number_set.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/latin1_database_to_utf8.php b/install-dev/upgrade/php/latin1_database_to_utf8.php index ebcbfe7c8..4dc495fdc 100644 --- a/install-dev/upgrade/php/latin1_database_to_utf8.php +++ b/install-dev/upgrade/php/latin1_database_to_utf8.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/migrate_block_info_to_cms_block.php b/install-dev/upgrade/php/migrate_block_info_to_cms_block.php index 8e2c3daec..6502c2d30 100644 --- a/install-dev/upgrade/php/migrate_block_info_to_cms_block.php +++ b/install-dev/upgrade/php/migrate_block_info_to_cms_block.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/migrate_orders.php b/install-dev/upgrade/php/migrate_orders.php index 781a1777a..9e5e5bbb4 100644 --- a/install-dev/upgrade/php/migrate_orders.php +++ b/install-dev/upgrade/php/migrate_orders.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/migrate_tabs_15.php b/install-dev/upgrade/php/migrate_tabs_15.php index 8ab534061..c4740f334 100644 --- a/install-dev/upgrade/php/migrate_tabs_15.php +++ b/install-dev/upgrade/php/migrate_tabs_15.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ /** * Migrate BO tabs for 1.5 (new reorganization of BO) diff --git a/install-dev/upgrade/php/migrate_tabs_multi_shop.php b/install-dev/upgrade/php/migrate_tabs_multi_shop.php index b5549535a..48144ebdf 100755 --- a/install-dev/upgrade/php/migrate_tabs_multi_shop.php +++ b/install-dev/upgrade/php/migrate_tabs_multi_shop.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ /** * Migrate BO tabs for multi-shop new reorganization diff --git a/install-dev/upgrade/php/moduleReinstaller.php b/install-dev/upgrade/php/moduleReinstaller.php index 0906a09c1..bc9545181 100644 --- a/install-dev/upgrade/php/moduleReinstaller.php +++ b/install-dev/upgrade/php/moduleReinstaller.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14012 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/module_blockwishlist_multishop.php b/install-dev/upgrade/php/module_blockwishlist_multishop.php index 5d231696d..19e08ab59 100644 --- a/install-dev/upgrade/php/module_blockwishlist_multishop.php +++ b/install-dev/upgrade/php/module_blockwishlist_multishop.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/module_reinstall_blockmyaccount.php b/install-dev/upgrade/php/module_reinstall_blockmyaccount.php index fa7968674..fbf8f8094 100644 --- a/install-dev/upgrade/php/module_reinstall_blockmyaccount.php +++ b/install-dev/upgrade/php/module_reinstall_blockmyaccount.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/module_reinstall_blocksearch.php b/install-dev/upgrade/php/module_reinstall_blocksearch.php index 0cb6ad8d9..1bed2578e 100644 --- a/install-dev/upgrade/php/module_reinstall_blocksearch.php +++ b/install-dev/upgrade/php/module_reinstall_blocksearch.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/move_crossselling.php b/install-dev/upgrade/php/move_crossselling.php index 53d37601d..09d4111a8 100644 --- a/install-dev/upgrade/php/move_crossselling.php +++ b/install-dev/upgrade/php/move_crossselling.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ function move_crossselling() { diff --git a/install-dev/upgrade/php/move_translations_module_file.php b/install-dev/upgrade/php/move_translations_module_file.php index 18d62d628..67b17b750 100644 --- a/install-dev/upgrade/php/move_translations_module_file.php +++ b/install-dev/upgrade/php/move_translations_module_file.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ /** * Move all translation modules files 1.4 for a good architecture in 1.5 diff --git a/install-dev/upgrade/php/p15010_drop_column_id_address_if_exists.php b/install-dev/upgrade/php/p15010_drop_column_id_address_if_exists.php index fcf47b694..b2b3a6a81 100644 --- a/install-dev/upgrade/php/p15010_drop_column_id_address_if_exists.php +++ b/install-dev/upgrade/php/p15010_drop_column_id_address_if_exists.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/p15012_add_missing_columns.php b/install-dev/upgrade/php/p15012_add_missing_columns.php index 7d09547fb..e0af2db53 100644 --- a/install-dev/upgrade/php/p15012_add_missing_columns.php +++ b/install-dev/upgrade/php/p15012_add_missing_columns.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/p15013_add_missing_columns.php b/install-dev/upgrade/php/p15013_add_missing_columns.php index 1d5d874d7..049824015 100644 --- a/install-dev/upgrade/php/p15013_add_missing_columns.php +++ b/install-dev/upgrade/php/p15013_add_missing_columns.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/p15014_add_missing_columns.php b/install-dev/upgrade/php/p15014_add_missing_columns.php index 8e22ea40c..b7013a76f 100644 --- a/install-dev/upgrade/php/p15014_add_missing_columns.php +++ b/install-dev/upgrade/php/p15014_add_missing_columns.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/p15014_copy_missing_images_tab_from_installer.php b/install-dev/upgrade/php/p15014_copy_missing_images_tab_from_installer.php index 5f498f58a..aab087824 100644 --- a/install-dev/upgrade/php/p15014_copy_missing_images_tab_from_installer.php +++ b/install-dev/upgrade/php/p15014_copy_missing_images_tab_from_installer.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/p15014_upgrade_sekeywords.php b/install-dev/upgrade/php/p15014_upgrade_sekeywords.php index 928f7d3fb..3fb5cb9e1 100644 --- a/install-dev/upgrade/php/p15014_upgrade_sekeywords.php +++ b/install-dev/upgrade/php/p15014_upgrade_sekeywords.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 15469 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/p15015_blockadvertising_extension.php b/install-dev/upgrade/php/p15015_blockadvertising_extension.php index e2e59589d..d859c0bc2 100644 --- a/install-dev/upgrade/php/p15015_blockadvertising_extension.php +++ b/install-dev/upgrade/php/p15015_blockadvertising_extension.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 15469 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/p15016_add_missing_columns.php b/install-dev/upgrade/php/p15016_add_missing_columns.php index db6609aa5..6a786fb5d 100644 --- a/install-dev/upgrade/php/p15016_add_missing_columns.php +++ b/install-dev/upgrade/php/p15016_add_missing_columns.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 16057 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/p15017_add_id_shop_to_primary_key.php b/install-dev/upgrade/php/p15017_add_id_shop_to_primary_key.php index da1d2946e..7d03e8d75 100644 --- a/install-dev/upgrade/php/p15017_add_id_shop_to_primary_key.php +++ b/install-dev/upgrade/php/p15017_add_id_shop_to_primary_key.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 13573 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/p15018_change_image_types.php b/install-dev/upgrade/php/p15018_change_image_types.php index 43685ac62..27cdc014a 100644 --- a/install-dev/upgrade/php/p15018_change_image_types.php +++ b/install-dev/upgrade/php/p15018_change_image_types.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 13573 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/regenerate_level_depth.php b/install-dev/upgrade/php/regenerate_level_depth.php index 2ffb5d348..2b39df5eb 100644 --- a/install-dev/upgrade/php/regenerate_level_depth.php +++ b/install-dev/upgrade/php/regenerate_level_depth.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/remove_duplicate_category_groups.php b/install-dev/upgrade/php/remove_duplicate_category_groups.php index c8a432c7c..3b07a8e8c 100644 --- a/install-dev/upgrade/php/remove_duplicate_category_groups.php +++ b/install-dev/upgrade/php/remove_duplicate_category_groups.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/remove_module_from_hook.php b/install-dev/upgrade/php/remove_module_from_hook.php index c5877b27d..4e80cc7a2 100644 --- a/install-dev/upgrade/php/remove_module_from_hook.php +++ b/install-dev/upgrade/php/remove_module_from_hook.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/remove_tab.php b/install-dev/upgrade/php/remove_tab.php index aed55c88d..068876db9 100644 --- a/install-dev/upgrade/php/remove_tab.php +++ b/install-dev/upgrade/php/remove_tab.php @@ -1,5 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ function remove_tab($tabname) { diff --git a/install-dev/upgrade/php/reorderpositions.php b/install-dev/upgrade/php/reorderpositions.php index 29a947748..2383838cd 100644 --- a/install-dev/upgrade/php/reorderpositions.php +++ b/install-dev/upgrade/php/reorderpositions.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 12447 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/setAllGroupsOnHomeCategory.php b/install-dev/upgrade/php/setAllGroupsOnHomeCategory.php index 6f653596a..409ffdb2f 100755 --- a/install-dev/upgrade/php/setAllGroupsOnHomeCategory.php +++ b/install-dev/upgrade/php/setAllGroupsOnHomeCategory.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/set_discount_category.php b/install-dev/upgrade/php/set_discount_category.php index 188f70605..782a5ccf1 100644 --- a/install-dev/upgrade/php/set_discount_category.php +++ b/install-dev/upgrade/php/set_discount_category.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/set_payment_module.php b/install-dev/upgrade/php/set_payment_module.php index a8e3a850d..87050787c 100644 --- a/install-dev/upgrade/php/set_payment_module.php +++ b/install-dev/upgrade/php/set_payment_module.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/set_payment_module_group.php b/install-dev/upgrade/php/set_payment_module_group.php index 6bd7bc9b5..77179eb24 100644 --- a/install-dev/upgrade/php/set_payment_module_group.php +++ b/install-dev/upgrade/php/set_payment_module_group.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/set_product_suppliers.php b/install-dev/upgrade/php/set_product_suppliers.php index 7a4f60ac8..6f31592a1 100644 --- a/install-dev/upgrade/php/set_product_suppliers.php +++ b/install-dev/upgrade/php/set_product_suppliers.php @@ -1,4 +1,29 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + function set_product_suppliers() { $ps_currency_default = Db::getInstance()->getValue('SELECT value diff --git a/install-dev/upgrade/php/set_stock_available.php b/install-dev/upgrade/php/set_stock_available.php index baebca2c1..727b1950b 100644 --- a/install-dev/upgrade/php/set_stock_available.php +++ b/install-dev/upgrade/php/set_stock_available.php @@ -1,4 +1,29 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + function set_stock_available() { $res = true; diff --git a/install-dev/upgrade/php/shop_url.php b/install-dev/upgrade/php/shop_url.php index 9ba114515..9635e8564 100644 --- a/install-dev/upgrade/php/shop_url.php +++ b/install-dev/upgrade/php/shop_url.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/update_carrier_url.php b/install-dev/upgrade/php/update_carrier_url.php index 58d40d0e8..28c4a4c41 100644 --- a/install-dev/upgrade/php/update_carrier_url.php +++ b/install-dev/upgrade/php/update_carrier_url.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 12447 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/update_feature_detachable_cache.php b/install-dev/upgrade/php/update_feature_detachable_cache.php index e8321c9e7..96906a25e 100644 --- a/install-dev/upgrade/php/update_feature_detachable_cache.php +++ b/install-dev/upgrade/php/update_feature_detachable_cache.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/update_for_13version.php b/install-dev/upgrade/php/update_for_13version.php index 585e5f718..64832eb1a 100644 --- a/install-dev/upgrade/php/update_for_13version.php +++ b/install-dev/upgrade/php/update_for_13version.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ function update_for_13version() { diff --git a/install-dev/upgrade/php/update_image_size_in_db.php b/install-dev/upgrade/php/update_image_size_in_db.php index 04ae0f1e2..312b02993 100644 --- a/install-dev/upgrade/php/update_image_size_in_db.php +++ b/install-dev/upgrade/php/update_image_size_in_db.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/update_mailalerts_add_column_idshop.php b/install-dev/upgrade/php/update_mailalerts_add_column_idshop.php index bfe479a40..35cc0b7b2 100644 --- a/install-dev/upgrade/php/update_mailalerts_add_column_idshop.php +++ b/install-dev/upgrade/php/update_mailalerts_add_column_idshop.php @@ -1,9 +1,33 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + /* * To change this template, choose Tools | Templates * and open the template in the editor. */ - function update_mailalerts_add_column_idshop() { $installed = Db::getInstance()->getValue('SELECT id_module FROM `'._DB_PREFIX_.'module` WHERE name = "mailalerts"'); diff --git a/install-dev/upgrade/php/update_module_blocklayered.php b/install-dev/upgrade/php/update_module_blocklayered.php index d5158fc4b..e10af0bc6 100644 --- a/install-dev/upgrade/php/update_module_blocklayered.php +++ b/install-dev/upgrade/php/update_module_blocklayered.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14012 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/update_module_followup.php b/install-dev/upgrade/php/update_module_followup.php index 5a5607510..c26fc9687 100644 --- a/install-dev/upgrade/php/update_module_followup.php +++ b/install-dev/upgrade/php/update_module_followup.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 12447 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/update_module_loyalty.php b/install-dev/upgrade/php/update_module_loyalty.php index a30e27657..87b87ed28 100644 --- a/install-dev/upgrade/php/update_module_loyalty.php +++ b/install-dev/upgrade/php/update_module_loyalty.php @@ -20,12 +20,13 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 12518 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ -// backward compatibility vouchers should be available in all categories +/** +* backward compatibility vouchers should be available in all categories +*/ function update_module_loyalty() { $ps_loyalty_point_value = Db::getInstance()->getValue('SELECT value diff --git a/install-dev/upgrade/php/update_module_pagesnotfound.php b/install-dev/upgrade/php/update_module_pagesnotfound.php index 815de35e1..5064bcb47 100644 --- a/install-dev/upgrade/php/update_module_pagesnotfound.php +++ b/install-dev/upgrade/php/update_module_pagesnotfound.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14012 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/update_module_product_comments.php b/install-dev/upgrade/php/update_module_product_comments.php index 6c945b405..0b80530ff 100644 --- a/install-dev/upgrade/php/update_module_product_comments.php +++ b/install-dev/upgrade/php/update_module_product_comments.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/update_modules_multishop.php b/install-dev/upgrade/php/update_modules_multishop.php index 5b5b61c81..cbf941502 100644 --- a/install-dev/upgrade/php/update_modules_multishop.php +++ b/install-dev/upgrade/php/update_modules_multishop.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ function update_modules_multishop() { diff --git a/install-dev/upgrade/php/update_modules_sql.php b/install-dev/upgrade/php/update_modules_sql.php index 522d77467..ebede3a3b 100644 --- a/install-dev/upgrade/php/update_modules_sql.php +++ b/install-dev/upgrade/php/update_modules_sql.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/update_order_canada.php b/install-dev/upgrade/php/update_order_canada.php index 27e808106..1b09820e7 100644 --- a/install-dev/upgrade/php/update_order_canada.php +++ b/install-dev/upgrade/php/update_order_canada.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/php/update_order_detail_taxes.php b/install-dev/upgrade/php/update_order_detail_taxes.php index 7d701717d..6ed7b90a2 100644 --- a/install-dev/upgrade/php/update_order_detail_taxes.php +++ b/install-dev/upgrade/php/update_order_detail_taxes.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ function update_order_detail_taxes() { diff --git a/install-dev/upgrade/php/update_order_details.php b/install-dev/upgrade/php/update_order_details.php index ced1d0e2e..2e8c93007 100644 --- a/install-dev/upgrade/php/update_order_details.php +++ b/install-dev/upgrade/php/update_order_details.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/update_products_ecotax_v133.php b/install-dev/upgrade/php/update_products_ecotax_v133.php index c19da4f49..37999e095 100644 --- a/install-dev/upgrade/php/update_products_ecotax_v133.php +++ b/install-dev/upgrade/php/update_products_ecotax_v133.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7541 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/updateproductcomments.php b/install-dev/upgrade/php/updateproductcomments.php index f6d4dd697..a3f4dbe6d 100644 --- a/install-dev/upgrade/php/updateproductcomments.php +++ b/install-dev/upgrade/php/updateproductcomments.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/upgrade/php/updatetabicon_from_11version.php b/install-dev/upgrade/php/updatetabicon_from_11version.php index e3011cad1..7e9d8ab0c 100644 --- a/install-dev/upgrade/php/updatetabicon_from_11version.php +++ b/install-dev/upgrade/php/updatetabicon_from_11version.php @@ -20,10 +20,10 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ + function updatetabicon_from_11version() { global $oldversion; diff --git a/install-dev/upgrade/php/upgrade_cms_15.php b/install-dev/upgrade/php/upgrade_cms_15.php index 0f7519efb..dab20d26c 100644 --- a/install-dev/upgrade/php/upgrade_cms_15.php +++ b/install-dev/upgrade/php/upgrade_cms_15.php @@ -1,5 +1,4 @@ * @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 */ + function upgrade_cms_15() { $res = true; diff --git a/install-dev/upgrade/php/upgrade_cms_15_rename.php b/install-dev/upgrade/php/upgrade_cms_15_rename.php index ce9f03c6d..0278fffb5 100644 --- a/install-dev/upgrade/php/upgrade_cms_15_rename.php +++ b/install-dev/upgrade/php/upgrade_cms_15_rename.php @@ -1,5 +1,4 @@ * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 15163 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ + function upgrade_cms_15_rename() { $res = true; diff --git a/install-dev/upgrade/sql/1.5.0.15.sql b/install-dev/upgrade/sql/1.5.0.15.sql index d05ef0ec3..bfee984a9 100644 --- a/install-dev/upgrade/sql/1.5.0.15.sql +++ b/install-dev/upgrade/sql/1.5.0.15.sql @@ -9,3 +9,5 @@ UPDATE `PREFIX_order_state` SET `module_name` = 'cheque' WHERE `id_order_state` UPDATE `PREFIX_order_state` SET `module_name` = 'bankwire' WHERE `id_order_state` = (SELECT `value` FROM `PREFIX_configuration` WHERE `name` = 'PS_OS_BANKWIRE' LIMIT 1); ALTER TABLE `PREFIX_product_shop` ADD `uploadable_files` TINYINT NOT NULL DEFAULT 0 AFTER `customizable`; + +UPDATE `PREFIX_product_shop` product_shop SET `uploadable_files` = (SELECT uploadable_files FROM `PREFIX_product` WHERE `id_product` = product_shop.`id_product`); \ No newline at end of file diff --git a/install-dev/upgrade/sql/1.5.1.0.sql b/install-dev/upgrade/sql/1.5.1.0.sql index 0a8a3abc6..70783b716 100644 --- a/install-dev/upgrade/sql/1.5.1.0.sql +++ b/install-dev/upgrade/sql/1.5.1.0.sql @@ -1,6 +1,6 @@ SET NAMES 'utf8'; -ALTER TABLE `PREFIX_image_shop` ADD `cover` TINYINT(1) UNSIGNED NOT NULL AFTER `id_shop`; +/* PHP:image_shop1510(); */; ALTER TABLE `PREFIX_image_shop` DROP PRIMARY KEY; ALTER TABLE `PREFIX_image_shop` ADD INDEX (`id_image`, `id_shop`, `cover`); UPDATE `PREFIX_image_shop` image_shop SET image_shop.`cover`=1 WHERE `id_image` IN (SELECT `id_image` FROM `PREFIX_image` i WHERE i.`cover`=1); diff --git a/install-dev/upgrade/sql/1.5.2.1.sql b/install-dev/upgrade/sql/1.5.2.1.sql deleted file mode 100644 index 83d45dc16..000000000 --- a/install-dev/upgrade/sql/1.5.2.1.sql +++ /dev/null @@ -1,7 +0,0 @@ -SET NAMES 'utf8'; - -ALTER TABLE `PREFIX_address` CHANGE `outstanding_allow_amount` `outstanding_allow_amount` DECIMAL(20, 6) NOT NULL DEFAULT '0.000000'; - -/* PHP:blocknewsletter1530(); */; - -/* PHP:block_category_1521(); */; \ No newline at end of file diff --git a/install-dev/upgrade/sql/1.5.3.0.sql b/install-dev/upgrade/sql/1.5.3.0.sql new file mode 100644 index 000000000..a29a7e98a --- /dev/null +++ b/install-dev/upgrade/sql/1.5.3.0.sql @@ -0,0 +1,40 @@ +SET NAMES 'utf8'; + +ALTER TABLE `PREFIX_address` CHANGE `outstanding_allow_amount` `outstanding_allow_amount` DECIMAL(20, 6) NOT NULL DEFAULT '0.000000'; + +/* PHP:blocknewsletter1530(); */; + +/* PHP:block_category_1521(); */; + +UPDATE `PREFIX_order_state` SET `delivery` = 0 WHERE `id_order_state` = 3; + +ALTER TABLE `PREFIX_product_shop` ADD `id_product_redirected` int(10) unsigned NOT NULL default '0' AFTER `active` ; + +ALTER TABLE `PREFIX_product` ADD `id_product_redirected` int(10) unsigned NOT NULL default '0' AFTER `active` ; + +UPDATE `PREFIX_order_state` SET `send_email` = 1 WHERE `id_order_state` = (SELECT `value` FROM `PREFIX_configuration` WHERE `name` = 'PS_OS_WS_PAYMENT' LIMIT 1); + +UPDATE `PREFIX_order_state_lang` SET `template` = 'payment' WHERE `id_order_state` = (SELECT `value` FROM `PREFIX_configuration` WHERE `name` = 'PS_OS_WS_PAYMENT' LIMIT 1); + +DELETE FROM `PREFIX_configuration` WHERE `name`= 'PS_HIGH_HTML_THEME_COMPRESSION'; + +INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_MAIL_COLOR', '#db3484', NOW(), NOW()); + +ALTER TABLE `PREFIX_order_cart_rule` CHANGE `name` `name` VARCHAR(254); + +ALTER TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ''; + +ALTER TABLE `PREFIX_currency_shop` ADD `conversion_rate` DECIMAL( 13, 6 ) NOT NULL; +UPDATE `PREFIX_currency_shop` a SET `conversion_rate` = (SELECT `conversion_rate` FROM `PREFIX_currency` b WHERE a.id_currency = b.id_currency); + +INSERT INTO `PREFIX_configuration`(`name`, `value`, `id_shop`, `id_shop_group`, `date_add`, `date_upd`) + (SELECT 'PS_GIFT_WRAPPING_TAX_RULES_GROUP', b.`id_tax_rules_group`, a.`id_shop`, a.`id_shop_group`, NOW(), NOW() + FROM `PREFIX_configuration` a + JOIN `PREFIX_tax_rule` b ON (a.value = b.id_tax) + WHERE a.name='PS_GIFT_WRAPPING_TAX' + GROUP BY a.`id_shop`, a.`id_shop_group` + ); + +DELETE FROM `PREFIX_configuration` WHERE name='PS_GIFT_WRAPPING_TAX'; + +ALTER TABLE `PREFIX_cart_rule` ADD `highlight` tinyint(1) unsigned NOT NULL default 0 AFTER `gift_product_attribute`; diff --git a/install-dev/upgrade/sql/index.php b/install-dev/upgrade/sql/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/install-dev/upgrade/sql/index.php +++ b/install-dev/upgrade/sql/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/install-dev/upgrade/upgrade.php b/install-dev/upgrade/upgrade.php index cb9867f3d..0e21b769e 100644 --- a/install-dev/upgrade/upgrade.php +++ b/install-dev/upgrade/upgrade.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7387 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/admin-categories-tree.js b/js/admin-categories-tree.js index 6aeef54bb..32c17801b 100755 --- a/js/admin-categories-tree.js +++ b/js/admin-categories-tree.js @@ -19,7 +19,6 @@ * * @author 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 */ diff --git a/js/admin-dnd.js b/js/admin-dnd.js index 2b219e041..18c15e000 100644 --- a/js/admin-dnd.js +++ b/js/admin-dnd.js @@ -19,7 +19,6 @@ * * @author 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 */ diff --git a/js/admin-products.js b/js/admin-products.js index 0efcb4a01..997e8c776 100644 --- a/js/admin-products.js +++ b/js/admin-products.js @@ -18,7 +18,6 @@ * * @author 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 */ @@ -764,9 +763,8 @@ product_tabs['Attachments'] = new function(){ product_tabs['Informations'] = new function(){ var self = this; this.bindAvailableForOrder = function (){ - $("#available_for_order").click(function(){ - - + $("#available_for_order").click(function() + { if ($(this).is(':checked') || ($('input[name=\'multishop_check[show_price]\']').lenght && !$('input[name=\'multishop_check[show_price]\']').prop('checked'))) { $('#show_price').attr('checked', true); @@ -777,6 +775,37 @@ product_tabs['Informations'] = new function(){ $('#show_price').attr('disabled', false); } }); + + if ($('#active_on').prop('checked')) + { + showRedirectProductOptions(false); + showRedirectProductSelectOptions(false); + } + else + showRedirectProductOptions(true); + + $('#redirect_type').change(function () { + redirectSelectChange(); + }); + + $('#related_product_autocomplete_input') + .autocomplete('ajax_products_list.php?excludeIds='+id_product, { + minChars: 1, + autoFill: true, + max:20, + matchContains: true, + mustMatch:true, + scroll:false, + cacheLength:0, + formatItem: function(item) { + return item[0]+' - '+item[1]; + } + }).result(function(e, i){ + if(i != undefined) + addRelatedProduct(i[1], i[0]); + $(this).val(''); + }); + addRelatedProduct(id_product_redirected, product_name_redirected); }; this.bindTagImage = function (){ @@ -1197,6 +1226,8 @@ product_tabs['Quantities'] = new function(){ self.refreshQtyAvailabilityForm(); self.ajaxCall({actionQty: 'out_of_stock', value: $(this).val()}); }); + if (display_multishop_checkboxes) + ProductMultishop.checkAllQuantities(); self.refreshQtyAvailabilityForm(); }; @@ -1545,6 +1576,15 @@ var ProductMultishop = new function() ProductMultishop.checkField($('input[name=\'multishop_check[link_rewrite]['+v.id_lang+']\']').prop('checked'), 'link_rewrite_'+v.id_lang); }); }; + + this.checkAllQuantities = function() + { + $.each(languages, function(k, v) + { + ProductMultishop.checkField($('input[name=\'multishop_check[available_later]['+v.id_lang+']\']').prop('checked'), 'available_later_'+v.id_lang); + ProductMultishop.checkField($('input[name=\'multishop_check[available_now]['+v.id_lang+']\']').prop('checked'), 'available_now_'+v.id_lang); + }); + }; this.checkAllAssociations = function() { diff --git a/js/admin-scene-cropping.js b/js/admin-scene-cropping.js index ae914c59d..1d2f4a4ed 100644 --- a/js/admin-scene-cropping.js +++ b/js/admin-scene-cropping.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7040 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/admin-translations.js b/js/admin-translations.js index 25a498973..eeea52702 100644 --- a/js/admin-translations.js +++ b/js/admin-translations.js @@ -18,7 +18,6 @@ * * @author 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 */ diff --git a/js/admin.js b/js/admin.js index f016104e5..8d159c6c8 100644 --- a/js/admin.js +++ b/js/admin.js @@ -18,7 +18,6 @@ * * @author 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 */ @@ -53,7 +52,10 @@ function str2url(str,encoding,ucfirst) function copy2friendlyURL() { - if (!$('#link_rewrite_' + id_language).val().length)//check if user didn't type anything in rewrite field, to prevent overwriting + if (typeof(id_product) == 'undefined') + id_product = false; + + if (!$('#link_rewrite_' + id_language).val().length || !id_product)//check if user didn't type anything in rewrite field, to prevent overwriting { $('#link_rewrite_' + id_language).val(str2url($('#name_' + id_language).val().replace(/^[0-9]+\./, ''), 'UTF-8').replace('%', '')); if ($('#friendly-url')) @@ -572,6 +574,56 @@ function toggleDraftWarning(show) $('.draft').show(); } +function showRedirectProductOptions(show) +{ + if (show) + $('.redirect_product_options').fadeIn(); + else + $('.redirect_product_options').fadeOut(); + + redirectSelectChange(); +} + +function redirectSelectChange() +{ + if ($('#redirect_type :selected').val() == '404') + showRedirectProductSelectOptions(false); + else + showRedirectProductSelectOptions(true); +} + +function addRelatedProduct(id_product_to_add, product_name) +{ + if (!id_product_to_add || id_product == id_product_to_add) + return; + $('#related_product_name').html(product_name); + $('#related_product_name').parent('p').css('margin-top', 0); + $('input[name=id_product_redirected]').val(id_product_to_add); + $('#related_product_autocomplete_input').hide(); + $('#related_product_remove').show(); +} + +function removeRelatedProduct() +{ + $('#related_product_name').html(no_related_product); + $('#related_product_name').parent('p').css('margin-top', '0.5em'); + $('input[name=id_product_redirected]').val(0); + $('#related_product_remove').hide(); + $('#related_product_autocomplete_input').fadeIn(); +} + +function showRedirectProductSelectOptions(show) +{ + if (show) + $('.redirect_product_options_product_choise').show(); + else + { + $('.redirect_product_options_product_choise').hide(); + removeRelatedProduct(); + } + +} + function showOptions(show) { if (show) diff --git a/js/adminImport.js b/js/adminImport.js index 9042f7966..1dc39e913 100644 --- a/js/adminImport.js +++ b/js/adminImport.js @@ -19,7 +19,6 @@ * * @author 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 */ diff --git a/js/admin_order.js b/js/admin_order.js index b21bfce34..cf6077eed 100644 --- a/js/admin_order.js +++ b/js/admin_order.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 10575 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -285,7 +284,8 @@ function closeAddProduct() $('#add_product_product_quantity').val('1'); $('#add_product_product_attribute_id option').remove(); $('#add_product_product_attribute_area').hide(); - $('#add_product_product_stock').html('0'); + if (stock_management) + $('#add_product_product_stock').html('0'); current_product = null; } @@ -357,7 +357,8 @@ function init() $('#add_product_product_price_tax_incl').val(data.price_tax_incl); $('#add_product_product_price_tax_excl').val(data.price_tax_excl); addProductRefreshTotal(); - $('#add_product_product_stock').html(data.stock[0]); + if (stock_management) + $('#add_product_product_stock').html(data.stock[0]); if (current_product.combinations.length !== 0) { @@ -368,7 +369,8 @@ function init() $('select#add_product_product_attribute_id').append(''); if (this.default_on == 1) { - $('#add_product_product_stock').html(this.qty_in_stock); + if (stock_management) + $('#add_product_product_stock').html(this.qty_in_stock); defaultAttribute = this.id_product_attribute; } }); @@ -397,24 +399,26 @@ function init() populateWarehouseList(current_product.warehouse_list[$(this).val()]); addProductRefreshTotal(); - - $('#add_product_product_stock').html(current_product.combinations[$(this).val()].qty_in_stock); + if (stock_management) + $('#add_product_product_stock').html(current_product.combinations[$(this).val()].qty_in_stock); }); $('input#add_product_product_quantity').unbind('keyup'); $('input#add_product_product_quantity').keyup(function() { - var quantity = parseInt($(this).val()); - if (quantity < 1 || isNaN(quantity)) - quantity = 1; - var stock_available = parseInt($('#add_product_product_stock').html()); + if (stock_management) + { + var quantity = parseInt($(this).val()); + if (quantity < 1 || isNaN(quantity)) + quantity = 1; + var stock_available = parseInt($('#add_product_product_stock').html()); + // stock status update + if (quantity > stock_available) + $('#add_product_product_stock').css('font-weight', 'bold').css('color', 'red').css('font-size', '1.2em'); + else + $('#add_product_product_stock').css('font-weight', 'normal').css('color', 'black').css('font-size', '1em'); + } // total update addProductRefreshTotal(); - - // stock status update - if (quantity > stock_available) - $('#add_product_product_stock').css('font-weight', 'bold').css('color', 'red').css('font-size', '1.2em'); - else - $('#add_product_product_stock').css('font-weight', 'normal').css('color', 'black').css('font-size', '1em'); }); $('#submitAddProduct').unbind('click'); diff --git a/js/ajax.js b/js/ajax.js index be8e33a61..1f8fae0f7 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -19,7 +19,6 @@ * * @author 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 */ diff --git a/js/attributesBack.js b/js/attributesBack.js index 240c8d8bb..ecf4eb679 100644 --- a/js/attributesBack.js +++ b/js/attributesBack.js @@ -19,7 +19,6 @@ * * @author 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 */ diff --git a/js/checkLangPack.js b/js/checkLangPack.js index 350e377b3..a645f01d8 100644 --- a/js/checkLangPack.js +++ b/js/checkLangPack.js @@ -19,7 +19,6 @@ * * @author 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 */ diff --git a/js/cropper/index.php b/js/cropper/index.php index 15aba8204..88e934d59 100644 --- a/js/cropper/index.php +++ b/js/cropper/index.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); diff --git a/js/fileuploader.js b/js/fileuploader.js index 3ca414e3d..6e7522a25 100755 --- a/js/fileuploader.js +++ b/js/fileuploader.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7331 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/form.js b/js/form.js index e8813feaf..72d7f5ca3 100644 --- a/js/form.js +++ b/js/form.js @@ -19,7 +19,6 @@ * * @author 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 */ diff --git a/js/index.php b/js/index.php index 60bc2ce27..88e934d59 100644 --- a/js/index.php +++ b/js/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/index.php b/js/jquery/index.php index 15aba8204..88e934d59 100644 --- a/js/jquery/index.php +++ b/js/jquery/index.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); diff --git a/js/jquery/plugins/ajaxfileupload/index.php b/js/jquery/plugins/ajaxfileupload/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/ajaxfileupload/index.php +++ b/js/jquery/plugins/ajaxfileupload/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/alerts/images/index.php b/js/jquery/plugins/alerts/images/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/alerts/images/index.php +++ b/js/jquery/plugins/alerts/images/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/alerts/index.php b/js/jquery/plugins/alerts/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/alerts/index.php +++ b/js/jquery/plugins/alerts/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/autocomplete/index.php b/js/jquery/plugins/autocomplete/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/autocomplete/index.php +++ b/js/jquery/plugins/autocomplete/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/chosen/index.php b/js/jquery/plugins/chosen/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/chosen/index.php +++ b/js/jquery/plugins/chosen/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/cluetip/index.php b/js/jquery/plugins/cluetip/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/cluetip/index.php +++ b/js/jquery/plugins/cluetip/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/fancybox/images/index.php b/js/jquery/plugins/fancybox/images/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/fancybox/images/index.php +++ b/js/jquery/plugins/fancybox/images/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/fancybox/index.php b/js/jquery/plugins/fancybox/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/fancybox/index.php +++ b/js/jquery/plugins/fancybox/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/imgareaselect/index.php b/js/jquery/plugins/imgareaselect/index.php index 15aba8204..af0ec9eab 100755 --- a/js/jquery/plugins/imgareaselect/index.php +++ b/js/jquery/plugins/imgareaselect/index.php @@ -1,4 +1,28 @@ +* @copyright 2007-2012 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); diff --git a/js/jquery/plugins/index.php b/js/jquery/plugins/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/index.php +++ b/js/jquery/plugins/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/jgrowl/index.php b/js/jquery/plugins/jgrowl/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/jgrowl/index.php +++ b/js/jquery/plugins/jgrowl/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/jqzoom/index.php b/js/jquery/plugins/jqzoom/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/jqzoom/index.php +++ b/js/jquery/plugins/jqzoom/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/jstree/index.php b/js/jquery/plugins/jstree/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/jstree/index.php +++ b/js/jquery/plugins/jstree/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/jstree/themes/apple/index.php b/js/jquery/plugins/jstree/themes/apple/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/jstree/themes/apple/index.php +++ b/js/jquery/plugins/jstree/themes/apple/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/jstree/themes/classic/index.php b/js/jquery/plugins/jstree/themes/classic/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/jstree/themes/classic/index.php +++ b/js/jquery/plugins/jstree/themes/classic/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/jstree/themes/default-rtl/index.php b/js/jquery/plugins/jstree/themes/default-rtl/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/jstree/themes/default-rtl/index.php +++ b/js/jquery/plugins/jstree/themes/default-rtl/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/jstree/themes/default/index.php b/js/jquery/plugins/jstree/themes/default/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/jstree/themes/default/index.php +++ b/js/jquery/plugins/jstree/themes/default/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/jstree/themes/index.php b/js/jquery/plugins/jstree/themes/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/jstree/themes/index.php +++ b/js/jquery/plugins/jstree/themes/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/tabpane/index.php b/js/jquery/plugins/tabpane/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/tabpane/index.php +++ b/js/jquery/plugins/tabpane/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/tagify/index.php b/js/jquery/plugins/tagify/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/tagify/index.php +++ b/js/jquery/plugins/tagify/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/thickbox/index.php b/js/jquery/plugins/thickbox/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/thickbox/index.php +++ b/js/jquery/plugins/thickbox/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/timepicker/index.php b/js/jquery/plugins/timepicker/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/timepicker/index.php +++ b/js/jquery/plugins/timepicker/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/treeview-categories/images/index.php b/js/jquery/plugins/treeview-categories/images/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/treeview-categories/images/index.php +++ b/js/jquery/plugins/treeview-categories/images/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/plugins/treeview-categories/index.php b/js/jquery/plugins/treeview-categories/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/plugins/treeview-categories/index.php +++ b/js/jquery/plugins/treeview-categories/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/ui/i18n/index.php b/js/jquery/ui/i18n/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/ui/i18n/index.php +++ b/js/jquery/ui/i18n/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/ui/index.php b/js/jquery/ui/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/ui/index.php +++ b/js/jquery/ui/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/ui/jquery.ui.datepicker.min.js b/js/jquery/ui/jquery.ui.datepicker.min.js index a73be85d0..5b49df12e 100755 --- a/js/jquery/ui/jquery.ui.datepicker.min.js +++ b/js/jquery/ui/jquery.ui.datepicker.min.js @@ -13,7 +13,7 @@ (function(d,C){function M(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass= "ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su", "Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"yy-mm-dd",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10", -minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=N(d('
    '))}function N(a){return a.bind("mouseout", +minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=N(d(''))}function N(a){return a.bind("mouseout", function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");b.length&&b.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(d.datepicker._isDisabledDatepicker(J.inline?a.parent()[0]:J.input[0])||!b.length)){b.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"); b.addClass("ui-state-hover");b.hasClass("ui-datepicker-prev")&&b.addClass("ui-datepicker-prev-hover");b.hasClass("ui-datepicker-next")&&b.addClass("ui-datepicker-next-hover")}})}function H(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==C)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.16"}});var B=(new Date).getTime(),J;d.extend(M.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv}, setDefaults:function(a){H(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g, diff --git a/js/jquery/ui/themes/base/images/index.php b/js/jquery/ui/themes/base/images/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/ui/themes/base/images/index.php +++ b/js/jquery/ui/themes/base/images/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/ui/themes/base/index.php b/js/jquery/ui/themes/base/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/ui/themes/base/index.php +++ b/js/jquery/ui/themes/base/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/ui/themes/index.php b/js/jquery/ui/themes/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/ui/themes/index.php +++ b/js/jquery/ui/themes/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/ui/themes/ui-lightness/images/index.php b/js/jquery/ui/themes/ui-lightness/images/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/ui/themes/ui-lightness/images/index.php +++ b/js/jquery/ui/themes/ui-lightness/images/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/jquery/ui/themes/ui-lightness/index.php b/js/jquery/ui/themes/ui-lightness/index.php index 60bc2ce27..88e934d59 100644 --- a/js/jquery/ui/themes/ui-lightness/index.php +++ b/js/jquery/ui/themes/ui-lightness/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/price.js b/js/price.js index fc4b17482..6729dd17e 100644 --- a/js/price.js +++ b/js/price.js @@ -19,7 +19,6 @@ * * @author 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 */ diff --git a/js/productTabsManager.js b/js/productTabsManager.js index 1357c5e40..d12cea907 100644 --- a/js/productTabsManager.js +++ b/js/productTabsManager.js @@ -18,7 +18,6 @@ * * @author 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 */ diff --git a/js/sendMailTest.js b/js/sendMailTest.js index 571693503..d56fc542d 100644 --- a/js/sendMailTest.js +++ b/js/sendMailTest.js @@ -19,7 +19,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/index.php b/js/tiny_mce/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/index.php +++ b/js/tiny_mce/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/langs/index.php b/js/tiny_mce/langs/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/langs/index.php +++ b/js/tiny_mce/langs/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/advhr/css/index.php b/js/tiny_mce/plugins/advhr/css/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/advhr/css/index.php +++ b/js/tiny_mce/plugins/advhr/css/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/advhr/index.php b/js/tiny_mce/plugins/advhr/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/advhr/index.php +++ b/js/tiny_mce/plugins/advhr/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/advhr/js/index.php b/js/tiny_mce/plugins/advhr/js/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/advhr/js/index.php +++ b/js/tiny_mce/plugins/advhr/js/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/advhr/langs/index.php b/js/tiny_mce/plugins/advhr/langs/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/advhr/langs/index.php +++ b/js/tiny_mce/plugins/advhr/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/advimage/css/index.php b/js/tiny_mce/plugins/advimage/css/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/advimage/css/index.php +++ b/js/tiny_mce/plugins/advimage/css/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/advimage/img/index.php b/js/tiny_mce/plugins/advimage/img/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/advimage/img/index.php +++ b/js/tiny_mce/plugins/advimage/img/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/advimage/index.php b/js/tiny_mce/plugins/advimage/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/advimage/index.php +++ b/js/tiny_mce/plugins/advimage/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/advimage/js/index.php b/js/tiny_mce/plugins/advimage/js/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/advimage/js/index.php +++ b/js/tiny_mce/plugins/advimage/js/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/advimage/langs/index.php b/js/tiny_mce/plugins/advimage/langs/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/advimage/langs/index.php +++ b/js/tiny_mce/plugins/advimage/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/advlink/css/index.php b/js/tiny_mce/plugins/advlink/css/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/advlink/css/index.php +++ b/js/tiny_mce/plugins/advlink/css/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/advlink/index.php b/js/tiny_mce/plugins/advlink/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/advlink/index.php +++ b/js/tiny_mce/plugins/advlink/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/advlink/js/index.php b/js/tiny_mce/plugins/advlink/js/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/advlink/js/index.php +++ b/js/tiny_mce/plugins/advlink/js/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/advlink/langs/index.php b/js/tiny_mce/plugins/advlink/langs/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/advlink/langs/index.php +++ b/js/tiny_mce/plugins/advlink/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/advlist/index.php b/js/tiny_mce/plugins/advlist/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/advlist/index.php +++ b/js/tiny_mce/plugins/advlist/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/autolink/index.php b/js/tiny_mce/plugins/autolink/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/autolink/index.php +++ b/js/tiny_mce/plugins/autolink/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/autoresize/index.php b/js/tiny_mce/plugins/autoresize/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/autoresize/index.php +++ b/js/tiny_mce/plugins/autoresize/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/autosave/index.php b/js/tiny_mce/plugins/autosave/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/autosave/index.php +++ b/js/tiny_mce/plugins/autosave/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/autosave/langs/index.php b/js/tiny_mce/plugins/autosave/langs/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/autosave/langs/index.php +++ b/js/tiny_mce/plugins/autosave/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/bbcode/index.php b/js/tiny_mce/plugins/bbcode/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/bbcode/index.php +++ b/js/tiny_mce/plugins/bbcode/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/contextmenu/index.php b/js/tiny_mce/plugins/contextmenu/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/contextmenu/index.php +++ b/js/tiny_mce/plugins/contextmenu/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/directionality/index.php b/js/tiny_mce/plugins/directionality/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/directionality/index.php +++ b/js/tiny_mce/plugins/directionality/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/emotions/img/index.php b/js/tiny_mce/plugins/emotions/img/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/emotions/img/index.php +++ b/js/tiny_mce/plugins/emotions/img/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/emotions/index.php b/js/tiny_mce/plugins/emotions/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/emotions/index.php +++ b/js/tiny_mce/plugins/emotions/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/emotions/js/index.php b/js/tiny_mce/plugins/emotions/js/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/emotions/js/index.php +++ b/js/tiny_mce/plugins/emotions/js/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/emotions/langs/index.php b/js/tiny_mce/plugins/emotions/langs/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/emotions/langs/index.php +++ b/js/tiny_mce/plugins/emotions/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/fullpage/css/index.php b/js/tiny_mce/plugins/fullpage/css/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/fullpage/css/index.php +++ b/js/tiny_mce/plugins/fullpage/css/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/fullpage/index.php b/js/tiny_mce/plugins/fullpage/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/fullpage/index.php +++ b/js/tiny_mce/plugins/fullpage/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/fullpage/js/index.php b/js/tiny_mce/plugins/fullpage/js/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/fullpage/js/index.php +++ b/js/tiny_mce/plugins/fullpage/js/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/fullpage/langs/index.php b/js/tiny_mce/plugins/fullpage/langs/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/fullpage/langs/index.php +++ b/js/tiny_mce/plugins/fullpage/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/fullscreen/index.php b/js/tiny_mce/plugins/fullscreen/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/fullscreen/index.php +++ b/js/tiny_mce/plugins/fullscreen/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/iespell/index.php b/js/tiny_mce/plugins/iespell/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/iespell/index.php +++ b/js/tiny_mce/plugins/iespell/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/index.php b/js/tiny_mce/plugins/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/index.php +++ b/js/tiny_mce/plugins/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/inlinepopups/index.php b/js/tiny_mce/plugins/inlinepopups/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/inlinepopups/index.php +++ b/js/tiny_mce/plugins/inlinepopups/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/index.php b/js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/index.php +++ b/js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/index.php b/js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/index.php +++ b/js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/inlinepopups/skins/index.php b/js/tiny_mce/plugins/inlinepopups/skins/index.php index c540fe1ff..7a626751d 100755 --- a/js/tiny_mce/plugins/inlinepopups/skins/index.php +++ b/js/tiny_mce/plugins/inlinepopups/skins/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/insertdatetime/index.php b/js/tiny_mce/plugins/insertdatetime/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/insertdatetime/index.php +++ b/js/tiny_mce/plugins/insertdatetime/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/layer/index.php b/js/tiny_mce/plugins/layer/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/layer/index.php +++ b/js/tiny_mce/plugins/layer/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/legacyoutput/index.php b/js/tiny_mce/plugins/legacyoutput/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/legacyoutput/index.php +++ b/js/tiny_mce/plugins/legacyoutput/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/lists/index.php b/js/tiny_mce/plugins/lists/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/lists/index.php +++ b/js/tiny_mce/plugins/lists/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/media/css/index.php b/js/tiny_mce/plugins/media/css/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/media/css/index.php +++ b/js/tiny_mce/plugins/media/css/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/media/index.php b/js/tiny_mce/plugins/media/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/media/index.php +++ b/js/tiny_mce/plugins/media/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/media/js/index.php b/js/tiny_mce/plugins/media/js/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/media/js/index.php +++ b/js/tiny_mce/plugins/media/js/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/media/langs/index.php b/js/tiny_mce/plugins/media/langs/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/media/langs/index.php +++ b/js/tiny_mce/plugins/media/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/nonbreaking/index.php b/js/tiny_mce/plugins/nonbreaking/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/nonbreaking/index.php +++ b/js/tiny_mce/plugins/nonbreaking/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/noneditable/index.php b/js/tiny_mce/plugins/noneditable/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/noneditable/index.php +++ b/js/tiny_mce/plugins/noneditable/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/pagebreak/index.php b/js/tiny_mce/plugins/pagebreak/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/pagebreak/index.php +++ b/js/tiny_mce/plugins/pagebreak/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/paste/index.php b/js/tiny_mce/plugins/paste/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/paste/index.php +++ b/js/tiny_mce/plugins/paste/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/paste/js/index.php b/js/tiny_mce/plugins/paste/js/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/paste/js/index.php +++ b/js/tiny_mce/plugins/paste/js/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/paste/langs/index.php b/js/tiny_mce/plugins/paste/langs/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/paste/langs/index.php +++ b/js/tiny_mce/plugins/paste/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/preview/index.php b/js/tiny_mce/plugins/preview/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/preview/index.php +++ b/js/tiny_mce/plugins/preview/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/preview/jscripts/index.php b/js/tiny_mce/plugins/preview/jscripts/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/preview/jscripts/index.php +++ b/js/tiny_mce/plugins/preview/jscripts/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/print/index.php b/js/tiny_mce/plugins/print/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/print/index.php +++ b/js/tiny_mce/plugins/print/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/save/index.php b/js/tiny_mce/plugins/save/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/save/index.php +++ b/js/tiny_mce/plugins/save/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/searchreplace/css/index.php b/js/tiny_mce/plugins/searchreplace/css/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/searchreplace/css/index.php +++ b/js/tiny_mce/plugins/searchreplace/css/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/searchreplace/index.php b/js/tiny_mce/plugins/searchreplace/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/searchreplace/index.php +++ b/js/tiny_mce/plugins/searchreplace/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/searchreplace/js/index.php b/js/tiny_mce/plugins/searchreplace/js/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/searchreplace/js/index.php +++ b/js/tiny_mce/plugins/searchreplace/js/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/searchreplace/langs/index.php b/js/tiny_mce/plugins/searchreplace/langs/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/searchreplace/langs/index.php +++ b/js/tiny_mce/plugins/searchreplace/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/spellchecker/css/index.php b/js/tiny_mce/plugins/spellchecker/css/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/spellchecker/css/index.php +++ b/js/tiny_mce/plugins/spellchecker/css/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/spellchecker/img/index.php b/js/tiny_mce/plugins/spellchecker/img/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/spellchecker/img/index.php +++ b/js/tiny_mce/plugins/spellchecker/img/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/spellchecker/index.php b/js/tiny_mce/plugins/spellchecker/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/spellchecker/index.php +++ b/js/tiny_mce/plugins/spellchecker/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/style/css/index.php b/js/tiny_mce/plugins/style/css/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/style/css/index.php +++ b/js/tiny_mce/plugins/style/css/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/style/index.php b/js/tiny_mce/plugins/style/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/style/index.php +++ b/js/tiny_mce/plugins/style/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/style/js/index.php b/js/tiny_mce/plugins/style/js/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/style/js/index.php +++ b/js/tiny_mce/plugins/style/js/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/style/langs/index.php b/js/tiny_mce/plugins/style/langs/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/style/langs/index.php +++ b/js/tiny_mce/plugins/style/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/tabfocus/index.php b/js/tiny_mce/plugins/tabfocus/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/tabfocus/index.php +++ b/js/tiny_mce/plugins/tabfocus/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/table/css/index.php b/js/tiny_mce/plugins/table/css/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/table/css/index.php +++ b/js/tiny_mce/plugins/table/css/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/table/index.php b/js/tiny_mce/plugins/table/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/table/index.php +++ b/js/tiny_mce/plugins/table/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/table/js/index.php b/js/tiny_mce/plugins/table/js/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/table/js/index.php +++ b/js/tiny_mce/plugins/table/js/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/table/langs/index.php b/js/tiny_mce/plugins/table/langs/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/table/langs/index.php +++ b/js/tiny_mce/plugins/table/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/template/css/index.php b/js/tiny_mce/plugins/template/css/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/template/css/index.php +++ b/js/tiny_mce/plugins/template/css/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/template/index.php b/js/tiny_mce/plugins/template/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/template/index.php +++ b/js/tiny_mce/plugins/template/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/template/js/index.php b/js/tiny_mce/plugins/template/js/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/template/js/index.php +++ b/js/tiny_mce/plugins/template/js/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/template/langs/index.php b/js/tiny_mce/plugins/template/langs/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/template/langs/index.php +++ b/js/tiny_mce/plugins/template/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/visualchars/index.php b/js/tiny_mce/plugins/visualchars/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/visualchars/index.php +++ b/js/tiny_mce/plugins/visualchars/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/wordcount/index.php b/js/tiny_mce/plugins/wordcount/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/wordcount/index.php +++ b/js/tiny_mce/plugins/wordcount/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/plugins/xhtmlxtras/css/index.php b/js/tiny_mce/plugins/xhtmlxtras/css/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/xhtmlxtras/css/index.php +++ b/js/tiny_mce/plugins/xhtmlxtras/css/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/xhtmlxtras/index.php b/js/tiny_mce/plugins/xhtmlxtras/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/xhtmlxtras/index.php +++ b/js/tiny_mce/plugins/xhtmlxtras/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/xhtmlxtras/js/index.php b/js/tiny_mce/plugins/xhtmlxtras/js/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/plugins/xhtmlxtras/js/index.php +++ b/js/tiny_mce/plugins/xhtmlxtras/js/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/plugins/xhtmlxtras/langs/index.php b/js/tiny_mce/plugins/xhtmlxtras/langs/index.php index 60bc2ce27..88e934d59 100644 --- a/js/tiny_mce/plugins/xhtmlxtras/langs/index.php +++ b/js/tiny_mce/plugins/xhtmlxtras/langs/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/js/tiny_mce/themes/advanced/img/index.php b/js/tiny_mce/themes/advanced/img/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/themes/advanced/img/index.php +++ b/js/tiny_mce/themes/advanced/img/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/themes/advanced/index.php b/js/tiny_mce/themes/advanced/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/themes/advanced/index.php +++ b/js/tiny_mce/themes/advanced/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/themes/advanced/js/index.php b/js/tiny_mce/themes/advanced/js/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/themes/advanced/js/index.php +++ b/js/tiny_mce/themes/advanced/js/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/themes/advanced/langs/index.php b/js/tiny_mce/themes/advanced/langs/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/themes/advanced/langs/index.php +++ b/js/tiny_mce/themes/advanced/langs/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/themes/advanced/skins/cirkuit/img/index.php b/js/tiny_mce/themes/advanced/skins/cirkuit/img/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/themes/advanced/skins/cirkuit/img/index.php +++ b/js/tiny_mce/themes/advanced/skins/cirkuit/img/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/themes/advanced/skins/cirkuit/index.php b/js/tiny_mce/themes/advanced/skins/cirkuit/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/themes/advanced/skins/cirkuit/index.php +++ b/js/tiny_mce/themes/advanced/skins/cirkuit/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/themes/advanced/skins/default/img/index.php b/js/tiny_mce/themes/advanced/skins/default/img/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/themes/advanced/skins/default/img/index.php +++ b/js/tiny_mce/themes/advanced/skins/default/img/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/themes/advanced/skins/default/index.php b/js/tiny_mce/themes/advanced/skins/default/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/themes/advanced/skins/default/index.php +++ b/js/tiny_mce/themes/advanced/skins/default/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/themes/advanced/skins/highcontrast/index.php b/js/tiny_mce/themes/advanced/skins/highcontrast/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/themes/advanced/skins/highcontrast/index.php +++ b/js/tiny_mce/themes/advanced/skins/highcontrast/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/themes/advanced/skins/index.php b/js/tiny_mce/themes/advanced/skins/index.php index c540fe1ff..7a626751d 100755 --- a/js/tiny_mce/themes/advanced/skins/index.php +++ b/js/tiny_mce/themes/advanced/skins/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/themes/advanced/skins/o2k7/img/index.php b/js/tiny_mce/themes/advanced/skins/o2k7/img/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/themes/advanced/skins/o2k7/img/index.php +++ b/js/tiny_mce/themes/advanced/skins/o2k7/img/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/themes/advanced/skins/o2k7/index.php b/js/tiny_mce/themes/advanced/skins/o2k7/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/themes/advanced/skins/o2k7/index.php +++ b/js/tiny_mce/themes/advanced/skins/o2k7/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/themes/index.php b/js/tiny_mce/themes/index.php index c540fe1ff..7a626751d 100755 --- a/js/tiny_mce/themes/index.php +++ b/js/tiny_mce/themes/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/tiny_mce/utils/index.php b/js/tiny_mce/utils/index.php index 4df93c9f7..ec45b2dfe 100755 --- a/js/tiny_mce/utils/index.php +++ b/js/tiny_mce/utils/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14009 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/js/toggle.js b/js/toggle.js index 33e421654..66ba2b08d 100644 --- a/js/toggle.js +++ b/js/toggle.js @@ -19,7 +19,6 @@ * * @author 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 */ diff --git a/js/tools.js b/js/tools.js index 435511e19..a09812b51 100644 --- a/js/tools.js +++ b/js/tools.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7448 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/localization/index.php b/localization/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/localization/index.php +++ b/localization/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/log/index.php b/log/index.php index 60bc2ce27..88e934d59 100755 --- a/log/index.php +++ b/log/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/mails/de/account.html b/mails/de/account.html index ad17dfe6e..b42581397 100644 --- a/mails/de/account.html +++ b/mails/de/account.html @@ -14,19 +14,19 @@
    - + - + - + @@ -44,7 +44,7 @@ - +
    {$category}
     
    Hallo {firstname} {lastname},Hallo {firstname} {lastname},
     
    Ihre Konto-Login-DetailsIhre Konto-Login-Details
     
    E-Mail-Adresse: {email}
    Kennwort: {passwd}    		E-Mail-Adresse: {email}
    Kennwort: {passwd}
      
    {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
    diff --git a/mails/de/backoffice_order.html b/mails/de/backoffice_order.html index 71147f705..6d1de4f3c 100644 --- a/mails/de/backoffice_order.html +++ b/mails/de/backoffice_order.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -14,27 +14,27 @@ - + - + - + - + -
     
    Hi {firstname} {lastname},Hi {firstname} {lastname},
     
    A new command has been generated to you.A new command has been generated to you.
     
    Go on {order_link} to finalize the payment.Go on {order_link} to finalize the payment.
     
    {shop_name} powered by PrestaShop™{shop_name} powered by PrestaShop™
    - + + \ No newline at end of file diff --git a/mails/de/bankwire.html b/mails/de/bankwire.html index 8ac1e9d08..0d584464b 100644 --- a/mails/de/bankwire.html +++ b/mails/de/bankwire.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre Bestellung Nr.{order_name} +Ihre Bestellung Nr.{order_name}   @@ -38,16 +38,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/cheque.html b/mails/de/cheque.html index dcae38ab2..b05c140b7 100644 --- a/mails/de/cheque.html +++ b/mails/de/cheque.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihr Bestellverlauf {order_name} +Ihr Bestellverlauf {order_name}   @@ -38,16 +38,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/contact.html b/mails/de/contact.html index 112b08e55..d8acb32ad 100644 --- a/mails/de/contact.html +++ b/mails/de/contact.html @@ -14,7 +14,7 @@   -Nachricht von Ihrem Shop {shop_name} +Nachricht von Ihrem Shop {shop_name}   @@ -26,7 +26,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/contact_form.html b/mails/de/contact_form.html index f241a214f..81769e4b7 100644 --- a/mails/de/contact_form.html +++ b/mails/de/contact_form.html @@ -14,7 +14,7 @@   -Ihre Nachricht wurde korrekt an unseren Kundendienst weitergeleitet. +Ihre Nachricht wurde korrekt an unseren Kundendienst weitergeleitet.   @@ -26,13 +26,13 @@   -Wir werden so schnell wie möglich antworten. +Wir werden so schnell wie möglich antworten.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/credit_slip.html b/mails/de/credit_slip.html index 8b4320ee7..8f5df22de 100644 --- a/mails/de/credit_slip.html +++ b/mails/de/credit_slip.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre Bestellung Nr.{id_order} +Ihre Bestellung Nr.{id_order}   @@ -32,13 +32,13 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverfolgung" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverfolgung" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/download-product.tpl b/mails/de/download-product.tpl index e3ceccc3a..69dea48ba 100644 --- a/mails/de/download-product.tpl +++ b/mails/de/download-product.tpl @@ -1,13 +1,13 @@ -
      -{foreach from=$virtualProducts item=product} -
    • - {$product.name} - {if isset($product.deadline)} - expires on {$product.deadline} - {/if} - {if isset($product.downloadable)} - downloadable {$product.downloadable} times - {/if} -
      • -{/foreach} +
        +{foreach from=$virtualProducts item=product} +
      • + {$product.name} + {if isset($product.deadline)} + expires on {$product.deadline} + {/if} + {if isset($product.downloadable)} + downloadable {$product.downloadable} time(s) + {/if} +
        • +{/foreach}
      \ No newline at end of file diff --git a/mails/de/download_product.html b/mails/de/download_product.html index 8f2d3ecb7..ed2eb1a5b 100644 --- a/mails/de/download_product.html +++ b/mails/de/download_product.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, danke für Ihren Einkauf bei {shop_name}. +Hallo {firstname} {lastname}, danke für Ihren Einkauf bei {shop_name}.   -Produkt (e) zum Download +Produkt (e) zum Download   @@ -38,16 +38,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/employee_password.html b/mails/de/employee_password.html index 32e042b3c..46a08a614 100644 --- a/mails/de/employee_password.html +++ b/mails/de/employee_password.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre persönlichen Login-Daten +Ihre persönlichen Login-Daten   @@ -32,7 +32,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/guest_to_customer.html b/mails/de/guest_to_customer.html index ef792b505..8a0660a7e 100644 --- a/mails/de/guest_to_customer.html +++ b/mails/de/guest_to_customer.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihr Gast-Konto wurde in ein Kunden-Konto umgewandelt +Ihr Gast-Konto wurde in ein Kunden-Konto umgewandelt   @@ -38,7 +38,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/in_transit.html b/mails/de/in_transit.html index c54d878f1..597b9a405 100644 --- a/mails/de/in_transit.html +++ b/mails/de/in_transit.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre Bestellung Nr.{id_order} +Ihre Bestellung Nr.{id_order}   @@ -38,16 +38,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/index.php b/mails/de/index.php index 5be4163e3..08550506c 100644 --- a/mails/de/index.php +++ b/mails/de/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/mails/de/lang.php b/mails/de/lang.php index bb335c3e7..fa8de2637 100644 --- a/mails/de/lang.php +++ b/mails/de/lang.php @@ -2,41 +2,31 @@ global $_LANGMAIL; $_LANGMAIL = array(); -$_LANGMAIL['Welcome!'] = 'Willkommen!'; -$_LANGMAIL['Process the payment of your order'] = ''; -$_LANGMAIL['Message from contact form'] = 'Nachricht aus dem Kontaktformular'; -$_LANGMAIL['Your message has been correctly sent'] = 'Ihre Nachricht ist korrekt gesendet worden'; + $_LANGMAIL['New credit slip regarding your order'] = 'Gutschrift zu Ihrer Bestellung'; -$_LANGMAIL['Virtual product to download'] = ''; -$_LANGMAIL['Fwd: Customer message'] = 'Fwd: Kundennachricht'; $_LANGMAIL['Your guest account has been transformed to customer account'] = 'Ihr Gast-Konto wurde in ein Kunden-Konto umgewandelt'; -$_LANGMAIL['Package in transit'] = 'Paket versendet'; -$_LANGMAIL['Log: You have a new alert from your shop'] = 'Sie haben ein Log-Alert aus Ihrem Shop erhalten'; -$_LANGMAIL['Your order has been changed'] = ''; -$_LANGMAIL['Order confirmation'] = 'Automatische Bestellbestätigung'; $_LANGMAIL['Message from a customer'] = 'Nachricht eines Kunden'; -$_LANGMAIL['New message regarding your order'] = 'Neue Nachricht zu Ihrer Bestellung'; -$_LANGMAIL['Your order return state has changed'] = 'Der Status Ihrer Rücksendung wurde geändert'; $_LANGMAIL['Your new password'] = 'Ihr neues Kennwort'; -$_LANGMAIL['Password query confirmation'] = 'Bestätigung der Kennwortänderung'; -$_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = 'Sie haben eine Antwort auf Ihre Nachricht erhalten #ct%1$s #tc%2$s'; -$_LANGMAIL['New voucher regarding your order %s'] = 'Neuer Gutschein zu Ihrer Bestellung %s'; $_LANGMAIL['Newsletter confirmation'] = 'Bestätigung Ihrer Anmeldung zu unserem Newsletter'; -$_LANGMAIL['Email verification'] = ''; $_LANGMAIL['Newsletter voucher'] = 'Newsletter-Gutschein'; -$_LANGMAIL['Your wishlist\\\'s link'] = 'Ihr Wunschlisten-Link'; $_LANGMAIL['Message from %1$s %2$s'] = 'Nachricht von %1$s %2$s'; $_LANGMAIL['Your cart and your discount'] = 'Gutschein zu Ihrem offenen Warenkorb'; -$_LANGMAIL['Thanks for your order'] = 'Wir danken für Ihren Auftrag'; +$_LANGMAIL['%1$s sent you a link to %2$s'] = '%1$s hat Ihnen einen Link von %2$s geschickt'; +$_LANGMAIL['Package in transit'] = 'Paket versendet'; +$_LANGMAIL['Log: You have a new alert from your shop'] = 'Sie haben ein Log-Alert aus Ihrem Shop erhalten'; +$_LANGMAIL['Password query confirmation'] = 'Bestätigung der Kennwortänderung'; +$_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = 'Sie haben eine Antwort auf Ihre Nachricht erhalten #ct%1$s #tc%2$s'; $_LANGMAIL['You are one of our best customers'] = 'Sie sind einer unserer besten Kunden'; +$_LANGMAIL['Welcome!'] = 'Willkommen!'; +$_LANGMAIL['Fwd: Customer message'] = 'Fwd: Kundennachricht'; +$_LANGMAIL['Order confirmation'] = 'Automatische Bestellbestätigung'; +$_LANGMAIL['New message regarding your order'] = 'Neue Nachricht zu Ihrer Bestellung'; +$_LANGMAIL['New voucher regarding your order %s'] = 'Neuer Gutschein zu Ihrer Bestellung %s'; +$_LANGMAIL['Thanks for your order'] = 'Wir danken für Ihren Auftrag'; $_LANGMAIL['We miss you'] = 'Wir danken für Ihr Vertrauen'; -$_LANGMAIL['Product available'] = 'Produkt wieder verfügbar'; -$_LANGMAIL['New order - #%06d'] = ''; -$_LANGMAIL['Stock coverage'] = ''; -$_LANGMAIL['Product out of stock'] = 'Produkt leider ausverkauft'; -$_LANGMAIL['Error reporting from your PayPal module'] = 'Fehlerbericht aus Ihrem PayPal Modul'; $_LANGMAIL['Congratulations!'] = 'Gratulation'; -$_LANGMAIL['Referral Program'] = 'Empfehlungsprogramm'; -$_LANGMAIL['%1$s sent you a link to %2$s'] = ''; - -?> \ No newline at end of file +$_LANGMAIL['Message from contact form'] = 'Nachricht aus dem Kontaktformular'; +$_LANGMAIL['Your message has been correctly sent'] = 'Ihre Nachricht ist korrekt gesendet worden'; +$_LANGMAIL['Your order return state has changed'] = 'Der Status Ihrer Rücksendung wurde geändert'; +$_LANGMAIL['Product available'] = 'Produkt wieder verfügbar'; +$_LANGMAIL['Product out of stock'] = 'Produkt leider ausverkauft'; diff --git a/mails/de/log_alert.html b/mails/de/log_alert.html index 0687ff878..83f3124e5 100755 --- a/mails/de/log_alert.html +++ b/mails/de/log_alert.html @@ -20,7 +20,7 @@   -Neue Log-Warnung +Neue Log-Warnung   @@ -38,7 +38,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/newsletter.html b/mails/de/newsletter.html index 009ec9c42..689920a2f 100644 --- a/mails/de/newsletter.html +++ b/mails/de/newsletter.html @@ -14,7 +14,7 @@   -Nachricht von {shop_name} +Nachricht von {shop_name}   @@ -26,7 +26,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/order_canceled.html b/mails/de/order_canceled.html index 5fca793f4..4c9662cbb 100644 --- a/mails/de/order_canceled.html +++ b/mails/de/order_canceled.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre Bestellung Nr.{id_order} +Ihre Bestellung Nr.{id_order}   @@ -32,16 +32,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/order_changed.html b/mails/de/order_changed.html index 18d2fc3d1..dfd58d8e9 100644 --- a/mails/de/order_changed.html +++ b/mails/de/order_changed.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Order changed +Your order with the reference {order_name} - Order changed   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      -If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/de/order_conf.html b/mails/de/order_conf.html index 22d03fd64..9026ea9a9 100644 --- a/mails/de/order_conf.html +++ b/mails/de/order_conf.html @@ -14,19 +14,19 @@   -Hallo {firstname} {lastname}, danke für Ihren Einkauf bei {shop_name}. +Hallo {firstname} {lastname}, danke für Ihren Einkauf bei {shop_name}.   -Details zu Ihrer Bestellung +Details zu Ihrer Bestellung   -Bestellung: {order_name} vom {date}
      Zahlung: {payment} +Bestellung: {order_name} vom {date}
      Zahlung: {payment}   @@ -75,7 +75,7 @@   -Versand +Versand   @@ -103,16 +103,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/order_customer_comment.html b/mails/de/order_customer_comment.html index f6113b85a..3fd939dc6 100644 --- a/mails/de/order_customer_comment.html +++ b/mails/de/order_customer_comment.html @@ -20,7 +20,7 @@   -Nachricht von {firstname} {lastname} ({email}) +Nachricht von {firstname} {lastname} ({email})   @@ -32,7 +32,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/order_merchant_comment.html b/mails/de/order_merchant_comment.html index 07e659ca9..ac8b6de13 100644 --- a/mails/de/order_merchant_comment.html +++ b/mails/de/order_merchant_comment.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Nachricht von {shop_name} +Nachricht von {shop_name}   @@ -32,7 +32,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/order_return_state.html b/mails/de/order_return_state.html index a31814e16..f8e925b22 100644 --- a/mails/de/order_return_state.html +++ b/mails/de/order_return_state.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Der Verlauf Ihrer Bestellrücksendung Nr. {id_order_return} +Der Verlauf Ihrer Bestellrücksendung Nr. {id_order_return}   @@ -32,13 +32,13 @@   -Sie können diese Bestellrücksendung im Abschnitt "Bestellverlauf" Ihres Kontos ansehen, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellrücksendung im Abschnitt "Bestellverlauf" Ihres Kontos ansehen, indem Sie auf unserer Webseite auf "Mein Konto" klicken.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/outofstock.html b/mails/de/outofstock.html index ec07e7f5c..0d1f92ae0 100644 --- a/mails/de/outofstock.html +++ b/mails/de/outofstock.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Der Verlauf Ihrer Bestellung Nr.{id_order} +Der Verlauf Ihrer Bestellung Nr.{id_order}   @@ -32,16 +32,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/password.html b/mails/de/password.html index 9533a6e30..83904f395 100644 --- a/mails/de/password.html +++ b/mails/de/password.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre neuen Login-Details +Ihre neuen Login-Details   @@ -38,7 +38,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/password_query.html b/mails/de/password_query.html index d58393fc4..f9c22f77c 100644 --- a/mails/de/password_query.html +++ b/mails/de/password_query.html @@ -14,7 +14,7 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   @@ -32,7 +32,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/payment.html b/mails/de/payment.html index d261e7efc..f83376680 100644 --- a/mails/de/payment.html +++ b/mails/de/payment.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre Bestellung Nr.{id_order} Verlauf +Ihre Bestellung Nr.{id_order} Verlauf   @@ -32,13 +32,13 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/payment_error.html b/mails/de/payment_error.html index b54b87343..7747ac603 100644 --- a/mails/de/payment_error.html +++ b/mails/de/payment_error.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Der Verlauf Ihrer Bestellung Nr.{id_order} +Der Verlauf Ihrer Bestellung Nr.{id_order}   @@ -38,16 +38,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf"Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf"Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/preparation.html b/mails/de/preparation.html index 0bde6833c..4cc4f21f6 100644 --- a/mails/de/preparation.html +++ b/mails/de/preparation.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Der Verlauf Ihrer Bestellung Nr.{id_order} +Der Verlauf Ihrer Bestellung Nr.{id_order}   @@ -32,16 +32,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/refund.html b/mails/de/refund.html index 3fb4a61e4..0259c74cc 100644 --- a/mails/de/refund.html +++ b/mails/de/refund.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Der Verlauf Ihrer Bestellung Nr.{id_order} +Der Verlauf Ihrer Bestellung Nr.{id_order}   @@ -32,16 +32,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/shipped.html b/mails/de/shipped.html index bc2ea167d..91738bcfb 100644 --- a/mails/de/shipped.html +++ b/mails/de/shipped.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Der Verlauf Ihrer Bestellung Nr.{id_order} +Der Verlauf Ihrer Bestellung Nr.{id_order}   @@ -32,16 +32,16 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/voucher.html b/mails/de/voucher.html index 30bf19eb3..b4e914f72 100644 --- a/mails/de/voucher.html +++ b/mails/de/voucher.html @@ -14,13 +14,13 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Verlauf Ihrer Bestellung Nr.{id_order} +Verlauf Ihrer Bestellung Nr.{id_order}   @@ -38,7 +38,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/de/voucher_new.html b/mails/de/voucher_new.html index a248df3dd..24090efd2 100644 --- a/mails/de/voucher_new.html +++ b/mails/de/voucher_new.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -32,9 +32,9 @@ - + -
       
      Hi {firstname} {lastname},Hi {firstname} {lastname},
        
      {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
      - + + \ No newline at end of file diff --git a/mails/en/account.html b/mails/en/account.html index 51894fff7..a7e86c404 100644 --- a/mails/en/account.html +++ b/mails/en/account.html @@ -14,19 +14,19 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your {shop_name} login details +Your {shop_name} login details   -Thank you for creating a customer account at {shop_name}.

      Here are your login details:

      E-mail address: {email}
      Password: {passwd} +Thank you for creating a customer account at {shop_name}.

      Here are your login details:

      E-mail address: {email}
      Password: {passwd}   @@ -46,7 +46,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/backoffice_order.html b/mails/en/backoffice_order.html index d12b75ae7..cd5bd4286 100644 --- a/mails/en/backoffice_order.html +++ b/mails/en/backoffice_order.html @@ -14,25 +14,25 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -A new command has been generated to you. +A new command has been generated to you.   -Go on {order_link} to finalize the payment. +Go on {order_link} to finalize the payment.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/bankwire.html b/mails/en/bankwire.html index 3ff23aeed..624ed99f3 100644 --- a/mails/en/bankwire.html +++ b/mails/en/bankwire.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Awaiting wire payment +Your order with the reference {order_name} - Awaiting wire payment   @@ -38,16 +38,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      -If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/cheque.html b/mails/en/cheque.html index e2a84caa8..80b88796a 100644 --- a/mails/en/cheque.html +++ b/mails/en/cheque.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Awaiting check payment +Your order with the reference {order_name} - Awaiting check payment   @@ -38,16 +38,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      -If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/contact.html b/mails/en/contact.html index 87bd641df..62ab2c9ab 100644 --- a/mails/en/contact.html +++ b/mails/en/contact.html @@ -14,7 +14,7 @@   -Message from a {shop_name} customer +Message from a {shop_name} customer   @@ -26,7 +26,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/contact_form.html b/mails/en/contact_form.html index 524994467..67ee471ca 100644 --- a/mails/en/contact_form.html +++ b/mails/en/contact_form.html @@ -14,7 +14,7 @@   -Your message to {shop_name} Customer Service +Your message to {shop_name} Customer Service   @@ -32,7 +32,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/credit_slip.html b/mails/en/credit_slip.html index 4d4430eae..6e77a07ef 100644 --- a/mails/en/credit_slip.html +++ b/mails/en/credit_slip.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Credit slip created +Your order with the reference {order_name} - Credit slip created   @@ -32,13 +32,13 @@   -You can review this credit slip and download your invoice from the "My credit slips" section of your account by clicking "My account" on our shop. +You can review this credit slip and download your invoice from the "My credit slips" section of your account by clicking "My account" on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/download_product.html b/mails/en/download_product.html index 89ffc55ec..679f3826d 100644 --- a/mails/en/download_product.html +++ b/mails/en/download_product.html @@ -14,13 +14,13 @@   -Hello {firstname} {lastname} +Hello {firstname} {lastname}   -Product(s) now available for download +Product(s) now available for download   @@ -38,16 +38,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      -If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/employee_password.html b/mails/en/employee_password.html index beffeffef..adcd4d689 100644 --- a/mails/en/employee_password.html +++ b/mails/en/employee_password.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your {shop_name} login information +Your {shop_name} login information   @@ -32,7 +32,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/forward_msg.html b/mails/en/forward_msg.html index e2ffb7853..095308131 100644 --- a/mails/en/forward_msg.html +++ b/mails/en/forward_msg.html @@ -8,7 +8,7 @@ - + @@ -20,7 +20,7 @@ - +
      Customer service - Forwarded discussionCustomer service - Forwarded discussion
        
      {shop_name} powered by PrestaShop™{shop_name} powered by PrestaShop™
      diff --git a/mails/en/guest_to_customer.html b/mails/en/guest_to_customer.html index 5858f3800..1e04e69d2 100644 --- a/mails/en/guest_to_customer.html +++ b/mails/en/guest_to_customer.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your customer account creation +Your customer account creation   @@ -44,7 +44,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/in_transit.html b/mails/en/in_transit.html index e464c66d0..5ea27e06b 100755 --- a/mails/en/in_transit.html +++ b/mails/en/in_transit.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - In transit +Your order with the reference {order_name} - In transit   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      -If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/index.php b/mails/en/index.php index 5be4163e3..08550506c 100644 --- a/mails/en/index.php +++ b/mails/en/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/mails/en/lang.php b/mails/en/lang.php index 4b14bedc6..77dd41de1 100644 --- a/mails/en/lang.php +++ b/mails/en/lang.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/mails/en/log_alert.html b/mails/en/log_alert.html index d434f6ece..e6ca7b45e 100755 --- a/mails/en/log_alert.html +++ b/mails/en/log_alert.html @@ -20,7 +20,7 @@   -You have received a new log alert +You have received a new log alert   @@ -38,7 +38,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/newsletter.html b/mails/en/newsletter.html index 7d6c70523..02c6d14ac 100644 --- a/mails/en/newsletter.html +++ b/mails/en/newsletter.html @@ -14,7 +14,7 @@   -Newsletter from {shop_name} +Newsletter from {shop_name}   @@ -26,7 +26,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/order_canceled.html b/mails/en/order_canceled.html index e32c8030d..08d4d898f 100644 --- a/mails/en/order_canceled.html +++ b/mails/en/order_canceled.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Order cancelled +Your order with the reference {order_name} - Order cancelled   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      -If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/order_changed.html b/mails/en/order_changed.html index 42c5c9d25..04ea9150c 100644 --- a/mails/en/order_changed.html +++ b/mails/en/order_changed.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Order changed +Your order with the reference {order_name} - Order changed   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      -If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html index 062ba36ac..b3b54eeb8 100644 --- a/mails/en/order_conf.html +++ b/mails/en/order_conf.html @@ -14,19 +14,19 @@   -Hi {firstname} {lastname},

      Thank you for shopping with {shop_name}! +Hi {firstname} {lastname},

      Thank you for shopping with {shop_name}!   -Order details +Order details   -Order: {order_name} placed on {date}
      Payment: {payment} +Order: {order_name} placed on {date}
      Payment: {payment}   @@ -35,9 +35,17 @@ - + + + + + + + - + @@ -75,7 +83,7 @@ - + @@ -103,16 +111,16 @@ - + - + - +
      ReferenceProductUnit priceQuantityTotal price
      ReferenceProductUnit priceQuantityTotal price
      {products} +{products} +
      {discounts} 
      ShippingShipping
        
      You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      		You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
      If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
       
      {shop_name} powered by PrestaShop™{shop_name} powered by PrestaShop™
      diff --git a/mails/en/order_customer_comment.html b/mails/en/order_customer_comment.html index e32f17fdf..671a97dfd 100644 --- a/mails/en/order_customer_comment.html +++ b/mails/en/order_customer_comment.html @@ -20,7 +20,7 @@   -Message from a customer +Message from a customer   @@ -32,7 +32,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/order_merchant_comment.html b/mails/en/order_merchant_comment.html index 19c97e84b..8b5c04615 100644 --- a/mails/en/order_merchant_comment.html +++ b/mails/en/order_merchant_comment.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -New message from {shop_name} +New message from {shop_name}   @@ -32,7 +32,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/order_return_state.html b/mails/en/order_return_state.html index 1d340104a..4ba720b7c 100644 --- a/mails/en/order_return_state.html +++ b/mails/en/order_return_state.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Return #{id_order_return} - update +Return #{id_order_return} - update   @@ -32,13 +32,13 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

        -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/outofstock.html b/mails/en/outofstock.html index bd3c6e9b7..59e9d1b26 100644 --- a/mails/en/outofstock.html +++ b/mails/en/outofstock.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Item(s) out of stock +Your order with the reference {order_name} - Item(s) out of stock   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      -If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/password.html b/mails/en/password.html index 2cf30df6e..fdfa0486f 100644 --- a/mails/en/password.html +++ b/mails/en/password.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your new {shop_name} login details +Your new {shop_name} login details   @@ -38,7 +38,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/password_query.html b/mails/en/password_query.html index e91f7e29d..b85db5bb7 100644 --- a/mails/en/password_query.html +++ b/mails/en/password_query.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Password reset request for {shop_name} +Password reset request for {shop_name}   @@ -38,7 +38,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/payment.html b/mails/en/payment.html index 06149f20a..489b0063f 100644 --- a/mails/en/payment.html +++ b/mails/en/payment.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Payment processed +Your order with the reference {order_name} - Payment processed   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      -If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/payment_error.html b/mails/en/payment_error.html index 53a179665..c6e117334 100644 --- a/mails/en/payment_error.html +++ b/mails/en/payment_error.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Payment processing error +Your order with the reference {order_name} - Payment processing error   @@ -38,16 +38,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      -If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/preparation.html b/mails/en/preparation.html index 83d013915..c6e4be688 100644 --- a/mails/en/preparation.html +++ b/mails/en/preparation.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order {order_name} - Processing +Your order {order_name} - Processing   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      -If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/refund.html b/mails/en/refund.html index 68a1bff78..1e7236671 100644 --- a/mails/en/refund.html +++ b/mails/en/refund.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Refund processed for order with the reference {order_name} +Refund processed for order with the reference {order_name}   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      -If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/shipped.html b/mails/en/shipped.html index bb8656601..9f17deb21 100644 --- a/mails/en/shipped.html +++ b/mails/en/shipped.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Shipped +Your order with the reference {order_name} - Shipped   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

      -If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/test.html b/mails/en/test.html index 1a037ce34..8e2a9b412 100644 --- a/mails/en/test.html +++ b/mails/en/test.html @@ -14,7 +14,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/voucher.html b/mails/en/voucher.html index 582ca6106..c9c04acb0 100644 --- a/mails/en/voucher.html +++ b/mails/en/voucher.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Voucher created +Your order with the reference {order_name} - Voucher created   @@ -38,7 +38,7 @@   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/en/voucher_new.html b/mails/en/voucher_new.html index 0f1da4ddb..3678364c5 100644 --- a/mails/en/voucher_new.html +++ b/mails/en/voucher_new.html @@ -14,7 +14,7 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   @@ -32,7 +32,7 @@   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/es/account.html b/mails/es/account.html index 844ff7727..3bb255478 100644 --- a/mails/es/account.html +++ b/mails/es/account.html @@ -1,10 +1,10 @@ - - - - - Mensaje desde {shop_name} - - + + + + + Mensaje desde {shop_name} + + @@ -14,19 +14,19 @@ - + - + - + @@ -44,9 +44,9 @@ - + -
       
      Hola {firstname} {lastname},Hola {firstname} {lastname},
       
      Detalles de tu cuentaDetalles de tu cuenta
       
      Email: {email}
      Contraseña: {passwd}      		Email: {email}
      Contraseña: {passwd}
        
      {shop_name} desarrollado por PrestaShop™{shop_name} desarrollado por PrestaShop™
      - + + \ No newline at end of file diff --git a/mails/es/backoffice_order.html b/mails/es/backoffice_order.html index 1c451a44b..b5b27abcd 100644 --- a/mails/es/backoffice_order.html +++ b/mails/es/backoffice_order.html @@ -1,10 +1,10 @@ - - - - - Mensaje de {shop_name} - - + + + + + Mensaje de {shop_name} + + @@ -14,27 +14,27 @@ - + - + - + - + -
       
      Hola {firstname} {lastname},Hola {firstname} {lastname},
       
      Una nueva orden se ha generado para ustedUna nueva orden se ha generado para usted
       
      Vaya {order_link} para finalizar el pago.Vaya {order_link} para finalizar el pago.
       
      {shop_name} powered by PrestaShop™{shop_name} powered by PrestaShop™
      - + + \ No newline at end of file diff --git a/mails/es/bankwire.html b/mails/es/bankwire.html index 5da9b1bfc..b92d68ca1 100644 --- a/mails/es/bankwire.html +++ b/mails/es/bankwire.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Tu pedido es el número #{id_order} +Tu pedido es el número #{id_order}   @@ -38,16 +38,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/cheque.html b/mails/es/cheque.html index 8fd074420..b3eaf40f4 100644 --- a/mails/es/cheque.html +++ b/mails/es/cheque.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Tu pedido es el número #{id_order} +Tu pedido es el número #{id_order}   @@ -38,16 +38,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/contact.html b/mails/es/contact.html index d1375814c..ded1f8f6b 100644 --- a/mails/es/contact.html +++ b/mails/es/contact.html @@ -1,10 +1,10 @@ - - - - - Mensaje desde {shop_name} - - + + + + + Mensaje desde {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -26,9 +26,9 @@ - + -
       
      Mensaje desde tu tienda {shop_name}Mensaje desde tu tienda {shop_name}
        
      {shop_name} desarrollado por PrestaShop™{shop_name} desarrollado por PrestaShop™
      - + + \ No newline at end of file diff --git a/mails/es/contact_form.html b/mails/es/contact_form.html index 11226bb4c..2e2b2e0e6 100644 --- a/mails/es/contact_form.html +++ b/mails/es/contact_form.html @@ -1,10 +1,10 @@ - - - - - Mensaje de {shop_name} - - + + + + + Mensaje de {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -40,15 +40,15 @@ - + - + -
       
      SU mensaje se envio correctamente al centro de atención de cliente.SU mensaje se envio correctamente al centro de atención de cliente.
        
      Responderemos a la brevedadResponderemos a la brevedad
       
      {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
      - + + \ No newline at end of file diff --git a/mails/es/credit_slip.html b/mails/es/credit_slip.html index 7c80135be..353bc08ad 100644 --- a/mails/es/credit_slip.html +++ b/mails/es/credit_slip.html @@ -1,46 +1,36 @@ - - - - - Mensaje desde {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {shop_name}
       
      Hola {firstname} {lastname},
       
      Histórico del Pedido #{id_order}
       
      Te informamos que se ha generado un vale de compra a tu favor desde el pedido #{id_order}.
       
      Puedes revisar este pedido y descargar la factura desde la sección "Seguimiento de Pedido" de tu cuenta "Mi Cuenta" en nuestra web.
       
      {shop_name} desarrollado por PrestaShop™
      - - \ No newline at end of file + + + + + Mensaje desde {shop_name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {shop_name}
       
      Hola {firstname} {lastname},

      Gracias por comprar en {shop_name}

      Le informamos que se ha generado un vale de compra a su favor con la referencia {order_name}.
       
      Puede revisar este vale de compra y descargar la factura desde la sección "Seguimiento de Pedido" de su cuenta "Mi Cuenta" en nuestra web.
       
      {shop_name} desarrollado por PrestaShop™
      + diff --git a/mails/es/credit_slip.txt b/mails/es/credit_slip.txt index 56a02bd5f..06d956138 100644 --- a/mails/es/credit_slip.txt +++ b/mails/es/credit_slip.txt @@ -1,12 +1,12 @@ -Hola {firstname} {lastname}, - -Te informamos que se ha generado un vale de compra a tu favor desde el pedido #{id_order}. - -Puedes revisar este recibo y descargar la factura desde la sección "Seguimiento de Pedido" de tu cuenta pulsando en "Mi cuenta" en nuestra web. - -Gracias por comprar en {shop_name}. - -{shop_name} - {shop_url} - - +Hola {firstname} {lastname}, + +Gracias por comprar en {shop_name} + +Le informamos que se ha generado un vale de compra a su favor con la referencia {order_name}. + +Puede revisar este vale de compra y descargar la factura desde la sección "Seguimiento de Pedido" de su cuenta pulsando en "Mi cuenta" en nuestra web. + +{shop_name} - {shop_url} + + {shop_url} desarrollado por PrestaShop® \ No newline at end of file diff --git a/mails/es/download-product.tpl b/mails/es/download-product.tpl index e3ceccc3a..69dea48ba 100644 --- a/mails/es/download-product.tpl +++ b/mails/es/download-product.tpl @@ -1,13 +1,13 @@ -
        -{foreach from=$virtualProducts item=product} -
      • - {$product.name} - {if isset($product.deadline)} - expires on {$product.deadline} - {/if} - {if isset($product.downloadable)} - downloadable {$product.downloadable} times - {/if} -
        • -{/foreach} +
          +{foreach from=$virtualProducts item=product} +
        • + {$product.name} + {if isset($product.deadline)} + expires on {$product.deadline} + {/if} + {if isset($product.downloadable)} + downloadable {$product.downloadable} time(s) + {/if} +
          • +{/foreach}
        \ No newline at end of file diff --git a/mails/es/download_product.html b/mails/es/download_product.html index 40eba5b90..5e29012f8 100644 --- a/mails/es/download_product.html +++ b/mails/es/download_product.html @@ -1,55 +1,50 @@ - - - - - Mensaje desde {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        {shop_name}
         
        Hola {firstname} {lastname}, gracias por comprar en {shop_name}.
         
        Producto(s) para descargar
         
        Tienes {nbProducts} producto(s) para descargar.
         
        Este es el acceso directo: {virtualProducts}
         
        Puedes revisar este pedido y descargar su factura desde la sección "Seguimiento de Pedido" de tu cuenta "Mi Cuenta" en nuestra web.
        If you have guest account, you can follow your order at "Guest Tracking" section on our Website.
         
        {shop_name} desarrollado por PrestaShop™
        - - \ No newline at end of file + + + + + Mensaje desde {shop_name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        {shop_name}
         
        Hola {firstname} {lastname},

        Gracias por su pedido en  {shop_name}.
         
        Tiene {nbProducts} producto(s) para descargar.
         
        Este es el acceso directo: {virtualProducts}
         
        Puede revisar este pedido y descargar su factura desde la sección "Seguimiento de Pedido" de su cuenta pulsando en "Mi Cuenta" en nuestra web.

        Si tiene una cuenta de invitado, puede ver su pedido en la sección "Seguimiento de invitado" de nuestra web.
         
        {shop_name} desarrollado por PrestaShop™
        + diff --git a/mails/es/download_product.txt b/mails/es/download_product.txt index b3b195963..c3a80f3a6 100644 --- a/mails/es/download_product.txt +++ b/mails/es/download_product.txt @@ -1,13 +1,15 @@ -{firstname} {lastname}, gracias por comprar en {shop_name}! - -Tienes {nbProducts} producto(s) para descargar. - -Este es el acceso directo: -{virtualProducts} - - -Puedes revisar este pedido y descargar la factura desde la sección "Seguimiento de Pedido" de tu cuenta pulsando en "Mi cuenta" en nuestra web. -Si tienes una cuenta invitado, puedes seguir tu pedido en esta página: {guest_tracking_url}?id_order={id_order} - - -{shop_url} desarrollado por PrestaShop® +Hola {firstname} {lastname}, + +Gracias por su pedido en {shop_name}! + +Tiene {nbProducts} producto(s) para descargar. + +Este es el acceso directo: +{virtualProducts} + +Puede revisar este pedido y descargar su factura desde la sección "Seguimiento de Pedido" de su cuenta pulsando en "Mi cuenta" en nuestra web. + +Si tiene una cuenta de invitado, puede ver su pedido en esta página: {guest_tracking_url} + + +{shop_url} desarrollado por PrestaShop® diff --git a/mails/es/guest_to_customer.html b/mails/es/guest_to_customer.html index 1042afc2b..0aca03322 100644 --- a/mails/es/guest_to_customer.html +++ b/mails/es/guest_to_customer.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,9 +38,9 @@ - + -
         
        Hola {firstname} {lastname},Hola {firstname} {lastname},
         
        Su cuenta de invitado se ha transformado en cuenta de clienteSu cuenta de invitado se ha transformado en cuenta de cliente
          
        {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/es/in_transit.html b/mails/es/in_transit.html index 535db9932..726eb7906 100644 --- a/mails/es/in_transit.html +++ b/mails/es/in_transit.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Historial del Pedido #{id_order} +Historial del Pedido #{id_order}   @@ -38,16 +38,16 @@   -También puedes revisar tus pedidos y descargar tus facturas desde tu "Historial de Pedidos" dentro de tu cuenta en nuestra web. +También puedes revisar tus pedidos y descargar tus facturas desde tu "Historial de Pedidos" dentro de tu cuenta en nuestra web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/index.php b/mails/es/index.php index 5be4163e3..08550506c 100644 --- a/mails/es/index.php +++ b/mails/es/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/mails/es/lang.php b/mails/es/lang.php index a7ee208c2..fa6e9f370 100644 --- a/mails/es/lang.php +++ b/mails/es/lang.php @@ -2,40 +2,36 @@ global $_LANGMAIL; $_LANGMAIL = array(); -$_LANGMAIL['Welcome!'] = 'Bienvenido !'; -$_LANGMAIL['Process the payment of your order'] = ''; -$_LANGMAIL['Message from contact form'] = 'Mensaje desde el formulario de contacto'; -$_LANGMAIL['Your message has been correctly sent'] = ''; -$_LANGMAIL['New credit slip regarding your order'] = ''; -$_LANGMAIL['Virtual product to download'] = ''; -$_LANGMAIL['Fwd: Customer message'] = 'Fw: Mensaje de cliente'; + $_LANGMAIL['Your guest account has been transformed to customer account'] = 'Su cuenta de invitado se transformo en cuenta de cliente'; +$_LANGMAIL['Message from a customer'] = 'Mensaje de un cliente'; +$_LANGMAIL['Your new password'] = 'Su nueva clave'; +$_LANGMAIL['Newsletter voucher'] = 'Voucher boletin de noticias'; +$_LANGMAIL['Message from %1$s %2$s'] = 'Mensaje desde %1$s %2$s'; +$_LANGMAIL['%1$s sent you a link to %2$s'] = '%1$s envio un link a %2$s'; +$_LANGMAIL['Your cart and your discount'] = 'Su cesta y descuento'; +$_LANGMAIL['New credit slip regarding your order'] = 'Nuevo vale de compra relacionado con su pedido'; +$_LANGMAIL['Newsletter confirmation'] = 'Confirmación de la suscripción a nuestro Boletín de noticias'; +$_LANGMAIL['Email verification'] = 'Verificación de correo'; $_LANGMAIL['Package in transit'] = 'Paquete en transito'; $_LANGMAIL['Log: You have a new alert from your shop'] = 'Log: Tiene un nuevo alerta desde su tienda'; -$_LANGMAIL['Your order has been changed'] = ''; -$_LANGMAIL['Order confirmation'] = 'Confirmación del pedido'; -$_LANGMAIL['Message from a customer'] = 'Mensaje de un cliente'; -$_LANGMAIL['New message regarding your order'] = ''; -$_LANGMAIL['Your order return state has changed'] = 'El estado de retorno de su orden ha cambiado'; -$_LANGMAIL['Your new password'] = 'Su nueva clave'; $_LANGMAIL['Password query confirmation'] = 'Confirmación de password'; -$_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = ''; +$_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = 'Por favor no responda a este mensaje desde su cuenta de cliente , no recibiremos su mensaje.\r\nPara responder, use este {link} exclusivo'; +$_LANGMAIL['You are one of our best customers'] = 'Gracias por ser uno de nuestros mejores clientes'; +$_LANGMAIL['Process the payment of your order'] = 'Procesode pago de su pedido'; +$_LANGMAIL['Welcome!'] = 'Bienvenido !'; +$_LANGMAIL['Fwd: Customer message'] = 'Fw: Mensaje de cliente'; +$_LANGMAIL['Order confirmation'] = 'Confirmación del pedido'; $_LANGMAIL['New voucher regarding your order %s'] = 'Nuevo bono con respecto a su orden %s'; -$_LANGMAIL['Newsletter confirmation'] = ''; -$_LANGMAIL['Email verification'] = ''; -$_LANGMAIL['Newsletter voucher'] = 'Voucher boletin de noticias'; -$_LANGMAIL['Your wishlist\\\'s link'] = 'Su enlace de lista de deseos'; -$_LANGMAIL['Message from %1$s %2$s'] = 'Mensaje desde %1$s %2$s'; -$_LANGMAIL['Your cart and your discount'] = 'Su cesta y descuento'; -$_LANGMAIL['Thanks for your order'] = ''; -$_LANGMAIL['You are one of our best customers'] = ''; -$_LANGMAIL['We miss you'] = ''; -$_LANGMAIL['Product available'] = 'Producto disponible'; -$_LANGMAIL['New order - #%06d'] = 'Nuevo pedido- #%06d'; -$_LANGMAIL['Stock coverage'] = ''; -$_LANGMAIL['Product out of stock'] = ''; $_LANGMAIL['Congratulations!'] = 'Felicitaciones!'; -$_LANGMAIL['Referral Program'] = 'Programa de referidos'; -$_LANGMAIL['%1$s sent you a link to %2$s'] = '%1$s envio un link a %2$s'; - -?> \ No newline at end of file +$_LANGMAIL['Thanks for your order'] = '¡Gracias por su pedido!'; +$_LANGMAIL['We miss you'] = 'Te echamos de menos'; +$_LANGMAIL['Virtual product to download'] = 'Producto(s) virtual(es) disponibles para descargar'; +$_LANGMAIL['New message regarding your order'] = 'Nuevo mensaje relacionado con su pedido'; +$_LANGMAIL['Message from contact form'] = 'Mensaje desde el formulario de contacto'; +$_LANGMAIL['Your order return state has changed'] = 'El estado de retorno de su orden ha cambiado'; +$_LANGMAIL['Product available'] = 'Producto disponible'; +$_LANGMAIL['Product out of stock'] = 'Uno o más productos están casi agotados'; +$_LANGMAIL['Your message has been correctly sent'] = 'Su mensaje se ha enviado correctamente'; +$_LANGMAIL['Your order has been changed'] = 'Su pedido se ha modificado'; +$_LANGMAIL['Your wishlist\'s link'] = 'Enlace a su lista de deseos'; diff --git a/mails/es/log_alert.html b/mails/es/log_alert.html index 5c53a631b..7311b9808 100755 --- a/mails/es/log_alert.html +++ b/mails/es/log_alert.html @@ -1,10 +1,10 @@ - - - - - Mensaje de {shop_name} - - + + + + + Mensaje de {shop_name} + + @@ -20,7 +20,7 @@ - + @@ -38,9 +38,9 @@ - + -
         
        Nueva alerta Nueva alerta 
          
        {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/es/newsletter.html b/mails/es/newsletter.html index 55ce176f8..b7971c14b 100644 --- a/mails/es/newsletter.html +++ b/mails/es/newsletter.html @@ -1,10 +1,10 @@ - - - - - Mensaje desde {shop_name} - - + + + + + Mensaje desde {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -26,9 +26,9 @@ - + -
         
        Newsletter de {shop_name}Newsletter de {shop_name}
          
        {shop_name} desarrollado por PrestaShop™{shop_name} desarrollado por PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/es/order_canceled.html b/mails/es/order_canceled.html index ab85c3f1c..afae99f4a 100644 --- a/mails/es/order_canceled.html +++ b/mails/es/order_canceled.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Respecto al pedido #{id_order} +Respecto al pedido #{id_order}   @@ -32,16 +32,16 @@   -Puedes revisar este pedido y descargar tu factura desde la sección "Seguimiento de Pedido" de su cuenta "Mi Cuenta" en nuestra web. +Puedes revisar este pedido y descargar tu factura desde la sección "Seguimiento de Pedido" de su cuenta "Mi Cuenta" en nuestra web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/order_changed.html b/mails/es/order_changed.html index 18d2fc3d1..5d89e4c00 100644 --- a/mails/es/order_changed.html +++ b/mails/es/order_changed.html @@ -1,49 +1,45 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        {shop_name}
         
        Hi {firstname} {lastname},
         
        Your order with the reference {order_name} - Order changed
         
        Your order with the reference {order_name} from {shop_name} has been changed by the merchant.
         
        You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

        If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
         
        {shop_name} powered by PrestaShop™
        - - \ No newline at end of file + + + + + Message from {shop_name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        {shop_name}
         
        Hola {firstname} {lastname},
         
        Your order with the reference {order_name} - Order changed
         
        Su pedido con la referencia {order_name} de {shop_name} ha sido modificado por el comerciante.
         
        Puede revisar su pedido y descargar su factura desde la sección  "Historial de pedidos" de su cuenta de cliente haciendo clic en "Mi cuenta" en nuestra web.

        Si tiene una cuenta de invitado, puede revisar su pedido en la sección  "Seguimiento de invitado" en nuestra web.
         
        {shop_name} desarrollado por PrestaShop™
        + diff --git a/mails/es/order_changed.txt b/mails/es/order_changed.txt index c0c41f3d1..74b48e7fb 100644 --- a/mails/es/order_changed.txt +++ b/mails/es/order_changed.txt @@ -1,11 +1,11 @@ -Hi {firstname} {lastname}, - -Your order with the reference {order_name} from {shop_name} has been changed by the merchant. - -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. - -If you have guest account, you can follow your order using this link: {guest_tracking_url} - -{shop_name} - {shop_url} - -{shop_url} powered by PrestaShop™ \ No newline at end of file +Hola {firstname} {lastname}, + +Su pedido con la referencia {order_name} de {shop_name} ha sido modificado por el comerciante. + +Puede revisar su pedido y descargar su factura desde la sección "Historial de pedidos" de su cuenta de cliente haciendo clic en "Mi cuenta" en nuestra web. + +Si tiene una cuenta de invitado, puede revisar su pedido en esta página: {guest_tracking_url} + +{shop_name} - {shop_url} + +{shop_url} desarrollado por PrestaShop™ \ No newline at end of file diff --git a/mails/es/order_conf.html b/mails/es/order_conf.html index 7fa6743d8..866d75ad0 100644 --- a/mails/es/order_conf.html +++ b/mails/es/order_conf.html @@ -14,19 +14,19 @@   -Hola {firstname} {lastname}, gracias por comprar en {shop_name}. +Hola {firstname} {lastname}, gracias por comprar en {shop_name}.   -Detalles del Pedido +Detalles del Pedido   -Pedido: {order_name} realizado el {date}
        Forma de Pago: {payment} +Pedido: {order_name} realizado el {date}
        Forma de Pago: {payment}   @@ -70,7 +70,7 @@   -Envío +Envío   @@ -98,16 +98,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/order_customer_comment.html b/mails/es/order_customer_comment.html index 02df0d4fb..5a78a924d 100644 --- a/mails/es/order_customer_comment.html +++ b/mails/es/order_customer_comment.html @@ -20,7 +20,7 @@   -Mensaje desde {shop_name} +Mensaje desde {shop_name}   @@ -32,7 +32,7 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. diff --git a/mails/es/order_merchant_comment.html b/mails/es/order_merchant_comment.html index 4874adabf..bb153b1a9 100644 --- a/mails/es/order_merchant_comment.html +++ b/mails/es/order_merchant_comment.html @@ -1,40 +1,35 @@ - - - + + + Mensaje de {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
        {shop_name}
         
        Hola {firstname} {lastname},
         
        Mensaje de {shop_name}
         
        Has recibido un nuevo mensaje sobre el pedido n°{id_order} :
        Mensaje:
        {message}
         
        {shop_name} desarrollado por PrestaShop™
        + + + + + + + + + + + + + + + + + + + + + + + + +
        {shop_name}
         
        Hola {firstname} {lastname},
         
        Ha recibido un mensaje  de {shop_name} sobre su  pedido con referencia {order_name}. :
        Mensaje:
        {message}
         
        {shop_name} desarrollado por PrestaShop™
        - - \ No newline at end of file + diff --git a/mails/es/order_merchant_comment.txt b/mails/es/order_merchant_comment.txt index 30971e36d..58514f990 100644 --- a/mails/es/order_merchant_comment.txt +++ b/mails/es/order_merchant_comment.txt @@ -1,10 +1,9 @@ -Hola {firstname} {lastname}, - -Has recibido un mensaje sobre el pedido n°{id_order} : -{message} - -Puedes, en cualquier momento, consultar tus antiguos mensajes en Seguimiento de pedido. - - - +Hola {firstname} {lastname}, + +Ha recibido un mensaje de {shop_name} sobre su pedido con referencia {order_name}. + +Mensaje: +{message} + + {shop_url} desarrollado por PrestaShop™ \ No newline at end of file diff --git a/mails/es/order_return_state.html b/mails/es/order_return_state.html index 3565f1c48..e05553bc3 100644 --- a/mails/es/order_return_state.html +++ b/mails/es/order_return_state.html @@ -14,13 +14,13 @@   -Buenos días {firstname} {lastname}, +Buenos días {firstname} {lastname},   -Historico de su devolución N°{id_order_return} +Historico de su devolución N°{id_order_return}   @@ -32,13 +32,13 @@   -Puede acceder al seguimiento de su devolución y descargar su factura en "Histórico de pedidos" en la sección "Mi cuenta" de nuestra Web. +Puede acceder al seguimiento de su devolución y descargar su factura en "Histórico de pedidos" en la sección "Mi cuenta" de nuestra Web.   -{shop_name} +{shop_name} diff --git a/mails/es/outofstock.html b/mails/es/outofstock.html index fbf513767..294b86488 100644 --- a/mails/es/outofstock.html +++ b/mails/es/outofstock.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Incidencia en tu pedido #{id_order} +Incidencia en tu pedido #{id_order}   @@ -32,16 +32,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/password.html b/mails/es/password.html index ba39af2ea..f9aa05138 100644 --- a/mails/es/password.html +++ b/mails/es/password.html @@ -1,10 +1,10 @@ - - - - - Mensaje desde {shop_name} - - + + + + + Mensaje desde {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,9 +38,9 @@ - + -
         
        Hola {firstname} {lastname},Hola {firstname} {lastname},
         
        Detalles de tu nuevo LoginDetalles de tu nuevo Login
          
        {shop_name} pdesarrollado por PrestaShop™{shop_name} pdesarrollado por PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/es/password_query.html b/mails/es/password_query.html index a14663e33..819a1caf5 100644 --- a/mails/es/password_query.html +++ b/mails/es/password_query.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -32,9 +32,9 @@ - + -
         
        Hola {firstname} {lastname},Hola {firstname} {lastname},
          
        {shop_name} desarrollado por PrestaShop™{shop_name} desarrollado por PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/es/payment.html b/mails/es/payment.html index c89a8a20d..899d4b9b2 100644 --- a/mails/es/payment.html +++ b/mails/es/payment.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -En referencia a tu pedido #{id_order}: +En referencia a tu pedido #{id_order}:   @@ -32,16 +32,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/payment_error.html b/mails/es/payment_error.html index 2fd1a2d86..8b9444473 100644 --- a/mails/es/payment_error.html +++ b/mails/es/payment_error.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Incidencia en su pedido #{id_order} +Incidencia en su pedido #{id_order}   @@ -38,16 +38,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/preparation.html b/mails/es/preparation.html index c8bbe0aaf..66ced9016 100644 --- a/mails/es/preparation.html +++ b/mails/es/preparation.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Sobre tu pedido: #{id_order} +Sobre tu pedido: #{id_order}   @@ -32,16 +32,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/refund.html b/mails/es/refund.html index 5e3e62ae0..11a5832ed 100644 --- a/mails/es/refund.html +++ b/mails/es/refund.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Sobre su pedido: #{id_order} +Sobre su pedido: #{id_order}   @@ -32,16 +32,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   -{shop_name} desarrollado por PrestaShop™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/shipped.html b/mails/es/shipped.html index 73c008988..403e61a82 100644 --- a/mails/es/shipped.html +++ b/mails/es/shipped.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Historial de tu Pedido #{id_order} +Historial de tu Pedido #{id_order}   @@ -32,16 +32,16 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -Si tiene una cuenta de invitado, puede seguirla desde la sección  "Seguimiento de invitado" en nuestro sitio. +Si tiene una cuenta de invitado, puede seguirla desde la sección  "Seguimiento de invitado" en nuestro sitio.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/es/voucher.html b/mails/es/voucher.html index 9e75bc5e8..b1b44c437 100644 --- a/mails/es/voucher.html +++ b/mails/es/voucher.html @@ -1,10 +1,10 @@ - - - - - Mensaje desde {shop_name} - - + + + + + Mensaje desde {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,9 +38,9 @@ - + -
         
        Hola {firstname} {lastname},Hola {firstname} {lastname},
         
        Historial de tu Pedido #{id_order}Historial de tu Pedido #{id_order}
          
        {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/es/voucher_new.html b/mails/es/voucher_new.html index 1eedcc0c2..623aff121 100644 --- a/mails/es/voucher_new.html +++ b/mails/es/voucher_new.html @@ -1,10 +1,10 @@ - - - - - Mensaje de {shop_name} - - + + + + + Mensaje de {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -32,9 +32,9 @@ - + -
         
        Hola {firstname} {lastname},Hola {firstname} {lastname},
          
        {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/account.html b/mails/fr/account.html index c77d4047b..3ab9163b4 100644 --- a/mails/fr/account.html +++ b/mails/fr/account.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,19 +14,19 @@ - + - + - + @@ -38,9 +38,9 @@ - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Merci d'avoir créé un compte sur {shop_name}. Voici un rappel de vos codes d'accès.Merci d'avoir créé un compte sur {shop_name}. Voici un rappel de vos codes d'accès.
         
        Adresse e-mail : {email}
        Mot de passe : {passwd}        		Adresse e-mail : {email}
        Mot de passe : {passwd}
          
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/backoffice_order.html b/mails/fr/backoffice_order.html index 65b301bdd..b1887f179 100644 --- a/mails/fr/backoffice_order.html +++ b/mails/fr/backoffice_order.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,27 +14,27 @@ - + - + - + - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Une nouvelle commande vous a été générée.Une nouvelle commande vous a été générée.
         
        Rendez vous sur {order_link} pour finaliser le paiement.Rendez vous sur {order_link} pour finaliser le paiement.
         
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/bankwire.html b/mails/fr/bankwire.html index 77b9cd6cd..5776579fb 100644 --- a/mails/fr/bankwire.html +++ b/mails/fr/bankwire.html @@ -14,13 +14,13 @@   -Bonjour {firstname} {lastname}, +Bonjour {firstname} {lastname},   -Historique de votre commande ayant pour référence {order_name}. +Historique de votre commande ayant pour référence {order_name}.   @@ -38,16 +38,16 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   -{shop_name} réalisé avec PrestaShop™ +{shop_name} réalisé avec PrestaShop™ diff --git a/mails/fr/cheque.html b/mails/fr/cheque.html index a95040cf5..a704184e3 100644 --- a/mails/fr/cheque.html +++ b/mails/fr/cheque.html @@ -14,13 +14,13 @@   -Bonjour {firstname} {lastname}, +Bonjour {firstname} {lastname},   -Historique de votre commande ayant pour référence {order_name}. +Historique de votre commande ayant pour référence {order_name}.   @@ -38,16 +38,16 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   -{shop_name} réalisé avec PrestaShop™ +{shop_name} réalisé avec PrestaShop™ diff --git a/mails/fr/contact.html b/mails/fr/contact.html index 29bbcf39c..16c59bb95 100644 --- a/mails/fr/contact.html +++ b/mails/fr/contact.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -26,9 +26,9 @@ - + -
         
        Vous avez reçu un message de la part d'un client depuis votre boutique {shop_name}.Vous avez reçu un message de la part d'un client depuis votre boutique {shop_name}.
          
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/contact_form.html b/mails/fr/contact_form.html index 3267f3027..176f242dd 100644 --- a/mails/fr/contact_form.html +++ b/mails/fr/contact_form.html @@ -14,7 +14,7 @@   -Votre message a bien été envoyé à notre service client. +Votre message a bien été envoyé à notre service client.   @@ -26,13 +26,13 @@   -Nous vous répondrons dès que possible. +Nous vous répondrons dès que possible.   -{shop_name} réalisé avec PrestaShop™ +{shop_name} réalisé avec PrestaShop™ diff --git a/mails/fr/credit_slip.html b/mails/fr/credit_slip.html index 6d8098265..d97285429 100644 --- a/mails/fr/credit_slip.html +++ b/mails/fr/credit_slip.html @@ -14,13 +14,13 @@   -Bonjour {firstname} {lastname}, +Bonjour {firstname} {lastname},   -Historique de votre commande ayant pour référence {order_name}. +Historique de votre commande ayant pour référence {order_name}.   @@ -32,13 +32,13 @@   -Vous pouvez accéder à cet avoir et télécharger votre facture dans "Suivi des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder à cet avoir et télécharger votre facture dans "Suivi des commandes" de la rubrique "Mon compte" sur notre site.   -{shop_name} réalisé avec PrestaShop™ +{shop_name} réalisé avec PrestaShop™ diff --git a/mails/fr/download-product.tpl b/mails/fr/download-product.tpl index d5eb29e03..69dea48ba 100644 --- a/mails/fr/download-product.tpl +++ b/mails/fr/download-product.tpl @@ -3,10 +3,10 @@
      • {$product.name} {if isset($product.deadline)} - expire le {$product.deadline} + expires on {$product.deadline} {/if} {if isset($product.downloadable)} - téléchargeable {$product.downloadable} fois + downloadable {$product.downloadable} time(s) {/if}
        • {/foreach} diff --git a/mails/fr/download_product.html b/mails/fr/download_product.html index ec6795634..d907ffd23 100644 --- a/mails/fr/download_product.html +++ b/mails/fr/download_product.html @@ -14,13 +14,13 @@   -Bonjour {firstname} {lastname}, +Bonjour {firstname} {lastname},   -Produits à télécharger +Produits à télécharger   @@ -38,16 +38,16 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   -{shop_name} réalisé avec PrestaShop™ +{shop_name} réalisé avec PrestaShop™ diff --git a/mails/fr/employee_password.html b/mails/fr/employee_password.html index 40b974615..ff169e281 100644 --- a/mails/fr/employee_password.html +++ b/mails/fr/employee_password.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,9 +32,9 @@ - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Voici vos informations personnellesVoici vos informations personnelles
          
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/guest_to_customer.html b/mails/fr/guest_to_customer.html index 7c0eca1d3..f615a5c01 100644 --- a/mails/fr/guest_to_customer.html +++ b/mails/fr/guest_to_customer.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -35,9 +35,9 @@ - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Votre compte invité a été transformé en compte clientVotre compte invité a été transformé en compte client
          
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/in_transit.html b/mails/fr/in_transit.html index 8e331dddb..e36fadccb 100755 --- a/mails/fr/in_transit.html +++ b/mails/fr/in_transit.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,18 +38,18 @@ - + - + - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
          
        Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
        Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
         
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/index.php b/mails/fr/index.php index 60bc2ce27..88e934d59 100644 --- a/mails/fr/index.php +++ b/mails/fr/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/mails/fr/lang.php b/mails/fr/lang.php index f1694fe5f..668ed4f0b 100644 --- a/mails/fr/lang.php +++ b/mails/fr/lang.php @@ -2,39 +2,37 @@ global $_LANGMAIL; $_LANGMAIL = array(); -$_LANGMAIL['Welcome!'] = 'Bienvenue !'; -$_LANGMAIL['Process the payment of your order'] = 'Traiter le paiement de votre commande'; -$_LANGMAIL['Message from contact form'] = 'Message depuis le formulaire de contact'; -$_LANGMAIL['Your message has been correctly sent'] = 'Votre message a bien été envoyé'; + $_LANGMAIL['New credit slip regarding your order'] = 'Nouvel avoir concernant votre commande'; -$_LANGMAIL['Virtual product to download'] = 'Produit virtuel à télécharger'; -$_LANGMAIL['Fwd: Customer message'] = 'TR: Message d\'un client'; -$_LANGMAIL['Your guest account has been transformed to customer account'] = 'Votre compte invité a été transformé en compte client'; -$_LANGMAIL['Package in transit'] = 'Livraison en cours'; -$_LANGMAIL['Log: You have a new alert from your shop'] = 'Log : Vous avez un nouveau message d\'alerte dans votre boutique'; -$_LANGMAIL['Your order has been changed'] = 'Votre commande a été modifiée'; -$_LANGMAIL['Order confirmation'] = 'Confirmation de commande'; $_LANGMAIL['Message from a customer'] = 'Message d\'un client'; -$_LANGMAIL['New message regarding your order'] = 'Nouveau message concernant votre commande'; -$_LANGMAIL['Your order return state has changed'] = 'Nouveau statut de commande'; $_LANGMAIL['Your new password'] = 'Votre nouveau mot de passe'; -$_LANGMAIL['Password query confirmation'] = 'Confirmation de demande de mot de passe'; -$_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = 'Une réponse à votre message est disponible #ct%1$s #tc%2$s'; -$_LANGMAIL['New voucher regarding your order %s'] = 'Nouveau bon de réduction concernant votre commande %s'; $_LANGMAIL['Newsletter confirmation'] = 'Confirmation newsletter'; $_LANGMAIL['Email verification'] = 'Email de vérification'; $_LANGMAIL['Newsletter voucher'] = 'Bon de réduction newsletter'; -$_LANGMAIL['Your wishlist\\\'s link'] = 'Lien vers votre liste'; $_LANGMAIL['Message from %1$s %2$s'] = 'Message de %1$s %2$s'; $_LANGMAIL['Your cart and your discount'] = 'Votre panier et votre bon de réduction'; -$_LANGMAIL['Thanks for your order'] = 'Merci pour votre commande'; -$_LANGMAIL['You are one of our best customers'] = 'Vous êtes l\'un de nos meilleurs clients'; -$_LANGMAIL['We miss you'] = 'Vous nous manquez'; -$_LANGMAIL['Product available'] = 'Produit disponible'; -$_LANGMAIL['New order - #%06d'] = 'Nouvelle commande - N°%06d'; $_LANGMAIL['Stock coverage'] = 'Couverture de stock'; -$_LANGMAIL['Product out of stock'] = 'Rupture de stock'; -$_LANGMAIL['Congratulations!'] = 'Bravo !'; $_LANGMAIL['%1$s sent you a link to %2$s'] = '%1$s vous a envoyé un lien vers %2$s'; - -?> \ No newline at end of file +$_LANGMAIL['Your guest account has been transformed to customer account'] = 'Votre compte invité a été transformé en compte client'; +$_LANGMAIL['Process the payment of your order'] = 'Traiter le paiement de votre commande'; +$_LANGMAIL['Package in transit'] = 'Livraison en cours'; +$_LANGMAIL['Log: You have a new alert from your shop'] = 'Log : Vous avez un nouveau message d\'alerte dans votre boutique'; +$_LANGMAIL['Password query confirmation'] = 'Confirmation de demande de mot de passe'; +$_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = 'Une réponse à votre message est disponible #ct%1$s #tc%2$s'; +$_LANGMAIL['You are one of our best customers'] = 'Vous êtes l\'un de nos meilleurs clients'; +$_LANGMAIL['Welcome!'] = 'Bienvenue !'; +$_LANGMAIL['Virtual product to download'] = 'Produit virtuel à télécharger'; +$_LANGMAIL['Fwd: Customer message'] = 'TR: Message d\'un client'; +$_LANGMAIL['Order confirmation'] = 'Confirmation de commande'; +$_LANGMAIL['New message regarding your order'] = 'Nouveau message concernant votre commande'; +$_LANGMAIL['New voucher regarding your order %s'] = 'Nouveau bon de réduction concernant votre commande %s'; +$_LANGMAIL['Thanks for your order'] = 'Merci pour votre commande'; +$_LANGMAIL['We miss you'] = 'Vous nous manquez'; +$_LANGMAIL['Congratulations!'] = 'Bravo !'; +$_LANGMAIL['Your order return state has changed'] = 'Nouveau statut de commande'; +$_LANGMAIL['Your message has been correctly sent'] = 'Votre message a bien été envoyé'; +$_LANGMAIL['Your order has been changed'] = 'Votre commande a été modifiée'; +$_LANGMAIL['Product available'] = 'Produit disponible'; +$_LANGMAIL['Product out of stock'] = 'Rupture de stock'; +$_LANGMAIL['Your wishlist\'s link'] = 'Lien vers votre liste de cadeaux'; +$_LANGMAIL['Message from contact form'] = 'Message depuis le formulaire de contact'; diff --git a/mails/fr/log_alert.html b/mails/fr/log_alert.html index a0b2f5bc2..0d36e1ed2 100755 --- a/mails/fr/log_alert.html +++ b/mails/fr/log_alert.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -20,7 +20,7 @@ - + @@ -38,9 +38,9 @@ - + -
         
        Nouveau message d'alerte enregistréNouveau message d'alerte enregistré
          
        {shop_name} propulsé par PrestaShop™{shop_name} propulsé par PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/newsletter.html b/mails/fr/newsletter.html index a07876ce6..6e4c6476a 100644 --- a/mails/fr/newsletter.html +++ b/mails/fr/newsletter.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -26,9 +26,9 @@ - + -
         
        Newsletter de {shop_name}Newsletter de {shop_name}
          
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/order_canceled.html b/mails/fr/order_canceled.html index 3e7356b1c..71c05e021 100644 --- a/mails/fr/order_canceled.html +++ b/mails/fr/order_canceled.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
          
        Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
        Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
         
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/order_changed.html b/mails/fr/order_changed.html index b1034e616..1762c47ae 100644 --- a/mails/fr/order_changed.html +++ b/mails/fr/order_changed.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
          
        Vous pouvez consulter votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez consulter votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
        Si vous avez un compte invité, vous pouvez consulter votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez consulter votre commande dans la section "Suivi invité" de notre site.
         
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/order_conf.html b/mails/fr/order_conf.html index 2ff041941..2b9fd1e73 100644 --- a/mails/fr/order_conf.html +++ b/mails/fr/order_conf.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,19 +14,19 @@ - + - + - + @@ -75,7 +75,7 @@ - + @@ -103,18 +103,18 @@ - + - + - + -
         
        Bonjour {firstname} {lastname}, merci d'avoir passé commande chez {shop_name} !Bonjour {firstname} {lastname}, merci d'avoir passé commande chez {shop_name} !
         
        Détails de la commandeDétails de la commande
         
        Commande : {order_name} passée le {date}
        Mode de paiement : {payment}        		Commande : {order_name} passée le {date}
        Mode de paiement : {payment}
          
        LivraisonLivraison
          
        Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
        Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
         
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/order_customer_comment.html b/mails/fr/order_customer_comment.html index 37d7f17a1..9c4077bee 100644 --- a/mails/fr/order_customer_comment.html +++ b/mails/fr/order_customer_comment.html @@ -1,10 +1,10 @@ - - - - - Message d'un client de {shop_name} - - + + + + + Message d'un client de {shop_name} + + @@ -20,7 +20,7 @@ - + @@ -32,9 +32,9 @@ - + -
         
        Message de {firstname} {lastname} ({email})Message de {firstname} {lastname} ({email})
          
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/order_merchant_comment.html b/mails/fr/order_merchant_comment.html index 0ac5f9245..c873fbc99 100644 --- a/mails/fr/order_merchant_comment.html +++ b/mails/fr/order_merchant_comment.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,9 +32,9 @@ - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Message de {shop_name}Message de {shop_name}
          
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/order_return_state.html b/mails/fr/order_return_state.html index 3614ebefa..cadd393da 100644 --- a/mails/fr/order_return_state.html +++ b/mails/fr/order_return_state.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,15 +32,15 @@ - + - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Historique de votre bon de retour n°{id_order_return}Historique de votre bon de retour n°{id_order_return}
          
        Vous pouvez accéder au suivi de votre bon de retour et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre bon de retour et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
         
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/outofstock.html b/mails/fr/outofstock.html index a21de4993..8ef90c557 100644 --- a/mails/fr/outofstock.html +++ b/mails/fr/outofstock.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
          
        Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
        Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
         
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/password.html b/mails/fr/password.html index 3627a7b2a..aaceac08a 100644 --- a/mails/fr/password.html +++ b/mails/fr/password.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,9 +32,9 @@ - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Voici vos codes d'accèsVoici vos codes d'accès
          
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/password_query.html b/mails/fr/password_query.html index a01590c3c..0ef41ea51 100644 --- a/mails/fr/password_query.html +++ b/mails/fr/password_query.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -32,9 +32,9 @@ - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
          
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/payment.html b/mails/fr/payment.html index 8ee42d412..20271b528 100644 --- a/mails/fr/payment.html +++ b/mails/fr/payment.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
          
        Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
        Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
         
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/payment_error.html b/mails/fr/payment_error.html index 2be2d0ea0..ea4b481e4 100644 --- a/mails/fr/payment_error.html +++ b/mails/fr/payment_error.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
          
        Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
        Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
         
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/preparation.html b/mails/fr/preparation.html index 2dd2ad381..ba559f087 100644 --- a/mails/fr/preparation.html +++ b/mails/fr/preparation.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
          
        Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
        Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
         
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/refund.html b/mails/fr/refund.html index cce98d242..b71a85600 100644 --- a/mails/fr/refund.html +++ b/mails/fr/refund.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
          
        Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
        Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
         
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/shipped.html b/mails/fr/shipped.html index 7d5b2b2b7..7afdbbb5d 100644 --- a/mails/fr/shipped.html +++ b/mails/fr/shipped.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,18 +32,18 @@ - + - + - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
          
        Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
        Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
         
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/voucher.html b/mails/fr/voucher.html index ab900c5e3..115721db8 100644 --- a/mails/fr/voucher.html +++ b/mails/fr/voucher.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,9 +38,9 @@ - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
         
        Historique de votre commande ayant pour référence {order_name}Historique de votre commande ayant pour référence {order_name}
          
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/fr/voucher_new.html b/mails/fr/voucher_new.html index 8626f3990..40a882284 100644 --- a/mails/fr/voucher_new.html +++ b/mails/fr/voucher_new.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -32,9 +32,9 @@ - + -
         
        Bonjour {firstname} {lastname},Bonjour {firstname} {lastname},
          
        {shop_name} réalisé avec PrestaShop™{shop_name} réalisé avec PrestaShop™
        - + + \ No newline at end of file diff --git a/mails/index.php b/mails/index.php index 60bc2ce27..88e934d59 100644 --- a/mails/index.php +++ b/mails/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/mails/it/account.html b/mails/it/account.html index 232284bf7..045423f83 100644 --- a/mails/it/account.html +++ b/mails/it/account.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,19 +14,19 @@ - + - + - + @@ -44,10 +44,10 @@ - +
         
        Salve {firstname} {lastname},Salve {firstname} {lastname},
         
        I tuoi dati di login dell'accountI tuoi dati di login dell'account
         
        Indirizzo e-mail: {email}
        Password: {passwd}        		Indirizzo e-mail: {email}
        Password: {passwd}
          
        {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
        - - + + \ No newline at end of file diff --git a/mails/it/backoffice_order.html b/mails/it/backoffice_order.html index 91ae1152c..ad5b4a9f5 100644 --- a/mails/it/backoffice_order.html +++ b/mails/it/backoffice_order.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -14,28 +14,28 @@ - + - + - + - +
         
        Hi {firstname} {lastname},Hi {firstname} {lastname},
         
        A new command has been generated to you.A new command has been generated to you.
         
        Go on {order_link} to finalize the payment.Go on {order_link} to finalize the payment.
         
        {shop_name} powered by PrestaShop™{shop_name} powered by PrestaShop™
        - - + + \ No newline at end of file diff --git a/mails/it/bankwire.html b/mails/it/bankwire.html index bfdbc82e7..7bf32983d 100644 --- a/mails/it/bankwire.html +++ b/mails/it/bankwire.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -La cronologia del tuo ordine n.{id_order} +La cronologia del tuo ordine n.{id_order}   @@ -38,16 +38,16 @@   -Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account clicando su "Il mio account" nel nostro sito web. +Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account clicando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordine ospite"nel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordine ospite"nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/cheque.html b/mails/it/cheque.html index da67fd741..40089dd19 100644 --- a/mails/it/cheque.html +++ b/mails/it/cheque.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -La cronologia del tuo ordine {order_name} +La cronologia del tuo ordine {order_name}   @@ -38,16 +38,16 @@   -Puoi rivedere l'ordine e scaricare la fattura dalla sezione"Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere l'ordine e scaricare la fattura dalla sezione"Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordine ospite" del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordine ospite" del nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/contact.html b/mails/it/contact.html index d099e7d5b..14afec848 100644 --- a/mails/it/contact.html +++ b/mails/it/contact.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -26,10 +26,10 @@ - +
         
        Messaggio dal tuo negozio {shop_name}Messaggio dal tuo negozio {shop_name}
          
        {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
        - - + + \ No newline at end of file diff --git a/mails/it/contact_form.html b/mails/it/contact_form.html index e860c8e66..2e863d553 100644 --- a/mails/it/contact_form.html +++ b/mails/it/contact_form.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -26,16 +26,16 @@ - + - +
         
        Il tuo messaggio è stato correttamente inviato al nostro Servizio Clienti.Il tuo messaggio è stato correttamente inviato al nostro Servizio Clienti.
          
        Risponderemo quanto prima.Risponderemo quanto prima.
         
        {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
        - - + + \ No newline at end of file diff --git a/mails/it/credit_slip.html b/mails/it/credit_slip.html index 37a9f7cb6..62184a1d8 100644 --- a/mails/it/credit_slip.html +++ b/mails/it/credit_slip.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -La cronologia del tuo ordine n.{id_order} +La cronologia del tuo ordine n.{id_order}   @@ -32,13 +32,13 @@   -Puoi rivedere questa nota di credito e scaricare la fattura dalla sezione "Controllo ordini"del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questa nota di credito e scaricare la fattura dalla sezione "Controllo ordini"del tuo account cliccando su "Il mio account" nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/download-product.tpl b/mails/it/download-product.tpl index e3ceccc3a..69dea48ba 100644 --- a/mails/it/download-product.tpl +++ b/mails/it/download-product.tpl @@ -1,13 +1,13 @@ -
          -{foreach from=$virtualProducts item=product} -
        • - {$product.name} - {if isset($product.deadline)} - expires on {$product.deadline} - {/if} - {if isset($product.downloadable)} - downloadable {$product.downloadable} times - {/if} -
          • -{/foreach} +
            +{foreach from=$virtualProducts item=product} +
          • + {$product.name} + {if isset($product.deadline)} + expires on {$product.deadline} + {/if} + {if isset($product.downloadable)} + downloadable {$product.downloadable} time(s) + {/if} +
            • +{/foreach}
          \ No newline at end of file diff --git a/mails/it/download_product.html b/mails/it/download_product.html index a023e9381..61e2ade31 100644 --- a/mails/it/download_product.html +++ b/mails/it/download_product.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, grazie di aver acquistato con {shop_name}. +Salve {firstname} {lastname}, grazie di aver acquistato con {shop_name}.   -Prodotto/i da scaricare +Prodotto/i da scaricare   @@ -38,16 +38,16 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite"del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite"del nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/employee_password.html b/mails/it/employee_password.html index a62ac1ac5..cf689220f 100644 --- a/mails/it/employee_password.html +++ b/mails/it/employee_password.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,10 +32,10 @@ - +
           
          Salve {firstname} {lastname},Salve {firstname} {lastname},
           
          I tuoi dati personali di loginI tuoi dati personali di login
            
          {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
          - - + + \ No newline at end of file diff --git a/mails/it/guest_to_customer.html b/mails/it/guest_to_customer.html index 309d3c4b0..1f4f0c488 100644 --- a/mails/it/guest_to_customer.html +++ b/mails/it/guest_to_customer.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,10 +38,10 @@ - +
           
          Salve {firstname} {lastname},Salve {firstname} {lastname},
           
          Il tuo account ospite è stato trasformato in account clienteIl tuo account ospite è stato trasformato in account cliente
            
          {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
          - - + + \ No newline at end of file diff --git a/mails/it/in_transit.html b/mails/it/in_transit.html index fb6ab8286..0f9b585cd 100644 --- a/mails/it/in_transit.html +++ b/mails/it/in_transit.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -La cronologia del tuo ordine n.{id_order} +La cronologia del tuo ordine n.{id_order}   @@ -38,16 +38,16 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/index.php b/mails/it/index.php index 5be4163e3..08550506c 100644 --- a/mails/it/index.php +++ b/mails/it/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/mails/it/lang.php b/mails/it/lang.php index 5b1cddfc2..754a05763 100644 --- a/mails/it/lang.php +++ b/mails/it/lang.php @@ -2,41 +2,32 @@ global $_LANGMAIL; $_LANGMAIL = array(); -$_LANGMAIL['Welcome!'] = 'Benvenuti!'; -$_LANGMAIL['Process the payment of your order'] = ''; -$_LANGMAIL['Message from contact form'] = 'Messaggio da modulo di contatto'; -$_LANGMAIL['Your message has been correctly sent'] = 'Il tuo messaggio è stato inviato correttamente'; + $_LANGMAIL['New credit slip regarding your order'] = 'Nuova nota di credito riguardo al tuo ordine'; -$_LANGMAIL['Virtual product to download'] = 'Prodotto virtuale da scaricare'; -$_LANGMAIL['Fwd: Customer message'] = 'Messaggio cliente'; $_LANGMAIL['Your guest account has been transformed to customer account'] = 'Il tuo account ospite è stato trasformato in account cliente'; -$_LANGMAIL['Package in transit'] = 'Pacco in viaggio'; -$_LANGMAIL['Log: You have a new alert from your shop'] = 'Log: Hai un nuovo Avviso dal tuo negozio'; -$_LANGMAIL['Your order has been changed'] = ''; -$_LANGMAIL['Order confirmation'] = 'Conferma ordine'; $_LANGMAIL['Message from a customer'] = 'Messaggio da un cliente'; -$_LANGMAIL['New message regarding your order'] = 'Nuovo messaggio riguardo al tuo ordine'; -$_LANGMAIL['Your order return state has changed'] = 'Nuovo status dell\'ordine'; $_LANGMAIL['Your new password'] = 'La tua nuova password'; -$_LANGMAIL['Password query confirmation'] = 'Conferma richiesta password'; -$_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = 'E\' disponibile una risposta al tuo messaggio #ct%1$s #tc%2$s'; -$_LANGMAIL['New voucher regarding your order %s'] = 'Nuovo buono sconto riguardante il tuo ordine %s'; $_LANGMAIL['Newsletter confirmation'] = 'Conferma newsletter'; -$_LANGMAIL['Email verification'] = ''; $_LANGMAIL['Newsletter voucher'] = 'Buono sconto newsletter'; -$_LANGMAIL['Your wishlist\\\'s link'] = 'Il tuo collegamento alla lista dei desideri'; $_LANGMAIL['Message from %1$s %2$s'] = 'Messaggio da %1$s %2$s'; $_LANGMAIL['Your cart and your discount'] = 'Il tuo carrello e il tuo sconto'; -$_LANGMAIL['Thanks for your order'] = 'Grazie dell\'ordine'; -$_LANGMAIL['You are one of our best customers'] = 'Sei uno dei nostri clienti migliori'; -$_LANGMAIL['We miss you'] = 'Ci manchi'; -$_LANGMAIL['Product available'] = 'Prodotto disponibile'; -$_LANGMAIL['New order - #%06d'] = 'Nuovo ordine - #%06d'; -$_LANGMAIL['Stock coverage'] = ''; -$_LANGMAIL['Product out of stock'] = 'Prodotto esaurito'; -$_LANGMAIL['Congratulations!'] = 'Congratulazioni!'; -$_LANGMAIL['Referral Program'] = 'Programma di presentazione'; $_LANGMAIL['%1$s sent you a link to %2$s'] = '%1$s invia il link a %2$s'; -$_LANGMAIL['Error reporting from your PayPal module'] = 'Errore dal tuo modulo PayPal'; - -?> \ No newline at end of file +$_LANGMAIL['Package in transit'] = 'Pacco in viaggio'; +$_LANGMAIL['Log: You have a new alert from your shop'] = 'Log: Hai un nuovo Avviso dal tuo negozio'; +$_LANGMAIL['Password query confirmation'] = 'Conferma richiesta password'; +$_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = 'E\' disponibile una risposta al tuo messaggio #ct%1$s #tc%2$s'; +$_LANGMAIL['You are one of our best customers'] = 'Sei uno dei nostri clienti migliori'; +$_LANGMAIL['Welcome!'] = 'Benvenuti!'; +$_LANGMAIL['Virtual product to download'] = 'Prodotto virtuale da scaricare'; +$_LANGMAIL['Fwd: Customer message'] = 'Messaggio cliente'; +$_LANGMAIL['Order confirmation'] = 'Conferma ordine'; +$_LANGMAIL['New message regarding your order'] = 'Nuovo messaggio riguardo al tuo ordine'; +$_LANGMAIL['New voucher regarding your order %s'] = 'Nuovo buono sconto riguardante il tuo ordine %s'; +$_LANGMAIL['Thanks for your order'] = 'Grazie dell\'ordine'; +$_LANGMAIL['We miss you'] = 'Ci manchi'; +$_LANGMAIL['Congratulations!'] = 'Congratulazioni!'; +$_LANGMAIL['Message from contact form'] = 'Messaggio da modulo di contatto'; +$_LANGMAIL['Your message has been correctly sent'] = 'Il tuo messaggio è stato inviato correttamente'; +$_LANGMAIL['Your order return state has changed'] = 'Nuovo status dell\'ordine'; +$_LANGMAIL['Product available'] = 'Prodotto disponibile'; +$_LANGMAIL['Product out of stock'] = 'Prodotto esaurito'; diff --git a/mails/it/log_alert.html b/mails/it/log_alert.html index f139a74d2..4a8e3da6f 100755 --- a/mails/it/log_alert.html +++ b/mails/it/log_alert.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -20,7 +20,7 @@ - + @@ -38,10 +38,10 @@ - +
           
          Nuovo messaggio di avvisoNuovo messaggio di avviso
            
          {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
          - - + + \ No newline at end of file diff --git a/mails/it/newsletter.html b/mails/it/newsletter.html index 78816108c..df5d9e6ae 100644 --- a/mails/it/newsletter.html +++ b/mails/it/newsletter.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -26,10 +26,10 @@ - +
           
          Newsletter da {shop_name}Newsletter da {shop_name}
            
          {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
          - - + + \ No newline at end of file diff --git a/mails/it/order_canceled.html b/mails/it/order_canceled.html index bf03ef834..b51d53c44 100644 --- a/mails/it/order_canceled.html +++ b/mails/it/order_canceled.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -Riguardo al tuo ordine n.{id_order} +Riguardo al tuo ordine n.{id_order}   @@ -32,16 +32,16 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/order_changed.html b/mails/it/order_changed.html index 62b96dadf..6dda627ca 100644 --- a/mails/it/order_changed.html +++ b/mails/it/order_changed.html @@ -14,13 +14,13 @@   -Hi {firstname} {lastname}, +Hi {firstname} {lastname},   -Your order with the reference {order_name} - Order changed +Your order with the reference {order_name} - Order changed   @@ -32,16 +32,16 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

          +You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

          -If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   -{shop_name} powered by PrestaShop™ +{shop_name} powered by PrestaShop™ diff --git a/mails/it/order_conf.html b/mails/it/order_conf.html index 022d90366..1ee5ea498 100644 --- a/mails/it/order_conf.html +++ b/mails/it/order_conf.html @@ -14,19 +14,19 @@   -Salve {firstname} {lastname}, grazie di aver acquistato con {shop_name}. +Salve {firstname} {lastname}, grazie di aver acquistato con {shop_name}.   -Dati dell'ordine +Dati dell'ordine   -Ordine: {order_name} effettuato il {date}
          Pagamento: {payment} +Ordine: {order_name} effettuato il {date}
          Pagamento: {payment}   @@ -75,7 +75,7 @@   -Spedizione +Spedizione   @@ -103,16 +103,16 @@   -Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/order_customer_comment.html b/mails/it/order_customer_comment.html index 1050f00dd..bb36a3c41 100644 --- a/mails/it/order_customer_comment.html +++ b/mails/it/order_customer_comment.html @@ -1,10 +1,10 @@ - - - - - Messaggio da un cliente da {shop_name} - - + + + + + Messaggio da un cliente da {shop_name} + + @@ -20,7 +20,7 @@ - + @@ -32,10 +32,10 @@ - +
           
          Messaggio da {firstname} {lastname} ({email})Messaggio da {firstname} {lastname} ({email})
            
          {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
          - - + + \ No newline at end of file diff --git a/mails/it/order_merchant_comment.html b/mails/it/order_merchant_comment.html index fa66fde76..0f0605374 100644 --- a/mails/it/order_merchant_comment.html +++ b/mails/it/order_merchant_comment.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,10 +32,10 @@ - +
           
          Salve {firstname} {lastname},Salve {firstname} {lastname},
           
          Messaggio da {shop_name}Messaggio da {shop_name}
            
          {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
          - - + + \ No newline at end of file diff --git a/mails/it/order_return_state.html b/mails/it/order_return_state.html index 1d00a9593..4a6ebbd36 100644 --- a/mails/it/order_return_state.html +++ b/mails/it/order_return_state.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -Cronologia della restituzione dell'ordine n.{id_order_return} +Cronologia della restituzione dell'ordine n.{id_order_return}   @@ -32,13 +32,13 @@   -Puoi rivedere questo ordine nella sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine nella sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/outofstock.html b/mails/it/outofstock.html index e7176cb71..fc4bb0975 100644 --- a/mails/it/outofstock.html +++ b/mails/it/outofstock.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -La cronologia del tuo ordine n. id_order} +La cronologia del tuo ordine n. id_order}   @@ -32,16 +32,16 @@   -Puoi rivedere questo ordine e scaricare la fattura nella sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura nella sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web. +Se hai un account ospite puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/password.html b/mails/it/password.html index 8cf5b8311..d61da3270 100644 --- a/mails/it/password.html +++ b/mails/it/password.html @@ -1,10 +1,10 @@ - - - - - Messagio da {shop_name} - - + + + + + Messagio da {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,10 +38,10 @@ - +
           
          Salve {firstname} {lastname},Salve {firstname} {lastname},
           
          I tuoi nuovi dati di loginI tuoi nuovi dati di login
            
          {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
          - - + + \ No newline at end of file diff --git a/mails/it/password_query.html b/mails/it/password_query.html index 288bcefc2..f81b2c2f3 100644 --- a/mails/it/password_query.html +++ b/mails/it/password_query.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -32,10 +32,10 @@ - +
           
          Salve {firstname} {lastname},Salve {firstname} {lastname},
            
          {shop_name} realised by PrestaShop™{shop_name} realised by PrestaShop™
          - - + + \ No newline at end of file diff --git a/mails/it/payment.html b/mails/it/payment.html index 4c2683f4a..ec753af87 100644 --- a/mails/it/payment.html +++ b/mails/it/payment.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -La cronologia del tuo ordine n.{id_order} +La cronologia del tuo ordine n.{id_order}   @@ -32,13 +32,13 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/payment_error.html b/mails/it/payment_error.html index e8fa594ea..084954540 100644 --- a/mails/it/payment_error.html +++ b/mails/it/payment_error.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -La cronologia del tuo ordine n. id_order} +La cronologia del tuo ordine n. id_order}   @@ -38,16 +38,16 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/preparation.html b/mails/it/preparation.html index 976097207..d383d2489 100644 --- a/mails/it/preparation.html +++ b/mails/it/preparation.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -Cronologia del tuo ordine n.{id_order} +Cronologia del tuo ordine n.{id_order}   @@ -32,16 +32,16 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospitedel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospitedel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/refund.html b/mails/it/refund.html index 5c2b49233..b79c7d15c 100644 --- a/mails/it/refund.html +++ b/mails/it/refund.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -Cronologia del tuo ordine n.{id_order} +Cronologia del tuo ordine n.{id_order}   @@ -32,16 +32,16 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/shipped.html b/mails/it/shipped.html index c113f8c1c..96a9a9612 100644 --- a/mails/it/shipped.html +++ b/mails/it/shipped.html @@ -14,13 +14,13 @@   -Salve {firstname} {lastname}, +Salve {firstname} {lastname},   -Cronologia del tuo ordine n.{id_order} +Cronologia del tuo ordine n.{id_order}   @@ -32,16 +32,16 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite"nel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite"nel nostro sito web.   -{shop_name} powered with PrestaShop™ +{shop_name} powered with PrestaShop™ diff --git a/mails/it/voucher.html b/mails/it/voucher.html index e1d7593bb..84f68e06a 100644 --- a/mails/it/voucher.html +++ b/mails/it/voucher.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -38,10 +38,10 @@ - +
           
          Salve {firstname} {lastname},Salve {firstname} {lastname},
           
          Cronologia del tuo ordine n.{id_order}Cronologia del tuo ordine n.{id_order}
            
          {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
          - - + + \ No newline at end of file diff --git a/mails/it/voucher_new.html b/mails/it/voucher_new.html index d2d9b63f2..2119c2d4d 100644 --- a/mails/it/voucher_new.html +++ b/mails/it/voucher_new.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -14,7 +14,7 @@ - + @@ -32,10 +32,10 @@ - +
           
          Hi {firstname} {lastname},Hi {firstname} {lastname},
            
          {shop_name} powered with PrestaShop™{shop_name} powered with PrestaShop™
          - - + + \ No newline at end of file diff --git a/mails/it/voucher_new.txt b/mails/it/voucher_new.txt index 1761525de..662e63604 100644 --- a/mails/it/voucher_new.txt +++ b/mails/it/voucher_new.txt @@ -11,4 +11,4 @@ Thank you for shopping at {shop_name}. {shop_name} - {shop_url} -{shop_url} powered by PrestaShop +{shop_url} powered by PrestaShop diff --git a/manufacturer.php b/manufacturer.php index c9416c44c..2d5915ae6 100644 --- a/manufacturer.php +++ b/manufacturer.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/modules/bankwire/bankwire.php b/modules/bankwire/bankwire.php index ed4231532..22f5483d9 100644 --- a/modules/bankwire/bankwire.php +++ b/modules/bankwire/bankwire.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7095 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/bankwire/controllers/front/index.php b/modules/bankwire/controllers/front/index.php index 298435bc6..b37b3d3c4 100644 --- a/modules/bankwire/controllers/front/index.php +++ b/modules/bankwire/controllers/front/index.php @@ -19,8 +19,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ +* @copyright 2007-2012 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/bankwire/controllers/front/payment.php b/modules/bankwire/controllers/front/payment.php index 893ba0642..e90f6b240 100644 --- a/modules/bankwire/controllers/front/payment.php +++ b/modules/bankwire/controllers/front/payment.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/modules/bankwire/controllers/front/validation.php b/modules/bankwire/controllers/front/validation.php index ef0fc14b2..feb3cc73c 100644 --- a/modules/bankwire/controllers/front/validation.php +++ b/modules/bankwire/controllers/front/validation.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/modules/bankwire/controllers/index.php b/modules/bankwire/controllers/index.php index 0aebcd154..f642dd55e 100644 --- a/modules/bankwire/controllers/index.php +++ b/modules/bankwire/controllers/index.php @@ -19,8 +19,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ +* @copyright 2007-2012 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/bankwire/index.php b/modules/bankwire/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/bankwire/index.php +++ b/modules/bankwire/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/modules/bankwire/payment.php b/modules/bankwire/payment.php index 6c37f6b43..87de811b0 100644 --- a/modules/bankwire/payment.php +++ b/modules/bankwire/payment.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7091 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/bankwire/translations/de.php b/modules/bankwire/translations/de.php index e8b9471db..1c5f40be4 100644 --- a/modules/bankwire/translations/de.php +++ b/modules/bankwire/translations/de.php @@ -2,52 +2,53 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{bankwire}prestashop>bankwire_85ee0d0492a4e37e6c183520f5d59c40'] = 'Banküberweisung'; + +$_MODULE['<{bankwire}prestashop>bankwire_17e6954ea60d238857324fea1f10b8f3'] = 'Bitte spezifizieren Sie die Bankverbindungsdetails für Kunden.'; +$_MODULE['<{bankwire}prestashop>bankwire_857216dd1b374de9bf54068fcd78a8f3'] = 'Kontoinhaber'; +$_MODULE['<{bankwire}prestashop>bankwire_f9a1a1bb716cbae0503d351ea2af4b34'] = 'Bankadresse'; +$_MODULE['<{bankwire}prestashop>payment_execution_c5e8668ba5e211603955f0b5e913d83d'] = 'Zahlung per Banküberweisung'; +$_MODULE['<{bankwire}prestashop>payment_execution_f1d3b424cd68795ecaa552883759aceb'] = 'Bestellsumme'; +$_MODULE['<{bankwire}prestashop>payment_execution_e40a43534d7f4ece69347847d75401e0'] = 'Banküberweisung'; +$_MODULE['<{bankwire}prestashop>payment_execution_3dd021316505c0204989f984246c6ff1'] = 'Die Kontoinformationen zur Banküberweisung stehen auf der folgenden Seite.'; +$_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Zahlung per Banküberweisung (längerer Bestellvorgang)'; +$_MODULE['<{bankwire}prestashop>payment_return_a35abd2d31d9e1da82599bc67e166506'] = 'folgenden Betrag'; +$_MODULE['<{bankwire}prestashop>payment_return_c51326a2ac458845d579a82a92f111f0'] = 'an den Kontoinhaber von'; +$_MODULE['<{bankwire}prestashop>payment_return_13f4ac6dc75b5829499cb9cf8b733071'] = 'Eine E-Mail wurde Ihnen mit diesen Informationen gesendet.'; +$_MODULE['<{bankwire}prestashop>payment_return_64430ad2835be8ad60c59e7d44e4b0b1'] = 'Kunden-Support'; $_MODULE['<{bankwire}prestashop>bankwire_f652b92eefd4ecfe61ef5fb118157a05'] = 'Zahlungen per Banküberweisung annehmen'; $_MODULE['<{bankwire}prestashop>bankwire_69a1a3ad8dd5da6db3c4da838a0cf9c7'] = 'Sind Sie sicher, dass Sie Ihre Details löschen möchten?'; $_MODULE['<{bankwire}prestashop>bankwire_f05d09f37c9a02f0737c1e71142028a9'] = 'Kontoinhaber und Details müssen konfiguriert werden, um dieses Modul korrekt zu nutzen'; $_MODULE['<{bankwire}prestashop>bankwire_4402acab1c8f90dcf4a31dc96833bd86'] = 'Keine Währung für dieses Modul eingestellte'; $_MODULE['<{bankwire}prestashop>bankwire_bfa43217dfe8261ee7cb040339085677'] = 'Konto-Details erforderlich.'; $_MODULE['<{bankwire}prestashop>bankwire_ccab155f173ac76f79eb192703f86b18'] = 'Kontoinhaber erforderlich.'; -$_MODULE['<{bankwire}prestashop>bankwire_c888438d14855d7d96a2724ee9c306bd'] = 'Einstellungen aktualisiert'; -$_MODULE['<{bankwire}prestashop>bankwire_fcec4d73cccd149a2d18695fd8785f88'] = 'Dieses Modul ermöglicht Ihnen Zahlungen per Banküberweisung.'; -$_MODULE['<{bankwire}prestashop>bankwire_b6af2d31afe71aedcceca73cc27fec29'] = 'Wenn der Kunde diese Zahlungsmethode wählt, wird der Bestellstatus auf \"Wartet auf Zahlung\" umgestellt.'; +$_MODULE['<{bankwire}prestashop>bankwire_b6af2d31afe71aedcceca73cc27fec29'] = 'Wenn der Kunde diese Zahlungsmethode wählt, wird der Bestellstatus auf \\"Wartet auf Zahlung\\" umgestellt.'; $_MODULE['<{bankwire}prestashop>bankwire_0daeb8f6c1874ec9442e821b524d37c1'] = 'Aus diesem Grund müssen Sie die Bestellung manuell bestätigen, sobald Sie die Überweisung erhalten.'; $_MODULE['<{bankwire}prestashop>bankwire_5dd532f0a63d89c5af0243b74732f63c'] = 'Kontaktangaben'; -$_MODULE['<{bankwire}prestashop>bankwire_17e6954ea60d238857324fea1f10b8f3'] = 'Bitte spezifizieren Sie die Bankverbindungsdetails für Kunden.'; -$_MODULE['<{bankwire}prestashop>bankwire_857216dd1b374de9bf54068fcd78a8f3'] = 'Kontoinhaber'; -$_MODULE['<{bankwire}prestashop>bankwire_3ec365dd533ddb7ef3d1c111186ce872'] = 'Details'; -$_MODULE['<{bankwire}prestashop>bankwire_6b154cafbab54ba3a1e76a78c290c02a'] = 'wie Zweigstelle, IBAN-Nummer, BIC, etc.'; -$_MODULE['<{bankwire}prestashop>bankwire_f9a1a1bb716cbae0503d351ea2af4b34'] = 'Bankadresse'; $_MODULE['<{bankwire}prestashop>bankwire_b17f3f4dcf653a5776792498a9b44d6a'] = 'Einstellungen aktualisieren'; -$_MODULE['<{bankwire}prestashop>validation_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Diese Zahlungsmodlität ist nich verfügbar.'; -$_MODULE['<{bankwire}prestashop>payment_execution_c5e8668ba5e211603955f0b5e913d83d'] = 'Zahlung per Banküberweisung'; -$_MODULE['<{bankwire}prestashop>payment_execution_f1d3b424cd68795ecaa552883759aceb'] = 'Bestellsumme'; $_MODULE['<{bankwire}prestashop>payment_execution_879f6b8877752685a966564d072f498f'] = 'Ihr Warenkorb ist leer.'; -$_MODULE['<{bankwire}prestashop>payment_execution_e40a43534d7f4ece69347847d75401e0'] = 'Banküberweisung'; $_MODULE['<{bankwire}prestashop>payment_execution_afda466128ee0594745d9f8152699b74'] = 'Sie möchten per Banküberweisung zahlen.'; $_MODULE['<{bankwire}prestashop>payment_execution_c884ed19483d45970c5bf23a681e2dd2'] = 'Hier ist eine kurze Zusammenfassung Ihrer Bestellung:'; $_MODULE['<{bankwire}prestashop>payment_execution_e2867a925cba382f1436d1834bb52a1c'] = 'Der Gesamtbetrag Ihrer Bestellung beträgt'; +$_MODULE['<{bankwire}prestashop>payment_execution_a7a08622ee5c8019b57354b99b7693b2'] = 'Wählen Sie eine der folgenden Möglichkeiten:'; +$_MODULE['<{bankwire}prestashop>payment_execution_0881a11f7af33bc1b43e437391129d66'] = 'Bitte bestätigen Sie Ihre Bestellung durch Klicken auf \\"KAUFEN\\"'; +$_MODULE['<{bankwire}prestashop>payment_return_c4457a9f2f20e39386008bbb2cd3a78f'] = 'Ihre Bestellung wird abgesendet, sobald wir Ihre Überweisung erhalten haben.'; +$_MODULE['<{bankwire}prestashop>bankwire_fcec4d73cccd149a2d18695fd8785f88'] = 'Dieses Modul ermöglicht Ihnen Zahlungen per Banküberweisung.'; +$_MODULE['<{bankwire}prestashop>bankwire_3ec365dd533ddb7ef3d1c111186ce872'] = 'Details'; +$_MODULE['<{bankwire}prestashop>bankwire_6b154cafbab54ba3a1e76a78c290c02a'] = 'wie Zweigstelle, IBAN-Nummer, BIC, etc.'; $_MODULE['<{bankwire}prestashop>payment_execution_1f87346a16cf80c372065de3c54c86d9'] = '(Inkl. Mwst.)'; $_MODULE['<{bankwire}prestashop>payment_execution_e2c147f82d998eeeb147ae172a31a88e'] = 'Wir nehmen bestimmte Währungen per Banküberweisung an.'; -$_MODULE['<{bankwire}prestashop>payment_execution_a7a08622ee5c8019b57354b99b7693b2'] = 'Wählen Sie eine der folgenden Möglichkeiten:'; -$_MODULE['<{bankwire}prestashop>payment_execution_2c1ce705702e11fd5e2188c2353c0c86'] = 'Wir nehmen folgende Währung per Banküberweisung an:'; -$_MODULE['<{bankwire}prestashop>payment_execution_3dd021316505c0204989f984246c6ff1'] = 'Die Kontoinformationen zur Banküberweisung stehen auf der folgenden Seite.'; -$_MODULE['<{bankwire}prestashop>payment_execution_0881a11f7af33bc1b43e437391129d66'] = 'Bitte bestätigen Sie Ihre Bestellung durch Klicken auf \"KAUFEN\"'; -$_MODULE['<{bankwire}prestashop>payment_execution_46b9e3665f187c739c55983f757ccda0'] = 'Ich bestätige meine Bestellung'; -$_MODULE['<{bankwire}prestashop>payment_execution_569fd05bdafa1712c4f6be5b153b8418'] = 'Andere Zahlungsmethoden'; $_MODULE['<{bankwire}prestashop>payment_5e1695822fc5af98f6b749ea3cbc9b4c'] = 'Zahlung per Banküberweisung'; -$_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Zahlung per Banküberweisung (längerer Bestellvorgang)'; $_MODULE['<{bankwire}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Ihre Bestellung auf %s ist abgeschlossen.'; $_MODULE['<{bankwire}prestashop>payment_return_1552c5916ccfe019f35d91fd8955755e'] = 'Bitte senden Sie uns folgenden Betrag per Banküberweisung:'; -$_MODULE['<{bankwire}prestashop>payment_return_a35abd2d31d9e1da82599bc67e166506'] = 'folgenden Betrag'; -$_MODULE['<{bankwire}prestashop>payment_return_c51326a2ac458845d579a82a92f111f0'] = 'an den Kontoinhaber von'; $_MODULE['<{bankwire}prestashop>payment_return_de6d813f05e3916a86b89bd8b1a8a489'] = 'mit dieser Bankverbindung'; $_MODULE['<{bankwire}prestashop>payment_return_619b26a60df1af3649d2e8920a7949cd'] = 'an diese Bank'; $_MODULE['<{bankwire}prestashop>payment_return_63fb3f7c94ee5d8027bf599885de279d'] = 'Vergessen Sie nicht Ihre Bestellnummer #%d in den Titel Ihrer Bankverbindung anzugeben.'; $_MODULE['<{bankwire}prestashop>payment_return_1faa25b80a8d31e5ef25a78d3336606d'] = 'Vergessen Sie nicht Ihre Auftrags-Referenz-Nummer #%d in den Titel Ihrer Bankverbindung anzugeben.'; -$_MODULE['<{bankwire}prestashop>payment_return_13f4ac6dc75b5829499cb9cf8b733071'] = 'Eine E-Mail wurde Ihnen mit diesen Informationen gesendet.'; -$_MODULE['<{bankwire}prestashop>payment_return_c4457a9f2f20e39386008bbb2cd3a78f'] = 'Ihre Bestellung wird abgesendet, sobald wir Ihre Überweisung erhalten haben.'; $_MODULE['<{bankwire}prestashop>payment_return_0db71da7150c27142eef9d22b843b4a9'] = 'Bei Fragen oder für weitere Informationen, kontaktieren Sie bitte unseren'; -$_MODULE['<{bankwire}prestashop>payment_return_64430ad2835be8ad60c59e7d44e4b0b1'] = 'Kunden-Support'; +$_MODULE['<{bankwire}prestashop>bankwire_85ee0d0492a4e37e6c183520f5d59c40'] = 'Banküberweisung'; +$_MODULE['<{bankwire}prestashop>bankwire_c888438d14855d7d96a2724ee9c306bd'] = 'Einstellungen aktualisiert'; +$_MODULE['<{bankwire}prestashop>validation_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Diese Zahlungsmodlität ist nich verfügbar.'; +$_MODULE['<{bankwire}prestashop>payment_execution_2c1ce705702e11fd5e2188c2353c0c86'] = 'Wir nehmen folgende Währung per Banküberweisung an:'; +$_MODULE['<{bankwire}prestashop>payment_execution_46b9e3665f187c739c55983f757ccda0'] = 'Ich bestätige meine Bestellung'; +$_MODULE['<{bankwire}prestashop>payment_execution_569fd05bdafa1712c4f6be5b153b8418'] = 'Andere Zahlungsmethoden'; $_MODULE['<{bankwire}prestashop>payment_return_8de637e24570c1edb0357826a2ad5aea'] = 'Wir haben bei Ihrer Bestellung ein Problem festgestellt. Wenn Sie denken, dies sei ein Fehler, können Sie an unseren'; diff --git a/modules/bankwire/translations/es.php b/modules/bankwire/translations/es.php index 5fa4c414a..548443062 100644 --- a/modules/bankwire/translations/es.php +++ b/modules/bankwire/translations/es.php @@ -2,52 +2,53 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{bankwire}prestashop>bankwire_85ee0d0492a4e37e6c183520f5d59c40'] = 'Trasferencia bancaria'; + +$_MODULE['<{bankwire}prestashop>bankwire_17e6954ea60d238857324fea1f10b8f3'] = 'Por favor, especifique los detalles de la cuenta para sus clientes'; +$_MODULE['<{bankwire}prestashop>bankwire_857216dd1b374de9bf54068fcd78a8f3'] = 'Propietario de la cuenta'; +$_MODULE['<{bankwire}prestashop>bankwire_f9a1a1bb716cbae0503d351ea2af4b34'] = 'Dirección agencia bancaria'; +$_MODULE['<{bankwire}prestashop>payment_execution_c5e8668ba5e211603955f0b5e913d83d'] = 'Pago por transferencia bancaria'; +$_MODULE['<{bankwire}prestashop>payment_execution_f1d3b424cd68795ecaa552883759aceb'] = 'Resumen del pedido'; +$_MODULE['<{bankwire}prestashop>payment_execution_e40a43534d7f4ece69347847d75401e0'] = 'Transferencia bancaria'; +$_MODULE['<{bankwire}prestashop>payment_execution_3dd021316505c0204989f984246c6ff1'] = 'La información para realizar la trasferencia bancaria aparecerá en la página siguiente.'; +$_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Pago por transferencia bancaria (el proceso llevará más tiempo)'; +$_MODULE['<{bankwire}prestashop>payment_return_a35abd2d31d9e1da82599bc67e166506'] = 'por un valor de'; +$_MODULE['<{bankwire}prestashop>payment_return_c51326a2ac458845d579a82a92f111f0'] = 'al propietario de la cuenta'; +$_MODULE['<{bankwire}prestashop>payment_return_13f4ac6dc75b5829499cb9cf8b733071'] = 'Le hemos enviado un email con los datos anteriores.'; +$_MODULE['<{bankwire}prestashop>payment_return_64430ad2835be8ad60c59e7d44e4b0b1'] = 'de atención al cliente'; $_MODULE['<{bankwire}prestashop>bankwire_f652b92eefd4ecfe61ef5fb118157a05'] = 'Se aceptan pagos por trasferencia bancaria'; $_MODULE['<{bankwire}prestashop>bankwire_69a1a3ad8dd5da6db3c4da838a0cf9c7'] = '¿Está seguro de querer borrar los detalles?'; $_MODULE['<{bankwire}prestashop>bankwire_f05d09f37c9a02f0737c1e71142028a9'] = 'El propietario y detalles de la cuenta deben configurarse para usar el módulo correctamente'; $_MODULE['<{bankwire}prestashop>bankwire_4402acab1c8f90dcf4a31dc96833bd86'] = 'Ninguna divisa disponible para este módulo'; $_MODULE['<{bankwire}prestashop>bankwire_bfa43217dfe8261ee7cb040339085677'] = 'se necesitan los detalles de la cuenta.'; $_MODULE['<{bankwire}prestashop>bankwire_ccab155f173ac76f79eb192703f86b18'] = 'Se necesita el propietario de la cuenta.'; -$_MODULE['<{bankwire}prestashop>bankwire_c888438d14855d7d96a2724ee9c306bd'] = 'Actualización realizada con éxito'; -$_MODULE['<{bankwire}prestashop>bankwire_fcec4d73cccd149a2d18695fd8785f88'] = 'Este módulo permite aceptar pagos por trasferencia bancaria.'; -$_MODULE['<{bankwire}prestashop>bankwire_b6af2d31afe71aedcceca73cc27fec29'] = 'si el cliente elije este modo de pago, el pedido cambiará su estado a \"pendiente de pago\".'; +$_MODULE['<{bankwire}prestashop>bankwire_b6af2d31afe71aedcceca73cc27fec29'] = 'si el cliente elije este modo de pago, el pedido cambiará su estado a \\"pendiente de pago\\".'; $_MODULE['<{bankwire}prestashop>bankwire_0daeb8f6c1874ec9442e821b524d37c1'] = 'Por lo tanto, deberá confirmar el pedido en cuanto reciba la trasferencia.'; $_MODULE['<{bankwire}prestashop>bankwire_5dd532f0a63d89c5af0243b74732f63c'] = 'Detalles contacto'; -$_MODULE['<{bankwire}prestashop>bankwire_17e6954ea60d238857324fea1f10b8f3'] = 'Por favor, especifique los detalles de la cuenta para sus clientes'; -$_MODULE['<{bankwire}prestashop>bankwire_857216dd1b374de9bf54068fcd78a8f3'] = 'Propietario de la cuenta'; -$_MODULE['<{bankwire}prestashop>bankwire_3ec365dd533ddb7ef3d1c111186ce872'] = 'Detalles'; -$_MODULE['<{bankwire}prestashop>bankwire_6b154cafbab54ba3a1e76a78c290c02a'] = 'tales como: sucursal bancaria, código IBAN, BIC, etc.'; -$_MODULE['<{bankwire}prestashop>bankwire_f9a1a1bb716cbae0503d351ea2af4b34'] = 'Dirección agencia bancaria'; $_MODULE['<{bankwire}prestashop>bankwire_b17f3f4dcf653a5776792498a9b44d6a'] = 'Ajustes actualizados'; -$_MODULE['<{bankwire}prestashop>validation_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Esta forma de pago no está disponible.'; -$_MODULE['<{bankwire}prestashop>payment_execution_c5e8668ba5e211603955f0b5e913d83d'] = 'Pago por transferencia bancaria'; -$_MODULE['<{bankwire}prestashop>payment_execution_f1d3b424cd68795ecaa552883759aceb'] = 'Resumen del pedido'; $_MODULE['<{bankwire}prestashop>payment_execution_879f6b8877752685a966564d072f498f'] = 'Su carrito está vacío'; -$_MODULE['<{bankwire}prestashop>payment_execution_e40a43534d7f4ece69347847d75401e0'] = 'Transferencia bancaria'; $_MODULE['<{bankwire}prestashop>payment_execution_afda466128ee0594745d9f8152699b74'] = 'Ha elegido pagar por transferencia bancaria'; $_MODULE['<{bankwire}prestashop>payment_execution_c884ed19483d45970c5bf23a681e2dd2'] = 'Resumen de su pedido:'; $_MODULE['<{bankwire}prestashop>payment_execution_e2867a925cba382f1436d1834bb52a1c'] = 'El importe total de su pedido asciende a'; +$_MODULE['<{bankwire}prestashop>payment_execution_a7a08622ee5c8019b57354b99b7693b2'] = 'Elija entre las siguientes:'; +$_MODULE['<{bankwire}prestashop>payment_execution_0881a11f7af33bc1b43e437391129d66'] = 'Por favor, confirme su pedido pulsando en \\"Confirmo mi pedido\\"'; +$_MODULE['<{bankwire}prestashop>payment_return_c4457a9f2f20e39386008bbb2cd3a78f'] = 'Su pedido será enviado próximamente, en cuanto recibamos su pago.'; +$_MODULE['<{bankwire}prestashop>bankwire_85ee0d0492a4e37e6c183520f5d59c40'] = 'Trasferencia bancaria'; +$_MODULE['<{bankwire}prestashop>bankwire_fcec4d73cccd149a2d18695fd8785f88'] = 'Este módulo permite aceptar pagos por trasferencia bancaria.'; +$_MODULE['<{bankwire}prestashop>bankwire_3ec365dd533ddb7ef3d1c111186ce872'] = 'Detalles'; +$_MODULE['<{bankwire}prestashop>bankwire_6b154cafbab54ba3a1e76a78c290c02a'] = 'tales como: sucursal bancaria, código IBAN, BIC, etc.'; $_MODULE['<{bankwire}prestashop>payment_execution_1f87346a16cf80c372065de3c54c86d9'] = 'IVA incluido'; $_MODULE['<{bankwire}prestashop>payment_execution_e2c147f82d998eeeb147ae172a31a88e'] = 'Aceptamos diferentes monedas para la transferencia bancaria.'; -$_MODULE['<{bankwire}prestashop>payment_execution_a7a08622ee5c8019b57354b99b7693b2'] = 'Elija entre las siguientes:'; -$_MODULE['<{bankwire}prestashop>payment_execution_2c1ce705702e11fd5e2188c2353c0c86'] = 'Aceptamos las siguientes monedas para las transferencias bancarias:'; -$_MODULE['<{bankwire}prestashop>payment_execution_3dd021316505c0204989f984246c6ff1'] = 'La información para realizar la trasferencia bancaria aparecerá en la página siguiente.'; -$_MODULE['<{bankwire}prestashop>payment_execution_0881a11f7af33bc1b43e437391129d66'] = 'Por favor, confirme su pedido pulsando en \"Confirmo mi pedido\"'; -$_MODULE['<{bankwire}prestashop>payment_execution_46b9e3665f187c739c55983f757ccda0'] = 'Confirmo mi pedido'; -$_MODULE['<{bankwire}prestashop>payment_execution_569fd05bdafa1712c4f6be5b153b8418'] = 'Otros modos de pago'; $_MODULE['<{bankwire}prestashop>payment_5e1695822fc5af98f6b749ea3cbc9b4c'] = 'Pago por transferencia bancaria'; -$_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Pago por transferencia bancaria (el proceso llevará más tiempo)'; $_MODULE['<{bankwire}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Su pedido %s está completo.'; $_MODULE['<{bankwire}prestashop>payment_return_1552c5916ccfe019f35d91fd8955755e'] = 'por favor, háganos una transferencia por:'; -$_MODULE['<{bankwire}prestashop>payment_return_a35abd2d31d9e1da82599bc67e166506'] = 'por un valor de'; -$_MODULE['<{bankwire}prestashop>payment_return_c51326a2ac458845d579a82a92f111f0'] = 'al propietario de la cuenta'; $_MODULE['<{bankwire}prestashop>payment_return_de6d813f05e3916a86b89bd8b1a8a489'] = 'con los siguientes datos'; $_MODULE['<{bankwire}prestashop>payment_return_619b26a60df1af3649d2e8920a7949cd'] = 'a este banco'; $_MODULE['<{bankwire}prestashop>payment_return_63fb3f7c94ee5d8027bf599885de279d'] = 'No te olvides de insertar su número de pedido #%d en el tema de su transferencia bancaria'; -$_MODULE['<{bankwire}prestashop>payment_return_1faa25b80a8d31e5ef25a78d3336606d'] = 'No te olvides de insertar tu número de pedido %s en el tema de su transferencia bancaria.'; -$_MODULE['<{bankwire}prestashop>payment_return_13f4ac6dc75b5829499cb9cf8b733071'] = 'Le hemos enviado un email con los datos anteriores.'; -$_MODULE['<{bankwire}prestashop>payment_return_c4457a9f2f20e39386008bbb2cd3a78f'] = 'Su pedido será enviado próximamente, en cuanto recibamos su pago.'; $_MODULE['<{bankwire}prestashop>payment_return_0db71da7150c27142eef9d22b843b4a9'] = 'Para cualquier duda o para más información, póngase en contacto con nuestro servicio'; -$_MODULE['<{bankwire}prestashop>payment_return_64430ad2835be8ad60c59e7d44e4b0b1'] = 'de atención al cliente'; +$_MODULE['<{bankwire}prestashop>payment_return_1faa25b80a8d31e5ef25a78d3336606d'] = 'No te olvides de insertar tu número de pedido %s en el tema de su transferencia bancaria.'; +$_MODULE['<{bankwire}prestashop>bankwire_c888438d14855d7d96a2724ee9c306bd'] = 'Actualización realizada con éxito'; +$_MODULE['<{bankwire}prestashop>validation_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Esta forma de pago no está disponible.'; +$_MODULE['<{bankwire}prestashop>payment_execution_2c1ce705702e11fd5e2188c2353c0c86'] = 'Aceptamos las siguientes monedas para las transferencias bancarias:'; +$_MODULE['<{bankwire}prestashop>payment_execution_46b9e3665f187c739c55983f757ccda0'] = 'Confirmo mi pedido'; +$_MODULE['<{bankwire}prestashop>payment_execution_569fd05bdafa1712c4f6be5b153b8418'] = 'Otros modos de pago'; $_MODULE['<{bankwire}prestashop>payment_return_8de637e24570c1edb0357826a2ad5aea'] = 'Hay un problema con su pedido, póngase en contacto con el servicio de atención al cliente.'; diff --git a/modules/bankwire/translations/fr.php b/modules/bankwire/translations/fr.php index 5f87e532d..6c1aaa1d1 100644 --- a/modules/bankwire/translations/fr.php +++ b/modules/bankwire/translations/fr.php @@ -2,52 +2,53 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{bankwire}prestashop>bankwire_85ee0d0492a4e37e6c183520f5d59c40'] = 'Virement bancaire'; + +$_MODULE['<{bankwire}prestashop>payment_execution_c5e8668ba5e211603955f0b5e913d83d'] = 'Paiement par virement bancaire'; +$_MODULE['<{bankwire}prestashop>payment_execution_f1d3b424cd68795ecaa552883759aceb'] = 'Récapitulatif de commande'; +$_MODULE['<{bankwire}prestashop>payment_execution_e40a43534d7f4ece69347847d75401e0'] = 'virement bancaire'; +$_MODULE['<{bankwire}prestashop>bankwire_17e6954ea60d238857324fea1f10b8f3'] = 'Veuillez spécifier les détails du compte en banque pour les clients'; +$_MODULE['<{bankwire}prestashop>bankwire_857216dd1b374de9bf54068fcd78a8f3'] = 'Titulaire'; +$_MODULE['<{bankwire}prestashop>bankwire_f9a1a1bb716cbae0503d351ea2af4b34'] = 'Adresse de la banque'; +$_MODULE['<{bankwire}prestashop>payment_execution_3dd021316505c0204989f984246c6ff1'] = 'Nos coordonnées bancaires seront affichées sur la page suivante.'; +$_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Payer par virement bancaire (traitement plus long)'; +$_MODULE['<{bankwire}prestashop>payment_return_a35abd2d31d9e1da82599bc67e166506'] = 'un montant de'; +$_MODULE['<{bankwire}prestashop>payment_return_c51326a2ac458845d579a82a92f111f0'] = 'à l\'ordre de'; +$_MODULE['<{bankwire}prestashop>payment_return_13f4ac6dc75b5829499cb9cf8b733071'] = 'Un e-mail contenant ces informations vous a été envoyé.'; +$_MODULE['<{bankwire}prestashop>payment_return_64430ad2835be8ad60c59e7d44e4b0b1'] = 'support client'; $_MODULE['<{bankwire}prestashop>bankwire_f652b92eefd4ecfe61ef5fb118157a05'] = 'Accepter les paiements par virement.'; $_MODULE['<{bankwire}prestashop>bankwire_69a1a3ad8dd5da6db3c4da838a0cf9c7'] = 'Êtes-vous certain de vouloir effacer vos données ?'; $_MODULE['<{bankwire}prestashop>bankwire_f05d09f37c9a02f0737c1e71142028a9'] = 'Le titulaire du compte et les informations bancaires doivent être configurés.'; -$_MODULE['<{bankwire}prestashop>bankwire_4402acab1c8f90dcf4a31dc96833bd86'] = 'Aucune devise disponible pour ce module'; -$_MODULE['<{bankwire}prestashop>bankwire_bfa43217dfe8261ee7cb040339085677'] = 'Les détails du compte sont requis.'; -$_MODULE['<{bankwire}prestashop>bankwire_ccab155f173ac76f79eb192703f86b18'] = 'Le titulaire du compte est requis.'; -$_MODULE['<{bankwire}prestashop>bankwire_c888438d14855d7d96a2724ee9c306bd'] = 'Mise à jour réussie'; -$_MODULE['<{bankwire}prestashop>bankwire_fcec4d73cccd149a2d18695fd8785f88'] = 'Ce module vous permet d\'accepter les paiements par virement bancaire.'; -$_MODULE['<{bankwire}prestashop>bankwire_b6af2d31afe71aedcceca73cc27fec29'] = 'Si le client choisit ce mode de paiement, la commande passera à l\'état \"Paiement en attente\".'; -$_MODULE['<{bankwire}prestashop>bankwire_0daeb8f6c1874ec9442e821b524d37c1'] = 'Par conséquent, vous devez confirmer manuellement la commande dès que vous recevrez le virement.'; $_MODULE['<{bankwire}prestashop>bankwire_5dd532f0a63d89c5af0243b74732f63c'] = 'Coordonnées'; -$_MODULE['<{bankwire}prestashop>bankwire_17e6954ea60d238857324fea1f10b8f3'] = 'Veuillez spécifier les détails du compte en banque pour les clients'; -$_MODULE['<{bankwire}prestashop>bankwire_857216dd1b374de9bf54068fcd78a8f3'] = 'Titulaire'; -$_MODULE['<{bankwire}prestashop>bankwire_3ec365dd533ddb7ef3d1c111186ce872'] = 'Détails'; -$_MODULE['<{bankwire}prestashop>bankwire_6b154cafbab54ba3a1e76a78c290c02a'] = 'Comme le code banque, l\'IBAN ou encore le BIC'; -$_MODULE['<{bankwire}prestashop>bankwire_f9a1a1bb716cbae0503d351ea2af4b34'] = 'Adresse de la banque'; -$_MODULE['<{bankwire}prestashop>bankwire_b17f3f4dcf653a5776792498a9b44d6a'] = 'Mettre à jour'; -$_MODULE['<{bankwire}prestashop>validation_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Cette méthode de paiement n\'est pas disponible.'; -$_MODULE['<{bankwire}prestashop>payment_execution_c5e8668ba5e211603955f0b5e913d83d'] = 'Paiement par virement bancaire'; -$_MODULE['<{bankwire}prestashop>payment_execution_f1d3b424cd68795ecaa552883759aceb'] = 'Récapitulatif de commande'; $_MODULE['<{bankwire}prestashop>payment_execution_879f6b8877752685a966564d072f498f'] = 'Votre panier est vide.'; -$_MODULE['<{bankwire}prestashop>payment_execution_e40a43534d7f4ece69347847d75401e0'] = 'virement bancaire'; $_MODULE['<{bankwire}prestashop>payment_execution_afda466128ee0594745d9f8152699b74'] = 'Vous avez choisi de régler par virement bancaire.'; $_MODULE['<{bankwire}prestashop>payment_execution_c884ed19483d45970c5bf23a681e2dd2'] = 'Voici un bref récapitulatif de votre commande :'; $_MODULE['<{bankwire}prestashop>payment_execution_e2867a925cba382f1436d1834bb52a1c'] = 'Le montant total de votre commande s\'élève à'; +$_MODULE['<{bankwire}prestashop>bankwire_4402acab1c8f90dcf4a31dc96833bd86'] = 'Aucune devise disponible pour ce module'; +$_MODULE['<{bankwire}prestashop>bankwire_bfa43217dfe8261ee7cb040339085677'] = 'Les détails du compte sont requis.'; +$_MODULE['<{bankwire}prestashop>bankwire_ccab155f173ac76f79eb192703f86b18'] = 'Le titulaire du compte est requis.'; +$_MODULE['<{bankwire}prestashop>bankwire_b6af2d31afe71aedcceca73cc27fec29'] = 'Si le client choisit ce mode de paiement, la commande passera à l\'état \\"Paiement en attente\\".'; +$_MODULE['<{bankwire}prestashop>bankwire_0daeb8f6c1874ec9442e821b524d37c1'] = 'Par conséquent, vous devez confirmer manuellement la commande dès que vous recevrez le virement.'; +$_MODULE['<{bankwire}prestashop>bankwire_b17f3f4dcf653a5776792498a9b44d6a'] = 'Mettre à jour'; +$_MODULE['<{bankwire}prestashop>payment_execution_a7a08622ee5c8019b57354b99b7693b2'] = 'Merci de choisir parmi les suivantes :'; +$_MODULE['<{bankwire}prestashop>payment_execution_0881a11f7af33bc1b43e437391129d66'] = 'Veuillez confirmer votre commande en cliquant sur \\"Je confirme ma commande\\"'; +$_MODULE['<{bankwire}prestashop>payment_return_c4457a9f2f20e39386008bbb2cd3a78f'] = 'Votre commande sera expédiée dès réception de votre virement.'; +$_MODULE['<{bankwire}prestashop>bankwire_85ee0d0492a4e37e6c183520f5d59c40'] = 'Virement bancaire'; $_MODULE['<{bankwire}prestashop>payment_execution_1f87346a16cf80c372065de3c54c86d9'] = 'TTC'; $_MODULE['<{bankwire}prestashop>payment_execution_e2c147f82d998eeeb147ae172a31a88e'] = 'Nous acceptons plusieurs devises pour votre virement.'; -$_MODULE['<{bankwire}prestashop>payment_execution_a7a08622ee5c8019b57354b99b7693b2'] = 'Merci de choisir parmi les suivantes :'; -$_MODULE['<{bankwire}prestashop>payment_execution_2c1ce705702e11fd5e2188c2353c0c86'] = 'Nous acceptons la devise suivante pour votre paiement :'; -$_MODULE['<{bankwire}prestashop>payment_execution_3dd021316505c0204989f984246c6ff1'] = 'Nos coordonnées bancaires seront affichées sur la page suivante.'; -$_MODULE['<{bankwire}prestashop>payment_execution_0881a11f7af33bc1b43e437391129d66'] = 'Veuillez confirmer votre commande en cliquant sur \"Je confirme ma commande\"'; -$_MODULE['<{bankwire}prestashop>payment_execution_46b9e3665f187c739c55983f757ccda0'] = 'Je confirme ma commande'; -$_MODULE['<{bankwire}prestashop>payment_execution_569fd05bdafa1712c4f6be5b153b8418'] = 'Autres moyens de paiement'; -$_MODULE['<{bankwire}prestashop>payment_5e1695822fc5af98f6b749ea3cbc9b4c'] = 'Payer par virement bancaire'; -$_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Payer par virement bancaire (traitement plus long)'; -$_MODULE['<{bankwire}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Votre commande sur %s a bien été enregistrée.'; $_MODULE['<{bankwire}prestashop>payment_return_1552c5916ccfe019f35d91fd8955755e'] = 'Veuillez nous envoyer un virement bancaire avec :'; -$_MODULE['<{bankwire}prestashop>payment_return_a35abd2d31d9e1da82599bc67e166506'] = 'un montant de'; -$_MODULE['<{bankwire}prestashop>payment_return_c51326a2ac458845d579a82a92f111f0'] = 'à l\'ordre de'; +$_MODULE['<{bankwire}prestashop>bankwire_fcec4d73cccd149a2d18695fd8785f88'] = 'Ce module vous permet d\'accepter les paiements par virement bancaire.'; +$_MODULE['<{bankwire}prestashop>bankwire_3ec365dd533ddb7ef3d1c111186ce872'] = 'Détails'; +$_MODULE['<{bankwire}prestashop>bankwire_6b154cafbab54ba3a1e76a78c290c02a'] = 'Comme le code banque, l\'IBAN ou encore le BIC'; +$_MODULE['<{bankwire}prestashop>payment_5e1695822fc5af98f6b749ea3cbc9b4c'] = 'Payer par virement bancaire'; +$_MODULE['<{bankwire}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Votre commande sur %s a bien été enregistrée.'; $_MODULE['<{bankwire}prestashop>payment_return_de6d813f05e3916a86b89bd8b1a8a489'] = 'suivant ces détails'; $_MODULE['<{bankwire}prestashop>payment_return_619b26a60df1af3649d2e8920a7949cd'] = 'à cette banque'; $_MODULE['<{bankwire}prestashop>payment_return_63fb3f7c94ee5d8027bf599885de279d'] = 'N\'oubliez pas d\'indiquer votre numéro de commande n°%d dans le sujet de votre virement.'; $_MODULE['<{bankwire}prestashop>payment_return_1faa25b80a8d31e5ef25a78d3336606d'] = 'N\'oubliez pas d\'indiquer votre référence de commande %s dans le sujet de votre virement.'; -$_MODULE['<{bankwire}prestashop>payment_return_13f4ac6dc75b5829499cb9cf8b733071'] = 'Un e-mail contenant ces informations vous a été envoyé.'; -$_MODULE['<{bankwire}prestashop>payment_return_c4457a9f2f20e39386008bbb2cd3a78f'] = 'Votre commande sera expédiée dès réception de votre virement.'; $_MODULE['<{bankwire}prestashop>payment_return_0db71da7150c27142eef9d22b843b4a9'] = 'Pour toute question ou information complémentaire, veuillez contacter notre'; -$_MODULE['<{bankwire}prestashop>payment_return_64430ad2835be8ad60c59e7d44e4b0b1'] = 'support client'; +$_MODULE['<{bankwire}prestashop>bankwire_c888438d14855d7d96a2724ee9c306bd'] = 'Mise à jour réussie'; +$_MODULE['<{bankwire}prestashop>validation_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Cette méthode de paiement n\'est pas disponible.'; +$_MODULE['<{bankwire}prestashop>payment_execution_2c1ce705702e11fd5e2188c2353c0c86'] = 'Nous acceptons la devise suivante pour votre paiement :'; +$_MODULE['<{bankwire}prestashop>payment_execution_46b9e3665f187c739c55983f757ccda0'] = 'Je confirme ma commande'; +$_MODULE['<{bankwire}prestashop>payment_execution_569fd05bdafa1712c4f6be5b153b8418'] = 'Autres moyens de paiement'; $_MODULE['<{bankwire}prestashop>payment_return_8de637e24570c1edb0357826a2ad5aea'] = 'Nous avons rencontré un problème avec votre commande. Merci de prendre contact avec notre support client'; diff --git a/modules/bankwire/translations/index.php b/modules/bankwire/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/bankwire/translations/index.php +++ b/modules/bankwire/translations/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 13573 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/bankwire/translations/it.php b/modules/bankwire/translations/it.php index d32f1c23a..8794cbae1 100644 --- a/modules/bankwire/translations/it.php +++ b/modules/bankwire/translations/it.php @@ -2,52 +2,53 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{bankwire}prestashop>bankwire_85ee0d0492a4e37e6c183520f5d59c40'] = 'Bonifico Bancario'; + +$_MODULE['<{bankwire}prestashop>bankwire_17e6954ea60d238857324fea1f10b8f3'] = 'Specifica i dati del bonifico bancario per i clienti'; +$_MODULE['<{bankwire}prestashop>bankwire_857216dd1b374de9bf54068fcd78a8f3'] = 'Intestatario del conto'; +$_MODULE['<{bankwire}prestashop>bankwire_f9a1a1bb716cbae0503d351ea2af4b34'] = 'Indirizzo della banca'; +$_MODULE['<{bankwire}prestashop>payment_execution_c5e8668ba5e211603955f0b5e913d83d'] = 'Pagamento bonifico bancario'; +$_MODULE['<{bankwire}prestashop>payment_execution_f1d3b424cd68795ecaa552883759aceb'] = 'Sintesi dell\'ordine'; +$_MODULE['<{bankwire}prestashop>payment_execution_e40a43534d7f4ece69347847d75401e0'] = 'bonifico bancario'; +$_MODULE['<{bankwire}prestashop>payment_execution_3dd021316505c0204989f984246c6ff1'] = 'Le informazioni sul conto corrente saranno visualizzate nella pagina successiva.'; +$_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Paga con bonifico bancario (l\'elaborazione dell\'ordine sarà più lunga)'; +$_MODULE['<{bankwire}prestashop>payment_return_a35abd2d31d9e1da82599bc67e166506'] = 'un importo di'; +$_MODULE['<{bankwire}prestashop>payment_return_c51326a2ac458845d579a82a92f111f0'] = 'al proprietario del conto'; +$_MODULE['<{bankwire}prestashop>payment_return_13f4ac6dc75b5829499cb9cf8b733071'] = 'Ti è stata inviata una e-mail con queste informazioni.'; +$_MODULE['<{bankwire}prestashop>payment_return_64430ad2835be8ad60c59e7d44e4b0b1'] = 'assistenza clienti'; $_MODULE['<{bankwire}prestashop>bankwire_f652b92eefd4ecfe61ef5fb118157a05'] = 'Accetto pagamenti tramite bonifico bancario'; $_MODULE['<{bankwire}prestashop>bankwire_69a1a3ad8dd5da6db3c4da838a0cf9c7'] = 'Sei sicuro di voler cancellare i tuoi dati?'; $_MODULE['<{bankwire}prestashop>bankwire_f05d09f37c9a02f0737c1e71142028a9'] = 'Il proprietario dell\'account e i dati devono essere configurati per usare questo modulo correttamente'; $_MODULE['<{bankwire}prestashop>bankwire_4402acab1c8f90dcf4a31dc96833bd86'] = 'Nessuna valuta impostata per questo modulo'; $_MODULE['<{bankwire}prestashop>bankwire_bfa43217dfe8261ee7cb040339085677'] = 'i dati dell\'account sono obbligatori.'; $_MODULE['<{bankwire}prestashop>bankwire_ccab155f173ac76f79eb192703f86b18'] = 'Il proprietario dell\'account è obbligatorio.'; -$_MODULE['<{bankwire}prestashop>bankwire_c888438d14855d7d96a2724ee9c306bd'] = 'Impostazioni aggiornate'; -$_MODULE['<{bankwire}prestashop>bankwire_fcec4d73cccd149a2d18695fd8785f88'] = 'Questo modulo ti permette di accettare pagamenti tramite bonifico bancario.'; $_MODULE['<{bankwire}prestashop>bankwire_b6af2d31afe71aedcceca73cc27fec29'] = 'Se il cliente sceglie questa modalità di pagamento, l\'ordine cambierà il proprio status in \'attesa di pagamento\'.'; $_MODULE['<{bankwire}prestashop>bankwire_0daeb8f6c1874ec9442e821b524d37c1'] = 'Pertanto, dovrai confermare l\'ordine non appena ricevi il bonifico'; $_MODULE['<{bankwire}prestashop>bankwire_5dd532f0a63d89c5af0243b74732f63c'] = 'Dati di contatto'; -$_MODULE['<{bankwire}prestashop>bankwire_17e6954ea60d238857324fea1f10b8f3'] = 'Specifica i dati del bonifico bancario per i clienti'; -$_MODULE['<{bankwire}prestashop>bankwire_857216dd1b374de9bf54068fcd78a8f3'] = 'Intestatario del conto'; -$_MODULE['<{bankwire}prestashop>bankwire_3ec365dd533ddb7ef3d1c111186ce872'] = 'Dati'; -$_MODULE['<{bankwire}prestashop>bankwire_6b154cafbab54ba3a1e76a78c290c02a'] = 'Come filiale della banca, codice IBAN, BIC, ecc'; -$_MODULE['<{bankwire}prestashop>bankwire_f9a1a1bb716cbae0503d351ea2af4b34'] = 'Indirizzo della banca'; $_MODULE['<{bankwire}prestashop>bankwire_b17f3f4dcf653a5776792498a9b44d6a'] = 'Aggiornare le impostazioni'; -$_MODULE['<{bankwire}prestashop>validation_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Questo metodo di pagamento non è disponibile.'; -$_MODULE['<{bankwire}prestashop>payment_execution_c5e8668ba5e211603955f0b5e913d83d'] = 'Pagamento bonifico bancario'; -$_MODULE['<{bankwire}prestashop>payment_execution_f1d3b424cd68795ecaa552883759aceb'] = 'Sintesi dell\'ordine'; $_MODULE['<{bankwire}prestashop>payment_execution_879f6b8877752685a966564d072f498f'] = 'Il carrello è vuoto.'; -$_MODULE['<{bankwire}prestashop>payment_execution_e40a43534d7f4ece69347847d75401e0'] = 'bonifico bancario'; $_MODULE['<{bankwire}prestashop>payment_execution_afda466128ee0594745d9f8152699b74'] = 'Hai scelto di pagare con bonifico bancario.'; $_MODULE['<{bankwire}prestashop>payment_execution_c884ed19483d45970c5bf23a681e2dd2'] = 'Ecco un breve riepilogo del tuo ordine:'; $_MODULE['<{bankwire}prestashop>payment_execution_e2867a925cba382f1436d1834bb52a1c'] = 'L\'importo totale del tuo ordine è'; +$_MODULE['<{bankwire}prestashop>payment_execution_a7a08622ee5c8019b57354b99b7693b2'] = 'Scegli una delle seguenti:'; +$_MODULE['<{bankwire}prestashop>payment_execution_0881a11f7af33bc1b43e437391129d66'] = 'Conferma l\'ordine cliccando su \'confermo il mio ordine\''; +$_MODULE['<{bankwire}prestashop>payment_return_c4457a9f2f20e39386008bbb2cd3a78f'] = 'Il tuo ordine verrà inviato non appena avremo ricevuto la tua transazione.'; +$_MODULE['<{bankwire}prestashop>bankwire_85ee0d0492a4e37e6c183520f5d59c40'] = 'Bonifico Bancario'; +$_MODULE['<{bankwire}prestashop>bankwire_fcec4d73cccd149a2d18695fd8785f88'] = 'Questo modulo ti permette di accettare pagamenti tramite bonifico bancario.'; +$_MODULE['<{bankwire}prestashop>bankwire_3ec365dd533ddb7ef3d1c111186ce872'] = 'Dati'; +$_MODULE['<{bankwire}prestashop>bankwire_6b154cafbab54ba3a1e76a78c290c02a'] = 'Come filiale della banca, codice IBAN, BIC, ecc'; $_MODULE['<{bankwire}prestashop>payment_execution_1f87346a16cf80c372065de3c54c86d9'] = '(tasse incl.)'; $_MODULE['<{bankwire}prestashop>payment_execution_e2c147f82d998eeeb147ae172a31a88e'] = 'Si accettano le valute diverse da inviare tramite bonifico bancario.'; -$_MODULE['<{bankwire}prestashop>payment_execution_a7a08622ee5c8019b57354b99b7693b2'] = 'Scegli una delle seguenti:'; -$_MODULE['<{bankwire}prestashop>payment_execution_2c1ce705702e11fd5e2188c2353c0c86'] = 'Accettiamo le seguente valute da inviare tramite bonifico bancario:'; -$_MODULE['<{bankwire}prestashop>payment_execution_3dd021316505c0204989f984246c6ff1'] = 'Le informazioni sul conto corrente saranno visualizzate nella pagina successiva.'; -$_MODULE['<{bankwire}prestashop>payment_execution_0881a11f7af33bc1b43e437391129d66'] = 'Conferma l\'ordine cliccando su \'confermo il mio ordine\''; -$_MODULE['<{bankwire}prestashop>payment_execution_46b9e3665f187c739c55983f757ccda0'] = 'Confermo il mio ordine'; -$_MODULE['<{bankwire}prestashop>payment_execution_569fd05bdafa1712c4f6be5b153b8418'] = 'Altri metodi di pagamento'; $_MODULE['<{bankwire}prestashop>payment_5e1695822fc5af98f6b749ea3cbc9b4c'] = 'Paga con bonifico bancario'; -$_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Paga con bonifico bancario (l\'elaborazione dell\'ordine sarà più lunga)'; $_MODULE['<{bankwire}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Il tuo ordine su %s è completo.'; $_MODULE['<{bankwire}prestashop>payment_return_1552c5916ccfe019f35d91fd8955755e'] = 'Inviaci un bonifico bancario con:'; -$_MODULE['<{bankwire}prestashop>payment_return_a35abd2d31d9e1da82599bc67e166506'] = 'un importo di'; -$_MODULE['<{bankwire}prestashop>payment_return_c51326a2ac458845d579a82a92f111f0'] = 'al proprietario del conto'; $_MODULE['<{bankwire}prestashop>payment_return_de6d813f05e3916a86b89bd8b1a8a489'] = 'con questi dati'; $_MODULE['<{bankwire}prestashop>payment_return_619b26a60df1af3649d2e8920a7949cd'] = 'a questa banca'; $_MODULE['<{bankwire}prestashop>payment_return_63fb3f7c94ee5d8027bf599885de279d'] = 'Non dimenticarti di inserire il tuo numero d\'ordine #%d nel campo oggetto del tuo bonifico.'; $_MODULE['<{bankwire}prestashop>payment_return_1faa25b80a8d31e5ef25a78d3336606d'] = 'Non dimenticarti di inserire la tua referenza d\'ordine %s nel campo oggetto del tuo bonifico.'; -$_MODULE['<{bankwire}prestashop>payment_return_13f4ac6dc75b5829499cb9cf8b733071'] = 'Ti è stata inviata una e-mail con queste informazioni.'; -$_MODULE['<{bankwire}prestashop>payment_return_c4457a9f2f20e39386008bbb2cd3a78f'] = 'Il tuo ordine verrà inviato non appena avremo ricevuto la tua transazione.'; $_MODULE['<{bankwire}prestashop>payment_return_0db71da7150c27142eef9d22b843b4a9'] = 'Per eventuali domande o per ulteriori informazioni, contatta la nostra'; -$_MODULE['<{bankwire}prestashop>payment_return_64430ad2835be8ad60c59e7d44e4b0b1'] = 'assistenza clienti'; +$_MODULE['<{bankwire}prestashop>bankwire_c888438d14855d7d96a2724ee9c306bd'] = 'Impostazioni aggiornate'; +$_MODULE['<{bankwire}prestashop>validation_e2b7dec8fa4b498156dfee6e4c84b156'] = 'Questo metodo di pagamento non è disponibile.'; +$_MODULE['<{bankwire}prestashop>payment_execution_2c1ce705702e11fd5e2188c2353c0c86'] = 'Accettiamo le seguente valute da inviare tramite bonifico bancario:'; +$_MODULE['<{bankwire}prestashop>payment_execution_569fd05bdafa1712c4f6be5b153b8418'] = 'Altri metodi di pagamento'; $_MODULE['<{bankwire}prestashop>payment_return_8de637e24570c1edb0357826a2ad5aea'] = 'Abbiamo notato un problema con il tuo ordine. Se pensi che sia un errore, puoi contattare il nostro'; +$_MODULE['<{bankwire}prestashop>payment_execution_46b9e3665f187c739c55983f757ccda0'] = 'Confermo il mio ordine'; diff --git a/modules/bankwire/validation.php b/modules/bankwire/validation.php index bc72bf88c..a090b94a3 100644 --- a/modules/bankwire/validation.php +++ b/modules/bankwire/validation.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7483 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/bankwire/views/index.php b/modules/bankwire/views/index.php index 0aebcd154..f642dd55e 100644 --- a/modules/bankwire/views/index.php +++ b/modules/bankwire/views/index.php @@ -19,8 +19,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ +* @copyright 2007-2012 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/bankwire/views/templates/front/index.php b/modules/bankwire/views/templates/front/index.php index 914a8069c..3ee2b6d56 100644 --- a/modules/bankwire/views/templates/front/index.php +++ b/modules/bankwire/views/templates/front/index.php @@ -19,8 +19,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ +* @copyright 2007-2012 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/bankwire/views/templates/front/payment_execution.tpl b/modules/bankwire/views/templates/front/payment_execution.tpl index 707d06d8f..512ead4a5 100644 --- a/modules/bankwire/views/templates/front/payment_execution.tpl +++ b/modules/bankwire/views/templates/front/payment_execution.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7465 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/bankwire/views/templates/hook/index.php b/modules/bankwire/views/templates/hook/index.php index 914a8069c..3ee2b6d56 100644 --- a/modules/bankwire/views/templates/hook/index.php +++ b/modules/bankwire/views/templates/hook/index.php @@ -19,8 +19,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ +* @copyright 2007-2012 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/bankwire/views/templates/hook/payment.tpl b/modules/bankwire/views/templates/hook/payment.tpl index c578c0a2a..4a612a70d 100644 --- a/modules/bankwire/views/templates/hook/payment.tpl +++ b/modules/bankwire/views/templates/hook/payment.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/bankwire/views/templates/hook/payment_return.tpl b/modules/bankwire/views/templates/hook/payment_return.tpl index 4695d29b8..1d5f376d7 100644 --- a/modules/bankwire/views/templates/hook/payment_return.tpl +++ b/modules/bankwire/views/templates/hook/payment_return.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7471 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/bankwire/views/templates/index.php b/modules/bankwire/views/templates/index.php index 298435bc6..b37b3d3c4 100644 --- a/modules/bankwire/views/templates/index.php +++ b/modules/bankwire/views/templates/index.php @@ -19,8 +19,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ +* @copyright 2007-2012 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/blockadvertising/blockadvertising.php b/modules/blockadvertising/blockadvertising.php index 180e9454c..16c3ff1f4 100644 --- a/modules/blockadvertising/blockadvertising.php +++ b/modules/blockadvertising/blockadvertising.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7040 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/blockadvertising/blockadvertising.tpl b/modules/blockadvertising/blockadvertising.tpl index f2d9c1c74..45f945034 100644 --- a/modules/blockadvertising/blockadvertising.tpl +++ b/modules/blockadvertising/blockadvertising.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7040 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blockadvertising/index.php b/modules/blockadvertising/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockadvertising/index.php +++ b/modules/blockadvertising/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/modules/blockadvertising/translations/de.php b/modules/blockadvertising/translations/de.php index 061caed5f..bee531d7b 100644 --- a/modules/blockadvertising/translations/de.php +++ b/modules/blockadvertising/translations/de.php @@ -2,15 +2,16 @@ global $_MODULE; $_MODULE = array(); + +$_MODULE['<{blockadvertising}prestashop>blockadvertising_6e7be6d836003f069c00cd217660913b'] = 'Werbeblock-Konfiguration'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_83b5a65e518c21ed0a5f2b383dd9b617'] = 'Bild löschen'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_936823d20c5582b055bccdc6fd03b9d1'] = 'Bild wird mit 155x163 gezeigt'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_b78a3223503896721cca1303f776159b'] = 'Titel'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_226ed577d0eff50725be6447bcd5a2f0'] = 'Fehler bewegt hochgeladene Datei'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_a21056e22c4d62b400b5dd96dafe22a3'] = 'Sie können das Standardbild nicht entfernen (sondern Sie können es ändern)'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_ad3d06d03d94223fa652babc913de686'] = 'Bestätigen'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_fd4c71c948857cce596a69fbaea7426b'] = 'Werbeblock'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_a7339a98fd0ebea5ed982f92eed11c70'] = 'Fügt einen block für Werbeanzeigen hinzu'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_226ed577d0eff50725be6447bcd5a2f0'] = 'Fehler bewegt hochgeladene Datei'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_6e7be6d836003f069c00cd217660913b'] = 'Werbeblock-Konfiguration'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_a21056e22c4d62b400b5dd96dafe22a3'] = 'Sie können das Standardbild nicht entfernen (sondern Sie können es ändern)'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_83b5a65e518c21ed0a5f2b383dd9b617'] = 'Bild löschen'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_706bebc78ad992a07e4c1ce0f39def81'] = 'kein Bild'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_8c38cf08a0d0a01bd44c682479432350'] = 'Bild ändern'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_936823d20c5582b055bccdc6fd03b9d1'] = 'Bild wird mit 155x163 gezeigt'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_9ce38727cff004a058021a6c7351a74a'] = 'Bild-Link'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_b78a3223503896721cca1303f776159b'] = 'Titel'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_ad3d06d03d94223fa652babc913de686'] = 'Bestätigen'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_8c38cf08a0d0a01bd44c682479432350'] = 'Bild ändern'; diff --git a/modules/blockadvertising/translations/es.php b/modules/blockadvertising/translations/es.php index 79785dceb..882a74c3a 100644 --- a/modules/blockadvertising/translations/es.php +++ b/modules/blockadvertising/translations/es.php @@ -2,15 +2,16 @@ global $_MODULE; $_MODULE = array(); + +$_MODULE['<{blockadvertising}prestashop>blockadvertising_6e7be6d836003f069c00cd217660913b'] = 'Configuración del bloque de publicidad'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_83b5a65e518c21ed0a5f2b383dd9b617'] = 'Eliminar la imagen'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_936823d20c5582b055bccdc6fd03b9d1'] = 'La imagen se mostrará como 155x163.'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_b78a3223503896721cca1303f776159b'] = 'Título'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_226ed577d0eff50725be6447bcd5a2f0'] = 'error al desplazar el fichero uploado'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_a21056e22c4d62b400b5dd96dafe22a3'] = 'No puede suprimir la imagen por defecto (pero puede cambiarla abajo) '; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_ad3d06d03d94223fa652babc913de686'] = 'Validar'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_fd4c71c948857cce596a69fbaea7426b'] = 'Bloque de publicidad'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_a7339a98fd0ebea5ed982f92eed11c70'] = 'Añadir un bloque para mostrar la publicidad'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_226ed577d0eff50725be6447bcd5a2f0'] = 'error al desplazar el fichero uploado'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_6e7be6d836003f069c00cd217660913b'] = 'Configuración del bloque de publicidad'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_a21056e22c4d62b400b5dd96dafe22a3'] = 'No puede suprimir la imagen por defecto (pero puede cambiarla abajo) '; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_83b5a65e518c21ed0a5f2b383dd9b617'] = 'Eliminar la imagen'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_706bebc78ad992a07e4c1ce0f39def81'] = 'Ninguna imagen'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_8c38cf08a0d0a01bd44c682479432350'] = 'Cambiar de imagen:'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_936823d20c5582b055bccdc6fd03b9d1'] = 'La imagen se mostrará como 155x163.'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_9ce38727cff004a058021a6c7351a74a'] = 'Enlace de la imagen'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_b78a3223503896721cca1303f776159b'] = 'Título'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_ad3d06d03d94223fa652babc913de686'] = 'Validar'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_8c38cf08a0d0a01bd44c682479432350'] = 'Cambiar de imagen:'; diff --git a/modules/blockadvertising/translations/fr.php b/modules/blockadvertising/translations/fr.php index 3d6be4460..b17cb7e29 100644 --- a/modules/blockadvertising/translations/fr.php +++ b/modules/blockadvertising/translations/fr.php @@ -2,15 +2,16 @@ global $_MODULE; $_MODULE = array(); + +$_MODULE['<{blockadvertising}prestashop>blockadvertising_83b5a65e518c21ed0a5f2b383dd9b617'] = 'Supprimer l\'image'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_6e7be6d836003f069c00cd217660913b'] = 'Configuration du bloc de publicité'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_936823d20c5582b055bccdc6fd03b9d1'] = 'L\'image sera affichée en 155x163.'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_b78a3223503896721cca1303f776159b'] = 'Titre'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_226ed577d0eff50725be6447bcd5a2f0'] = 'Erreur de déplacement du fichier mis en ligne'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_a21056e22c4d62b400b5dd96dafe22a3'] = 'Vous ne pouvez pas supprimer l\'image par défaut (Mais vous pouvez la modifier ci-dessous)'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_ad3d06d03d94223fa652babc913de686'] = 'Valider'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_fd4c71c948857cce596a69fbaea7426b'] = 'Bloc publicité'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_a7339a98fd0ebea5ed982f92eed11c70'] = 'Ajoute un bloc affichant une publicité'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_226ed577d0eff50725be6447bcd5a2f0'] = 'Erreur de déplacement du fichier mis en ligne'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_6e7be6d836003f069c00cd217660913b'] = 'Configuration du bloc de publicité'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_a21056e22c4d62b400b5dd96dafe22a3'] = 'Vous ne pouvez pas supprimer l\'image par défaut (Mais vous pouvez la modifier ci-dessous)'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_83b5a65e518c21ed0a5f2b383dd9b617'] = 'Supprimer l\'image'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_706bebc78ad992a07e4c1ce0f39def81'] = 'pas d\'image'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_8c38cf08a0d0a01bd44c682479432350'] = 'Changer l\'image'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_936823d20c5582b055bccdc6fd03b9d1'] = 'L\'image sera affichée en 155x163.'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_9ce38727cff004a058021a6c7351a74a'] = 'Lien de l\'image'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_b78a3223503896721cca1303f776159b'] = 'Titre'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_ad3d06d03d94223fa652babc913de686'] = 'Valider'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_8c38cf08a0d0a01bd44c682479432350'] = 'Changer l\'image'; diff --git a/modules/blockadvertising/translations/index.php b/modules/blockadvertising/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockadvertising/translations/index.php +++ b/modules/blockadvertising/translations/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 13573 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/blockadvertising/translations/it.php b/modules/blockadvertising/translations/it.php index 7e36f1d02..1e836b955 100644 --- a/modules/blockadvertising/translations/it.php +++ b/modules/blockadvertising/translations/it.php @@ -2,15 +2,16 @@ global $_MODULE; $_MODULE = array(); + +$_MODULE['<{blockadvertising}prestashop>blockadvertising_6e7be6d836003f069c00cd217660913b'] = 'Pubblicità blocco di configurazione'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_83b5a65e518c21ed0a5f2b383dd9b617'] = 'elimina l\'immagine'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_936823d20c5582b055bccdc6fd03b9d1'] = 'Immagine verrà visualizzata come 155x163.'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_b78a3223503896721cca1303f776159b'] = 'Titolo'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_226ed577d0eff50725be6447bcd5a2f0'] = 'Errore sposta il file caricato'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_a21056e22c4d62b400b5dd96dafe22a3'] = 'Non puoi cancellare l\'immagine predefinita (ma puoi cambiarla sotto).'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_ad3d06d03d94223fa652babc913de686'] = 'Convalidare'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_fd4c71c948857cce596a69fbaea7426b'] = 'Blocco pubblicità'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_a7339a98fd0ebea5ed982f92eed11c70'] = 'Aggiunge un blocco per visualizzare un messaggio pubblicitario'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_226ed577d0eff50725be6447bcd5a2f0'] = 'Errore sposta il file caricato'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_6e7be6d836003f069c00cd217660913b'] = 'Pubblicità blocco di configurazione'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_a21056e22c4d62b400b5dd96dafe22a3'] = 'Non puoi cancellare l\'immagine predefinita (ma puoi cambiarla sotto).'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_83b5a65e518c21ed0a5f2b383dd9b617'] = 'elimina l\'immagine'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_706bebc78ad992a07e4c1ce0f39def81'] = 'nessuna immagine'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_8c38cf08a0d0a01bd44c682479432350'] = 'Cambia immagine'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_936823d20c5582b055bccdc6fd03b9d1'] = 'Immagine verrà visualizzata come 155x163.'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_9ce38727cff004a058021a6c7351a74a'] = 'Immagine Link'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_b78a3223503896721cca1303f776159b'] = 'Titolo'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_ad3d06d03d94223fa652babc913de686'] = 'Convalidare'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_8c38cf08a0d0a01bd44c682479432350'] = 'Cambia immagine'; diff --git a/modules/blockbestsellers/blockbestsellers-home.tpl b/modules/blockbestsellers/blockbestsellers-home.tpl index a09fda924..993016294 100644 --- a/modules/blockbestsellers/blockbestsellers-home.tpl +++ b/modules/blockbestsellers/blockbestsellers-home.tpl @@ -19,14 +19,13 @@ * * @author 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 *}
          -

          {l s='Top sellers' mod='blockbestsellers'}

          +

          {l s='Top sellers' mod='blockbestsellers'}

          {if isset($best_sellers) AND $best_sellers}
          {assign var='liHeight' value=320} @@ -37,7 +36,7 @@
            {foreach from=$best_sellers item=product name=myLoop}
          • -
            {$product.name|truncate:27:'...'|escape:'htmlall':'UTF-8'}
            +

            {$product.name|truncate:27:'...'|escape:'htmlall':'UTF-8'}

            {$product.description_short|strip_tags|truncate:130:'...'}
            {$product.name|escape:html:'UTF-8'}
            diff --git a/modules/blockbestsellers/blockbestsellers.php b/modules/blockbestsellers/blockbestsellers.php index a99f1ccc5..e41a43da3 100644 --- a/modules/blockbestsellers/blockbestsellers.php +++ b/modules/blockbestsellers/blockbestsellers.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7040 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -100,6 +99,12 @@ class BlockBestSellers extends Module return; $currency = new Currency($params['cookie']->id_currency); + + if (Product::getTaxCalculationMethod((int)$this->context->customer->id) == PS_TAX_EXC) + $usetax = false; + else + $usetax = true; + $bestsellers = ProductSale::getBestSalesLight((int)($params['cookie']->id_lang), 0, 5); if (!$bestsellers && !Configuration::get('PS_BLOCK_BESTSELLERS_DISPLAY')) @@ -109,18 +114,18 @@ class BlockBestSellers extends Module if ($bestsellers) foreach ($bestsellers as $bestseller) { - $bestseller['price'] = Tools::displayPrice(Product::getPriceStatic((int)($bestseller['id_product'])), $currency); + $bestseller['price'] = Tools::displayPrice(Product::getPriceStatic((int)($bestseller['id_product']), $usetax), $currency); $best_sellers[] = $bestseller; } $this->smarty->assign(array( 'best_sellers' => $best_sellers, - 'mediumSize' => Image::getSize('medium_default'), - 'smallSize' => Image::getSize('small_default') + 'mediumSize' => Image::getSize(ImageType::getFormatedName('medium')), + 'smallSize' => Image::getSize(ImageType::getFormatedName('small')) )); return $this->display(__FILE__, 'blockbestsellers.tpl'); } - + public function hookLeftColumn($params) { return $this->hookRightColumn($params); @@ -153,9 +158,7 @@ class BlockBestSellers extends Module $this->smarty->assign(array( 'best_sellers' => $best_sellers, - 'homeSize' => Image::getSize('home_default'))); + 'homeSize' => Image::getSize(ImageType::getFormatedName('home')))); return $this->display(__FILE__, 'blockbestsellers-home.tpl'); } -} - - +} \ No newline at end of file diff --git a/modules/blockbestsellers/blockbestsellers.tpl b/modules/blockbestsellers/blockbestsellers.tpl index c5c5cd942..4446cc7a3 100644 --- a/modules/blockbestsellers/blockbestsellers.tpl +++ b/modules/blockbestsellers/blockbestsellers.tpl @@ -18,15 +18,14 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7077 $ +* @copyright 2007-2012 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *}
            -

            {l s='Top sellers' mod='blockbestsellers'}

            +

            {l s='Top sellers' mod='blockbestsellers'}

            {if $best_sellers|@count > 0}
              diff --git a/modules/blockbestsellers/img/index.php b/modules/blockbestsellers/img/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockbestsellers/img/index.php +++ b/modules/blockbestsellers/img/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/modules/blockbestsellers/index.php b/modules/blockbestsellers/index.php index 565db58b0..dac3eca51 100644 --- a/modules/blockbestsellers/index.php +++ b/modules/blockbestsellers/index.php @@ -20,7 +20,6 @@ * * @author 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 */ diff --git a/modules/blockbestsellers/translations/de.php b/modules/blockbestsellers/translations/de.php index 9469e6623..9c6b11263 100644 --- a/modules/blockbestsellers/translations/de.php +++ b/modules/blockbestsellers/translations/de.php @@ -2,20 +2,21 @@ global $_MODULE; $_MODULE = array(); + $_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_3cb29f0ccc5fd220a97df89dafe46290'] = 'Verkaufshits'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Mehr'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_4351cfebe4b61d8aa5efa1d020710005'] = 'Anzeigen'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_eae99cd6a931f3553123420b16383812'] = 'Alle Verkaufshits'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_f7be84d6809317a6eb0ff3823a936800'] = 'Momentan keine Verkaufshits'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_6232eaff79c9ccb6c1a66e5a75a212d5'] = 'Block Verkaufshits'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_95d17a0a1b5ea2de13a3565ed400ebbb'] = 'Block mit Verkaufshits des Shops hinzufügen'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_c888438d14855d7d96a2724ee9c306bd'] = 'Einstellungen aktualisiert'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f4f70727dc34561dfde1a3c529b6205c'] = 'Einstellungen'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_530c88f8210e022b39128e3f0409bbcf'] = 'Block immer anzeigen'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Aktiviert'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_b9f5c797ebbf55adccdd8539a65a0241'] = 'Deaktiviert'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_3cb29f0ccc5fd220a97df89dafe46290'] = 'Verkaufshits'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f7be84d6809317a6eb0ff3823a936800'] = 'Momentan keine Verkaufshits'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Mehr'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_eae99cd6a931f3553123420b16383812'] = 'Alle Verkaufshits'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_a8a670d89a6d2f3fa59942fc591011ef'] = 'Block anzeigen, auch wenn kein Produkt verfügbar ist.'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_c9cc8cce247e49bae79f15173ce97354'] = 'Speichern'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_3cb29f0ccc5fd220a97df89dafe46290'] = 'Verkaufshits'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_eae99cd6a931f3553123420b16383812'] = 'Alle Verkaufshits'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f7be84d6809317a6eb0ff3823a936800'] = 'Momentan keine Verkaufshits'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_f7be84d6809317a6eb0ff3823a936800'] = 'Momentan keine Verkaufshits'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_6232eaff79c9ccb6c1a66e5a75a212d5'] = 'Block Verkaufshits'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_c888438d14855d7d96a2724ee9c306bd'] = 'Einstellungen aktualisiert'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Aktiviert'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_4351cfebe4b61d8aa5efa1d020710005'] = 'Anzeigen'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f4f70727dc34561dfde1a3c529b6205c'] = 'Einstellungen'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_530c88f8210e022b39128e3f0409bbcf'] = 'Block immer anzeigen'; diff --git a/modules/blockbestsellers/translations/es.php b/modules/blockbestsellers/translations/es.php index 5c9b1582c..64deb3d2d 100644 --- a/modules/blockbestsellers/translations/es.php +++ b/modules/blockbestsellers/translations/es.php @@ -2,20 +2,21 @@ global $_MODULE; $_MODULE = array(); + $_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_3cb29f0ccc5fd220a97df89dafe46290'] = 'Mejores ventas'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Más'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_4351cfebe4b61d8aa5efa1d020710005'] = 'Vista'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_eae99cd6a931f3553123420b16383812'] = 'Los productos más vendidos'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_f7be84d6809317a6eb0ff3823a936800'] = 'No hay productos más vendidos en este momento'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_6232eaff79c9ccb6c1a66e5a75a212d5'] = 'Bloque de mejores ventas'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_95d17a0a1b5ea2de13a3565ed400ebbb'] = 'Añadir un bloque para mostrar las mejores ventas de la tienda'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_c888438d14855d7d96a2724ee9c306bd'] = 'Actualización realizada con éxito'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f4f70727dc34561dfde1a3c529b6205c'] = 'Configuración'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_530c88f8210e022b39128e3f0409bbcf'] = 'Mostrar este bloque siempre'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activado'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_b9f5c797ebbf55adccdd8539a65a0241'] = 'Desactivado'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_3cb29f0ccc5fd220a97df89dafe46290'] = 'Mejores ventas'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f7be84d6809317a6eb0ff3823a936800'] = 'No hay productos más vendidos en este momento'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Más'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_eae99cd6a931f3553123420b16383812'] = 'Los productos más vendidos'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_a8a670d89a6d2f3fa59942fc591011ef'] = 'Mostrar este bloque aunque no haya productos disponibles'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_c9cc8cce247e49bae79f15173ce97354'] = 'Guardar'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_3cb29f0ccc5fd220a97df89dafe46290'] = 'Mejores ventas'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_eae99cd6a931f3553123420b16383812'] = 'Los productos más vendidos'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f7be84d6809317a6eb0ff3823a936800'] = 'No hay productos más vendidos en este momento'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_f7be84d6809317a6eb0ff3823a936800'] = 'No hay productos más vendidos en este momento'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_6232eaff79c9ccb6c1a66e5a75a212d5'] = 'Bloque de mejores ventas'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_c888438d14855d7d96a2724ee9c306bd'] = 'Actualización realizada con éxito'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activado'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_4351cfebe4b61d8aa5efa1d020710005'] = 'Vista'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f4f70727dc34561dfde1a3c529b6205c'] = 'Configuración'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_530c88f8210e022b39128e3f0409bbcf'] = 'Mostrar este bloque siempre'; diff --git a/modules/blockbestsellers/translations/fr.php b/modules/blockbestsellers/translations/fr.php index 9e75556a2..abb3c17d5 100644 --- a/modules/blockbestsellers/translations/fr.php +++ b/modules/blockbestsellers/translations/fr.php @@ -2,20 +2,21 @@ global $_MODULE; $_MODULE = array(); + $_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_3cb29f0ccc5fd220a97df89dafe46290'] = 'Meilleures ventes'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Plus d\'infos'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_4351cfebe4b61d8aa5efa1d020710005'] = 'Voir'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_eae99cd6a931f3553123420b16383812'] = 'Toutes les meilleures ventes'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_f7be84d6809317a6eb0ff3823a936800'] = 'Pas encore de meilleure vente'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_6232eaff79c9ccb6c1a66e5a75a212d5'] = 'Bloc meilleures ventes'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_95d17a0a1b5ea2de13a3565ed400ebbb'] = 'Ajoute un bloc qui affiche les meilleures ventes de la boutique'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_c888438d14855d7d96a2724ee9c306bd'] = 'Paramètres mis à jour'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f4f70727dc34561dfde1a3c529b6205c'] = 'Paramètres'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_530c88f8210e022b39128e3f0409bbcf'] = 'Toujours afficher ce bloc'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_b9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_3cb29f0ccc5fd220a97df89dafe46290'] = 'Meilleures ventes'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f7be84d6809317a6eb0ff3823a936800'] = 'Pas encore de meilleure vente'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Plus d\'infos'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_eae99cd6a931f3553123420b16383812'] = 'Toutes les meilleures ventes'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_a8a670d89a6d2f3fa59942fc591011ef'] = 'Afficher ce bloc même si aucun produit disponible'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_c9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_3cb29f0ccc5fd220a97df89dafe46290'] = 'Meilleures ventes'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_eae99cd6a931f3553123420b16383812'] = 'Toutes les meilleures ventes'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f7be84d6809317a6eb0ff3823a936800'] = 'Pas encore de meilleure vente'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_f7be84d6809317a6eb0ff3823a936800'] = 'Pas encore de meilleure vente'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_6232eaff79c9ccb6c1a66e5a75a212d5'] = 'Bloc meilleures ventes'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_c888438d14855d7d96a2724ee9c306bd'] = 'Paramètres mis à jour'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f4f70727dc34561dfde1a3c529b6205c'] = 'Paramètres'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_530c88f8210e022b39128e3f0409bbcf'] = 'Toujours afficher ce bloc'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_4351cfebe4b61d8aa5efa1d020710005'] = 'Voir'; diff --git a/modules/blockbestsellers/translations/index.php b/modules/blockbestsellers/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockbestsellers/translations/index.php +++ b/modules/blockbestsellers/translations/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 13573 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/blockbestsellers/translations/it.php b/modules/blockbestsellers/translations/it.php index 26c2e3be1..9c2bcd788 100644 --- a/modules/blockbestsellers/translations/it.php +++ b/modules/blockbestsellers/translations/it.php @@ -2,20 +2,21 @@ global $_MODULE; $_MODULE = array(); + $_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_3cb29f0ccc5fd220a97df89dafe46290'] = 'Migliori vendite'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Più'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_4351cfebe4b61d8aa5efa1d020710005'] = 'Visualizza'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_eae99cd6a931f3553123420b16383812'] = 'Tutte le migliori vendite'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_f7be84d6809317a6eb0ff3823a936800'] = 'Non ci sono migliori vendite in questo momento'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_6232eaff79c9ccb6c1a66e5a75a212d5'] = 'Blocco migliori vendite'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_95d17a0a1b5ea2de13a3565ed400ebbb'] = 'Aggiungi un blocco che mostra le migliori vendite del negozio'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_c888438d14855d7d96a2724ee9c306bd'] = 'Impostazioni aggiornate'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f4f70727dc34561dfde1a3c529b6205c'] = 'Impostazioni'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_530c88f8210e022b39128e3f0409bbcf'] = 'Visualizza sempre blocco'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Attivato'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_b9f5c797ebbf55adccdd8539a65a0241'] = 'Disattivato'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_3cb29f0ccc5fd220a97df89dafe46290'] = 'Migliori vendite'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f7be84d6809317a6eb0ff3823a936800'] = 'Non ci sono migliori vendite in questo momento'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Più'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_eae99cd6a931f3553123420b16383812'] = 'Tutte le migliori vendite'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_a8a670d89a6d2f3fa59942fc591011ef'] = 'Mostra il blocco anche se nessun prodotto è disponibile.'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_c9cc8cce247e49bae79f15173ce97354'] = 'Salva'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_3cb29f0ccc5fd220a97df89dafe46290'] = 'Migliori vendite'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_eae99cd6a931f3553123420b16383812'] = 'Tutte le migliori vendite'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f7be84d6809317a6eb0ff3823a936800'] = 'Non ci sono migliori vendite in questo momento'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_f7be84d6809317a6eb0ff3823a936800'] = 'Non ci sono migliori vendite in questo momento'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_6232eaff79c9ccb6c1a66e5a75a212d5'] = 'Blocco migliori vendite'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_c888438d14855d7d96a2724ee9c306bd'] = 'Impostazioni aggiornate'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Attivato'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_4351cfebe4b61d8aa5efa1d020710005'] = 'Visualizza'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f4f70727dc34561dfde1a3c529b6205c'] = 'Impostazioni'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_530c88f8210e022b39128e3f0409bbcf'] = 'Visualizza sempre blocco'; diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js index c37e999e1..a9f083301 100644 --- a/modules/blockcart/ajax-cart.js +++ b/modules/blockcart/ajax-cart.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7009 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -42,7 +41,7 @@ var ajaxCart = { return false; }); //for product page 'add' button... - $('body#product p#add_to_cart input').unbind('click').click(function(){ + $('#add_to_cart input').unbind('click').click(function(){ ajaxCart.add( $('#product_page_product_id').val(), $('#idCombination').val(), true, null, $('#quantity_wanted').val(), null); return false; }); @@ -95,18 +94,18 @@ var ajaxCart = { // try to expand the cart expand : function(){ - if ($('#cart_block #cart_block_list').hasClass('collapsed')) + if ($('#cart_block_list').hasClass('collapsed')) { - $('#header #cart_block #cart_block_summary').slideUp(200, function(){ + $('#cart_block_summary').slideUp(200, function(){ $(this).addClass('collapsed').removeClass('expanded'); - $('#header #cart_block #cart_block_list').slideDown({ + $('#cart_block_list').slideDown({ duration: 450, complete: function(){$(this).addClass('expanded').removeClass('collapsed');} }); }); // toogle the button expand/collapse button - $('#cart_block h4 span#block_cart_expand').fadeOut('slow', function(){ - $('#cart_block h4 span#block_cart_collapse').fadeIn('fast'); + $('#block_cart_expand').fadeOut('slow', function(){ + $('#block_cart_collapse').fadeIn('fast'); }); // save the expand statut in the user cookie @@ -139,16 +138,16 @@ var ajaxCart = { // try to collapse the cart collapse : function(){ - if ($('#cart_block #cart_block_list').hasClass('expanded')) + if ($('#cart_block_list').hasClass('expanded')) { - $('#header #cart_block #cart_block_list').slideUp('slow', function(){ + $('#cart_block_list').slideUp('slow', function(){ $(this).addClass('collapsed').removeClass('expanded'); - $('#header #cart_block #cart_block_summary').slideDown(450, function(){ + $('#cart_block_summary').slideDown(450, function(){ $(this).addClass('expanded').removeClass('collapsed'); }); }); - $('#cart_block h4 span#block_cart_collapse').fadeOut('slow', function(){ - $('#cart_block h4 span#block_cart_expand').fadeIn('fast'); + $('#block_cart_collapse').fadeOut('slow', function(){ + $('#block_cart_expand').fadeIn('fast'); }); // save the expand statut in the user cookie @@ -168,7 +167,7 @@ var ajaxCart = { //reactive the button when adding has finished if (addedFromProductPage) - $('body#product p#add_to_cart input').removeAttr('disabled').addClass('exclusive').removeClass('exclusive_disabled'); + $('#add_to_cart input').removeAttr('disabled').addClass('exclusive').removeClass('exclusive_disabled'); else $('.ajax_add_to_cart_button').removeAttr('disabled'); }, @@ -184,13 +183,13 @@ var ajaxCart = { //disabled the button when adding to do not double add if user double click if (addedFromProductPage) { - $('body#product p#add_to_cart input').attr('disabled', true).removeClass('exclusive').addClass('exclusive_disabled'); + $('#add_to_cart input').attr('disabled', true).removeClass('exclusive').addClass('exclusive_disabled'); $('.filled').removeClass('filled'); } else $(callerElement).attr('disabled', true); - if ($('#cart_block #cart_block_list').hasClass('collapsed')) + if ($('#cart_block_list').hasClass('collapsed')) this.expand(); //send the ajax request to the server $.ajax({ @@ -240,7 +239,7 @@ var ajaxCart = { alert("Impossible to add the product to the cart.\n\ntextStatus: '" + textStatus + "'\nerrorThrown: '" + errorThrown + "'\nresponseText:\n" + XMLHttpRequest.responseText); //reactive the button when adding has finished if (addedFromProductPage) - $('body#product p#add_to_cart input').removeAttr('disabled').addClass('exclusive').removeClass('exclusive_disabled'); + $('#add_to_cart input').removeAttr('disabled').addClass('exclusive').removeClass('exclusive_disabled'); else $(callerElement).removeAttr('disabled'); } @@ -269,7 +268,7 @@ var ajaxCart = { //hide the products displayed in the page but no more in the json data hideOldProducts : function(jsonData) { //delete an eventually removed product of the displayed cart (only if cart is not empty!) - if ($('#cart_block #cart_block_list dl.products').length > 0) + if ($('#cart_block_list dl.products').length > 0) { var removedProductId = null; var removedProductData = null; @@ -309,13 +308,13 @@ var ajaxCart = { // If the cart is now empty, show the 'no product in the cart' message and close detail if($('#cart_block dl.products dt').length == 0) { - $("#header #cart_block").stop(true, true).slideUp(200); - $('p#cart_block_no_products:hidden').slideDown(450); - $('div#cart_block dl.products').remove(); + $("#cart_block").stop(true, true).slideUp(200); + $('#cart_block_no_products:hidden').slideDown(450); + $('#cart_block dl.products').remove(); } }); }); - $('dd#cart_block_combination_of_' + ids[0] + (ids[1] ? '_'+ids[1] : '') + (ids[2] ? '_'+ids[2] : '')).fadeTo('fast', 0, function(){ + $('#cart_block_combination_of_' + ids[0] + (ids[1] ? '_'+ids[1] : '') + (ids[2] ? '_'+ids[2] : '')).fadeTo('fast', 0, function(){ $(this).slideUp('fast', function(){ $(this).remove(); }); @@ -328,7 +327,7 @@ var ajaxCart = { hideOldProductCustomizations : function (product, domIdProduct) { - var customizationList = $('#cart_block #cart_block_list ul#customization_' + product['id'] + '_' + product['idCombination']); + var customizationList = $('#customization_' + product['id'] + '_' + product['idCombination']); if(customizationList.length > 0) { $(customizationList).find("li").each(function(){ @@ -400,7 +399,7 @@ var ajaxCart = { // Update product quantity updateProductQuantity : function (product, quantity) { - $('dt#cart_block_product_' + product.id + '_' + (product.idCombination ? product.idCombination : '0')+ '_' + (product.idAddressDelivery ? product.idAddressDelivery : '0') + ' .quantity').fadeTo('fast', 0, function() { + $('#cart_block_product_' + product.id + '_' + (product.idCombination ? product.idCombination : '0')+ '_' + (product.idAddressDelivery ? product.idAddressDelivery : '0') + ' .quantity').fadeTo('fast', 0, function() { $(this).text(quantity); $(this).fadeTo('fast', 1, function(){ $(this).fadeTo('fast', 0, function(){ @@ -424,16 +423,16 @@ var ajaxCart = { if (this.id != undefined) { //create a container for listing the products and hide the 'no product in the cart' message (only if the cart was empty) - if ($('div#cart_block dl.products').length == 0) + if ($('#cart_block dl.products').length == 0) { - $('p#cart_block_no_products').before('
              '); - $('p#cart_block_no_products').hide(); + $('#cart_block_no_products').before('
              '); + $('#cart_block_no_products').hide(); } //if product is not in the displayed cart, add a new product's line var domIdProduct = this.id + '_' + (this.idCombination ? this.idCombination : '0') + '_' + (this.idAddressDelivery ? this.idAddressDelivery : '0'); var domIdProductAttribute = this.id + '_' + (this.idCombination ? this.idCombination : '0'); - if ($('#cart_block dt#cart_block_product_'+ domIdProduct ).length == 0) + if ($('#cart_block_product_'+ domIdProduct ).length == 0) { var productId = parseInt(this.id); var productAttributeId = (this.hasAttributes ? parseInt(this.attributes) : 0); @@ -446,8 +445,8 @@ var ajaxCart = { content += ' '; else content += ''; - - content += '' + (parseFloat(this.price_float) > 0 ? this.priceByLine : freeProductTranslation) + ''; + if (typeof(freeShippingTranslation) != 'undefined') + content += '' + (parseFloat(this.price_float) > 0 ? this.priceByLine : freeProductTranslation) + ''; content += ''; if (this.hasAttributes) content += '