From 3e2de4986b2d92cd196f4da5f0b419ece8de85a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 20 Nov 2012 19:05:21 +0100 Subject: [PATCH 001/316] [-] FO: Fix: many fixes - domain for cookies with different url for ssl / add to cart button for minimal quantities with product attributes --- classes/Category.php | 2 +- classes/Cookie.php | 2 +- classes/Dispatcher.php | 12 +++++++- classes/Hook.php | 28 ++++++++++-------- classes/Link.php | 4 --- classes/Media.php | 2 +- classes/Product.php | 6 ++-- classes/Supplier.php | 2 +- config/config.inc.php | 9 +++++- controllers/front/CategoryController.php | 7 +++++ themes/default/pdf/index.php | 36 ++++++++++++++++++++++++ 11 files changed, 87 insertions(+), 23 deletions(-) create mode 100755 themes/default/pdf/index.php diff --git a/classes/Category.php b/classes/Category.php index b7238464f..9d95a7cd9 100644 --- a/classes/Category.php +++ b/classes/Category.php @@ -608,7 +608,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(), diff --git a/classes/Cookie.php b/classes/Cookie.php index 18f21c3fa..83e3b8bda 100644 --- a/classes/Cookie.php +++ b/classes/Cookie.php @@ -92,7 +92,7 @@ class CookieCore return false; if (!strstr(Tools::getHttpHost(false, false), '.')) return false; - + $domain = false; if ($shared_urls !== null) { diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php index 861bedab1..2d0c46d3f 100644 --- a/classes/Dispatcher.php +++ b/classes/Dispatcher.php @@ -385,6 +385,15 @@ class DispatcherCore { $context = Context::getContext(); + // 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)) + $this->addRoute($route, $route_details['rule'], $route_details['controller'], null, $route_details['keywords'], $route_details['params']); + // Set default routes foreach (Language::getLanguages() as $lang) foreach ($this->default_routes as $id => $route) @@ -579,7 +588,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 diff --git a/classes/Hook.php b/classes/Hook.php index d3b53d18a..538cf4cae 100644 --- a/classes/Hook.php +++ b/classes/Hook.php @@ -358,7 +358,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 +397,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 +419,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/Link.php b/classes/Link.php index 5eff92baa..f950f1950 100644 --- a/classes/Link.php +++ b/classes/Link.php @@ -322,10 +322,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 +410,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/Media.php b/classes/Media.php index 49e7f430c..db69d26a6 100755 --- a/classes/Media.php +++ b/classes/Media.php @@ -325,7 +325,7 @@ class MediaCore $ui_tmp[] = Media::getJqueryUIPath($dependency, $theme, false); if (self::$jquery_ui_dependencies[$dependency]['theme']) $dep_css = Media::getCSSPath($folder.'themes/'.$theme.'/jquery.'.$dependency.'.css'); - if (!empty($dep_css) || $dep_css) + if (isset($dep_css) && (!empty($dep_css) || $dep_css)) $ui_path['css'] = array_merge($ui_path['css'], $dep_css); } } diff --git a/classes/Product.php b/classes/Product.php index 1f8b02688..78a1e694f 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -3191,7 +3191,8 @@ class ProductCore extends ObjectModel { if (!array_key_exists($row['id_product'].'-'.$id_lang, self::$_frontFeaturesCache)) self::$_frontFeaturesCache[$row['id_product'].'-'.$id_lang] = array(); - self::$_frontFeaturesCache[$row['id_product'].'-'.$id_lang][] = $row; + if (!isset(self::$_frontFeaturesCache[$row['id_product'].'-'.$id_lang][$row['id_product']])) + self::$_frontFeaturesCache[$row['id_product'].'-'.$id_lang][$row['id_product']] = $row; } } @@ -3588,8 +3589,9 @@ class ProductCore extends ObjectModel $cache_key = $row['id_product'].'-'.$row['id_product_attribute'].'-'.$id_lang.'-'.(int)$usetax; if (isset($row['id_product_pack'])) $cache_key .= '-pack'.$row['id_product_pack']; + if (isset(self::$producPropertiesCache[$cache_key])) - return self::$producPropertiesCache[$cache_key]; + return array_merge($row, self::$producPropertiesCache[$cache_key]); // Datas $row['category'] = Category::getLinkRewrite((int)$row['id_category_default'], (int)$id_lang); diff --git a/classes/Supplier.php b/classes/Supplier.php index 2c52b935a..816573b25 100644 --- a/classes/Supplier.php +++ b/classes/Supplier.php @@ -240,7 +240,7 @@ class SupplierCore extends ObjectModel $order_by = pSQL($order_by[0]).'.`'.pSQL($order_by[1]).'`'; } $alias = ''; - if ($order_by == 'price') + if (in_array($order_by, array('price', 'date_add', 'date_upd'))) $alias = 'product_shop.'; elseif ($order_by == 'id_product') $alias = 'p.'; diff --git a/config/config.inc.php b/config/config.inc.php index 5e56da050..4ecdb0184 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -110,6 +110,7 @@ Context::getContext()->country = $defaultCountry; /* Instantiate cookie */ $cookieLifetime = (time() + (((int)Configuration::get('PS_COOKIE_LIFETIME_BO') > 0 ? (int)Configuration::get('PS_COOKIE_LIFETIME_BO') : 1)* 3600)); + if (defined('_PS_ADMIN_DIR_')) $cookie = new Cookie('psAdmin', '', $cookieLifetime); else @@ -117,7 +118,13 @@ else if (Context::getContext()->shop->getGroup()->share_order) $cookie = new Cookie('ps-sg'.Context::getContext()->shop->getGroup()->id, '', $cookieLifetime, Context::getContext()->shop->getUrlsSharedCart()); else - $cookie = new Cookie('ps-s'.Context::getContext()->shop->id, '', $cookieLifetime); + { + $domains = null; + if(Context::getContext()->shop->domain != Context::getContext()->shop->domain_ssl) + $domains = array(Context::getContext()->shop->domain_ssl, Context::getContext()->shop->domain); + + $cookie = new Cookie('ps-s'.Context::getContext()->shop->id, '', $cookieLifetime, $domains); + } } Context::getContext()->cookie = $cookie; diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php index e6b387d7b..366df5250 100644 --- a/controllers/front/CategoryController.php +++ b/controllers/front/CategoryController.php @@ -183,6 +183,13 @@ class CategoryControllerCore extends FrontController else // Pagination must be call after "getProducts" $this->pagination($this->nbProducts); + + foreach ($this->cat_products as &$product) + { + if ($product['id_product_attribute']) + $product['minimal_quantity'] = $product['product_attribute_minimal_quantity']; + } + $this->context->smarty->assign('nb_products', $this->nbProducts); } } diff --git a/themes/default/pdf/index.php b/themes/default/pdf/index.php new file mode 100755 index 000000000..60bc2ce27 --- /dev/null +++ b/themes/default/pdf/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2012 PrestaShop SA +* @version Release: $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: ../"); +exit; From 0900d3b669c3298688616c54d22653843dbf330c Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Wed, 21 Nov 2012 10:07:38 +0100 Subject: [PATCH 002/316] [-] MO : "delete" in the module list now uninstall the module before deleting the files --- controllers/admin/AdminModulesController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 131042610..5b24f649b 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -524,6 +524,8 @@ class AdminModulesControllerCore extends AdminController $this->errors[] = Tools::displayError('You do not have the permission to use this module'); else { + // Uninstall the module before deleting the files, but do not block the process if uninstall returns false + $module->uninstall(); $moduleDir = _PS_MODULE_DIR_.str_replace(array('.', '/', '\\'), array('', '', ''), Tools::getValue('module_name')); $this->recursiveDeleteOnDisk($moduleDir); Tools::redirectAdmin(self::$currentIndex.'&conf=22&token='.$this->token.'&tab_module='.Tools::getValue('tab_module').'&module_name='.Tools::getValue('module_name')); From 9c8f31b42d31b1b87af17e8c4d8718f8652a9811 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Wed, 21 Nov 2012 10:31:37 +0100 Subject: [PATCH 003/316] [-] BO : added missing width and height of the logo in the supplier order PDF --- classes/pdf/HTMLTemplateSupplyOrderForm.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/classes/pdf/HTMLTemplateSupplyOrderForm.php b/classes/pdf/HTMLTemplateSupplyOrderForm.php index fb53a38b1..515f541ef 100644 --- a/classes/pdf/HTMLTemplateSupplyOrderForm.php +++ b/classes/pdf/HTMLTemplateSupplyOrderForm.php @@ -123,15 +123,22 @@ class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate public function getHeader() { $shop_name = Configuration::get('PS_SHOP_NAME'); - + $path_logo = $this->getLogo(); + $width = $height = 0; + + if (!empty($path_logo)) + list($width, $height) = getimagesize($path_logo); + $this->smarty->assign(array( - 'logo_path' => $this->getLogo(), + 'logo_path' => $path_logo, 'img_ps_dir' => 'http://'.Tools::getMediaServer(_PS_IMG_)._PS_IMG_, 'img_update_time' => Configuration::get('PS_IMG_UPDATE_TIME'), 'title' => $this->title, 'reference' => $this->supply_order->reference, 'date' => $this->date, - 'shop_name' => $shop_name + 'shop_name' => $shop_name, + 'width_logo' => $width, + 'height_logo' => $height )); return $this->smarty->fetch($this->getTemplate('supply-order-header')); From 3fe8ebec1414a28cf18288eead3d83d7041de666 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Wed, 21 Nov 2012 10:59:37 +0100 Subject: [PATCH 004/316] [-] BO : forbid the creation of 2 cart rules with the same code #PSCFV-5737 --- controllers/admin/AdminCartRulesController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php index 845899f34..2fb64e62d 100644 --- a/controllers/admin/AdminCartRulesController.php +++ b/controllers/admin/AdminCartRulesController.php @@ -121,6 +121,8 @@ class AdminCartRulesControllerCore extends AdminController $this->errors[] = Tools::displayError('Reduction percent must be between 0% and 100%'); if ((int)Tools::getValue('reduction_amount') < 0) $this->errors[] = Tools::displayError('Reduction amount cannot be lower than 0'); + if (Tools::getValue('code') && ($same_code = (int)CartRule::getIdByCode(Tools::getValue('code')))) + $this->errors[] = sprintf(Tools::displayError('This cart rule code is already used (conflict with cart rule %d)'), $same_code); } return parent::postProcess(); From 9bb2dc02b60a7d0e949a26e37ce8028a93cc7470 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Wed, 21 Nov 2012 11:34:05 +0100 Subject: [PATCH 005/316] [-] BO : check the folder permissions before writing PDF translations in the theme --- .../admin/AdminTranslationsController.php | 214 +++++++++--------- 1 file changed, 112 insertions(+), 102 deletions(-) diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 5e31cc2d2..e7997a368 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -277,7 +277,12 @@ class AdminTranslationsControllerCore extends AdminController $file_path = $translation_informations['dir'].$translation_informations['file']; if (!file_exists($file_path)) - throw new PrestaShopException(sprintf(Tools::displayError('This file doesn\'t exists: "%s". Please create this file.'), $file_path)); + { + if (!file_exists(dirname($file_path)) && !mkdir(dirname($file_path), 0777, true)) + throw new PrestaShopException(sprintf(Tools::displayError('Directory "%s" cannot be created'), dirname($file_path))); + elseif (!touch($file_path)) + throw new PrestaShopException(sprintf(Tools::displayError('File "%s" cannot be created'), $file_path)); + } if ($fd = fopen($file_path, 'w')) { @@ -1121,110 +1126,115 @@ class AdminTranslationsControllerCore extends AdminController } /* PrestaShop demo mode */ - if (Tools::isSubmit('submitCopyLang')) - { - if ($this->tabAccess['add'] === '1') - $this->submitCopyLang(); - else - $this->errors[] = Tools::displayError('You do not have permission to add here.'); - } - else if (Tools::isSubmit('submitExport')) - { - if ($this->tabAccess['add'] === '1') - $this->submitExportLang(); - else - $this->errors[] = Tools::displayError('You do not have permission to add here.'); - } - else if (Tools::isSubmit('submitImport')) - { - if ($this->tabAccess['add'] === '1') - $this->submitImportLang(); - else - $this->errors[] = Tools::displayError('You do not have permission to add here.'); - } - else if (Tools::isSubmit('submitAddLanguage')) - { - if ($this->tabAccess['add'] === '1') - $this->submitAddLang(); - else - $this->errors[] = Tools::displayError('You do not have permission to add here.'); - } - else if (Tools::isSubmit('submitTranslationsFront')) - { - if ($this->tabAccess['edit'] === '1') - $this->writeTranslationFile(); - else - $this->errors[] = Tools::displayError('You do not have permission to edit here.'); - } - else if (Tools::isSubmit('submitTranslationsPdf')) - { - if ($this->tabAccess['edit'] === '1') - // Only the PrestaShop team should write the translations into the _PS_TRANSLATIONS_DIR_ - if (($this->theme_selected == self::DEFAULT_THEME_NAME) && _PS_MODE_DEV_) + try { + + if (Tools::isSubmit('submitCopyLang')) + { + if ($this->tabAccess['add'] === '1') + $this->submitCopyLang(); + else + $this->errors[] = Tools::displayError('You do not have permission to add here.'); + } + else if (Tools::isSubmit('submitExport')) + { + if ($this->tabAccess['add'] === '1') + $this->submitExportLang(); + else + $this->errors[] = Tools::displayError('You do not have permission to add here.'); + } + else if (Tools::isSubmit('submitImport')) + { + if ($this->tabAccess['add'] === '1') + $this->submitImportLang(); + else + $this->errors[] = Tools::displayError('You do not have permission to add here.'); + } + else if (Tools::isSubmit('submitAddLanguage')) + { + if ($this->tabAccess['add'] === '1') + $this->submitAddLang(); + else + $this->errors[] = Tools::displayError('You do not have permission to add here.'); + } + else if (Tools::isSubmit('submitTranslationsFront')) + { + if ($this->tabAccess['edit'] === '1') $this->writeTranslationFile(); else - $this->writeTranslationFile(true); - else - $this->errors[] = Tools::displayError('You do not have permission to edit here.'); - } - else if (Tools::isSubmit('submitTranslationsBack')) - { - if ($this->tabAccess['edit'] === '1') - $this->writeTranslationFile(); - else - $this->errors[] = Tools::displayError('You do not have permission to edit here.'); - } - else if (Tools::isSubmit('submitTranslationsErrors')) - { - if ($this->tabAccess['edit'] === '1') - $this->writeTranslationFile(); - else - $this->errors[] = Tools::displayError('You do not have permission to edit here.'); - } - else if (Tools::isSubmit('submitTranslationsFields')) - { - if ($this->tabAccess['edit'] === '1') - $this->writeTranslationFile(); - else - $this->errors[] = Tools::displayError('You do not have permission to edit here.'); - - } - else if (Tools::isSubmit('submitTranslationsMails') || Tools::isSubmit('submitTranslationsMailsAndStay')) - { - if ($this->tabAccess['edit'] === '1') - $this->submitTranslationsMails(); - else - $this->errors[] = Tools::displayError('You do not have permission to edit here.'); - } - else if (Tools::isSubmit('submitTranslationsModules')) - { - if ($this->tabAccess['edit'] === '1') - { - // Get a good path for module directory - if ($this->theme_selected == self::DEFAULT_THEME_NAME) - $i18n_dir = $this->translations_informations[$this->type_selected]['dir']; - else - $i18n_dir = $this->translations_informations[$this->type_selected]['override']['dir']; - - // Get list of modules - if ($modules = $this->getListModules()) - { - // Get files of all modules - $arr_files = $this->getAllModuleFiles($modules, $i18n_dir, $this->lang_selected->iso_code, true); - - // Find and write all translation modules files - foreach ($arr_files as $value) - $this->findAndWriteTranslationsIntoFile($value['file_name'], $value['files'], $value['theme'], $value['module'], $value['dir']); - - // Redirect - if (Tools::getValue('submitTranslationsModulesAndStay')) - $this->redirect(true); - else - $this->redirect(); - } + $this->errors[] = Tools::displayError('You do not have permission to edit here.'); } - else - $this->errors[] = Tools::displayError('You do not have permission to edit here.'); + else if (Tools::isSubmit('submitTranslationsPdf')) + { + if ($this->tabAccess['edit'] === '1') + // Only the PrestaShop team should write the translations into the _PS_TRANSLATIONS_DIR_ + if (($this->theme_selected == self::DEFAULT_THEME_NAME) && _PS_MODE_DEV_) + $this->writeTranslationFile(); + else + $this->writeTranslationFile(true); + else + $this->errors[] = Tools::displayError('You do not have permission to edit here.'); + } + else if (Tools::isSubmit('submitTranslationsBack')) + { + if ($this->tabAccess['edit'] === '1') + $this->writeTranslationFile(); + else + $this->errors[] = Tools::displayError('You do not have permission to edit here.'); + } + else if (Tools::isSubmit('submitTranslationsErrors')) + { + if ($this->tabAccess['edit'] === '1') + $this->writeTranslationFile(); + else + $this->errors[] = Tools::displayError('You do not have permission to edit here.'); + } + else if (Tools::isSubmit('submitTranslationsFields')) + { + if ($this->tabAccess['edit'] === '1') + $this->writeTranslationFile(); + else + $this->errors[] = Tools::displayError('You do not have permission to edit here.'); + + } + else if (Tools::isSubmit('submitTranslationsMails') || Tools::isSubmit('submitTranslationsMailsAndStay')) + { + if ($this->tabAccess['edit'] === '1') + $this->submitTranslationsMails(); + else + $this->errors[] = Tools::displayError('You do not have permission to edit here.'); + } + else if (Tools::isSubmit('submitTranslationsModules')) + { + if ($this->tabAccess['edit'] === '1') + { + // Get a good path for module directory + if ($this->theme_selected == self::DEFAULT_THEME_NAME) + $i18n_dir = $this->translations_informations[$this->type_selected]['dir']; + else + $i18n_dir = $this->translations_informations[$this->type_selected]['override']['dir']; + + // Get list of modules + if ($modules = $this->getListModules()) + { + // Get files of all modules + $arr_files = $this->getAllModuleFiles($modules, $i18n_dir, $this->lang_selected->iso_code, true); + + // Find and write all translation modules files + foreach ($arr_files as $value) + $this->findAndWriteTranslationsIntoFile($value['file_name'], $value['files'], $value['theme'], $value['module'], $value['dir']); + + // Redirect + if (Tools::getValue('submitTranslationsModulesAndStay')) + $this->redirect(true); + else + $this->redirect(); + } + } + else + $this->errors[] = Tools::displayError('You do not have permission to edit here.'); + } + } catch (PrestaShopException $e) { + $this->errors[] = $e->getMessage(); } } From e21927403071b43656fe657da2f1eeb2196e68fa Mon Sep 17 00:00:00 2001 From: Vincent Augagneur Date: Wed, 21 Nov 2012 12:08:36 +0100 Subject: [PATCH 006/316] [-] CORE : fixed bug #PSCFV-5700 - loop on undefined variable, typo, quote missing in generic_add_missing_column.php --- install-dev/upgrade/php/generic_add_missing_column.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/install-dev/upgrade/php/generic_add_missing_column.php b/install-dev/upgrade/php/generic_add_missing_column.php index fdcb3fcd0..6d59c6c97 100644 --- a/install-dev/upgrade/php/generic_add_missing_column.php +++ b/install-dev/upgrade/php/generic_add_missing_column.php @@ -1,18 +1,15 @@ 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 From 70f9f7ed3ad6bef30916728ff0534687ae7e7c83 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Wed, 21 Nov 2012 13:39:12 +0100 Subject: [PATCH 007/316] [-] BO : you can search a product by supplier reference again #PSCFV-5723 --- classes/Product.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/classes/Product.php b/classes/Product.php index 78a1e694f..ebc084004 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -3219,7 +3219,10 @@ class ProductCore extends ObjectModel ); $sql->leftJoin('manufacturer', 'm', 'm.`id_manufacturer` = p.`id_manufacturer`'); - $where = 'pl.`name` LIKE \'%'.pSQL($query).'%\' OR p.`reference` LIKE \'%'.pSQL($query).'%\' OR p.`supplier_reference` LIKE \'%'.pSQL($query).'%\''; + $where = 'pl.`name` LIKE \'%'.pSQL($query).'%\' + OR p.`reference` LIKE \'%'.pSQL($query).'%\' + OR p.`supplier_reference` LIKE \'%'.pSQL($query).'%\' + OR p.`id_product` IN (SELECT id_product FROM '._DB_PREFIX_.'product_supplier sp WHERE `product_supplier_reference` LIKE \'%'.pSQL($query).'%\')'; $sql->groupBy('`id_product`'); $sql->orderBy('pl.`name` ASC'); From 86316e3a32adf670abe2e76b7dc30d612d577b7a Mon Sep 17 00:00:00 2001 From: Damon Skelhorn Date: Wed, 21 Nov 2012 15:02:59 +0000 Subject: [PATCH 008/316] Bug #PSCFV-5637 - Order reference (string) if passed in from a 1.4 theme in id_order is cast into a integer which destroys the value. --- controllers/front/GuestTrackingController.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index f5452ab6d..e9a38439b 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -51,17 +51,18 @@ class GuestTrackingControllerCore extends FrontController if (Tools::isSubmit('submitGuestTracking') || Tools::isSubmit('submitTransformGuestToCustomer')) { // These lines are here for retrocompatibility with old theme - $id_order = (int)Tools::getValue('id_order'); + $id_order = Tools::getValue('id_order'); $order_collection = array(); if ($id_order) { if (is_numeric($id_order)) + { $order = new Order((int)$id_order); + if (Validate::isLoadedObject($order)) + $order_collection[] = $order; + } else - $order = Order::getByReference($id_order); - - if (Validate::isLoadedObject($order)) - $order_collection[] = $order; + $order_collection = Order::getByReference($id_order); } // Get order reference, ignore package reference (after the #, on the order reference) From 6c7550009528eb579f7cbfa8b46f403b46c26143 Mon Sep 17 00:00:00 2001 From: Krystian Podemski Date: Wed, 21 Nov 2012 17:35:15 +0100 Subject: [PATCH 009/316] PNG in homeslider Allow to upload png files in homeslider --- modules/homeslider/homeslider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/homeslider/homeslider.php b/modules/homeslider/homeslider.php index ddb45ef72..fd5505db2 100644 --- a/modules/homeslider/homeslider.php +++ b/modules/homeslider/homeslider.php @@ -582,7 +582,7 @@ class HomeSlider extends Module $errors[] = $error; elseif (!$temp_name || !move_uploaded_file($_FILES['image_'.$language['id_lang']]['tmp_name'], $temp_name)) return false; - elseif (!ImageManager::resize($temp_name, dirname(__FILE__).'/images/'.Tools::encrypt($_FILES['image_'.$language['id_lang']]['name'].$salt).'.'.$type)) + elseif (!ImageManager::resize($temp_name, dirname(__FILE__).'/images/'.Tools::encrypt($_FILES['image_'.$language['id_lang']]['name'].$salt).'.'.$type, null, null, $type)) $errors[] = $this->displayError($this->l('An error occurred during the image upload.')); if (isset($temp_name)) @unlink($temp_name); From 2542260f640da014405bf8009aa0d910ab776e32 Mon Sep 17 00:00:00 2001 From: Vincent Augagneur Date: Wed, 21 Nov 2012 17:41:53 +0100 Subject: [PATCH 010/316] [-] CORE : fixed bug #PSCFV-5514 - Override of module language file type fr.php in theme --- classes/Translate.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/classes/Translate.php b/classes/Translate.php index 66eba9f83..9005e9366 100644 --- a/classes/Translate.php +++ b/classes/Translate.php @@ -127,6 +127,7 @@ class TranslateCore static $translations_merged = array(); $name = $module instanceof Module ? $module->name : $module; + if (!isset($translations_merged[$name])) { $filesByPriority = array( @@ -138,16 +139,14 @@ class TranslateCore // PrestaShop 1.4 translations _PS_MODULE_DIR_.$name.'/'.Context::getContext()->language->iso_code.'.php' ); - foreach ($filesByPriority as $file) if (Tools::file_exists_cache($file)) { include_once($file); - $_MODULES = !empty($_MODULES) ? array_merge($_MODULES, $_MODULE) : $_MODULE; + $_MODULES = !empty($_MODULES) ? $_MODULES + $_MODULE : $_MODULE; //we use "+" instead of array_merge() because array merge erase existing values. $translations_merged[$name] = true; } } - $key = md5(str_replace('\'', '\\\'', $string)); $cache_key = $name.'|'.$string.'|'.$source; From b52dda80a041be057a95ca0313a1873477fda063 Mon Sep 17 00:00:00 2001 From: Damon Skelhorn Date: Wed, 21 Nov 2012 16:48:47 +0000 Subject: [PATCH 011/316] Bug #PSCFV-5626 - Amended SQL query to correctly sum the totals for each day. --- controllers/admin/AdminHomeController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 6a73b8d58..246ec0012 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -374,15 +374,15 @@ class AdminHomeControllerCore extends AdminController $chart = new Chart(); $chart->getCurve(1)->setType('bars'); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' - SELECT total_paid / conversion_rate as total_converted, left(invoice_date, 10) as invoice_date + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT sum(total_paid / conversion_rate) as total_converted, left(invoice_date, 10) as trimmed_invoice_date FROM '._DB_PREFIX_.'orders o WHERE valid = 1 AND invoice_date BETWEEN \''.date('Y-m-d', strtotime('-7 DAYS', time())).' 00:00:00\' AND \''.date('Y-m-d H:i:s').'\' '.Shop::addSqlRestriction(Shop::SHARE_ORDER).' + GROUP BY trimmed_invoice_date '); foreach ($result as $row) - $chart->getCurve(1)->setPoint(strtotime($row['invoice_date'].' 02:00:00'), $row['total_converted']); + $chart->getCurve(1)->setPoint(strtotime($row['trimmed_invoice_date'].' 02:00:00'), $row['total_converted']); $chart->setSize(580, 170); $chart->setTimeMode(strtotime('-7 DAYS', time()), time(), 'd'); $currency = Tools::setCurrency($this->context->cookie); From ac1bcdf674ec7ad1e218fc65f6f93ea7e6b369b9 Mon Sep 17 00:00:00 2001 From: Damon Skelhorn Date: Wed, 21 Nov 2012 17:05:08 +0000 Subject: [PATCH 012/316] Revert "Bug #PSCFV-5626 - Amended SQL query to correctly sum the totals for each day." This reverts commit b52dda80a041be057a95ca0313a1873477fda063. --- controllers/admin/AdminHomeController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 246ec0012..6a73b8d58 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -374,15 +374,15 @@ class AdminHomeControllerCore extends AdminController $chart = new Chart(); $chart->getCurve(1)->setType('bars'); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT sum(total_paid / conversion_rate) as total_converted, left(invoice_date, 10) as trimmed_invoice_date + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' + SELECT total_paid / conversion_rate as total_converted, left(invoice_date, 10) as invoice_date FROM '._DB_PREFIX_.'orders o WHERE valid = 1 AND invoice_date BETWEEN \''.date('Y-m-d', strtotime('-7 DAYS', time())).' 00:00:00\' AND \''.date('Y-m-d H:i:s').'\' '.Shop::addSqlRestriction(Shop::SHARE_ORDER).' - GROUP BY trimmed_invoice_date '); foreach ($result as $row) - $chart->getCurve(1)->setPoint(strtotime($row['trimmed_invoice_date'].' 02:00:00'), $row['total_converted']); + $chart->getCurve(1)->setPoint(strtotime($row['invoice_date'].' 02:00:00'), $row['total_converted']); $chart->setSize(580, 170); $chart->setTimeMode(strtotime('-7 DAYS', time()), time(), 'd'); $currency = Tools::setCurrency($this->context->cookie); From 0a7b8d3783995a707cb880b8426e114dc111e38b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Wed, 21 Nov 2012 18:04:08 +0100 Subject: [PATCH 013/316] [-] Core: Fix #PSCFV-5301 Product::isDiscounted was returned a bad value --- classes/Product.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Product.php b/classes/Product.php index ebc084004..739a0c096 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -2676,11 +2676,11 @@ class ProductCore extends ObjectModel WHERE `id_product` = '.(int)$id_product.' AND `id_cart` = '.(int)$context->cart->id ); $quantity = $cart_quantity ? $cart_quantity : $quantity; + $id_currency = (int)$context->currency->id; $ids = Address::getCountryAndState((int)$context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')}); $id_country = (int)($ids['id_country'] ? $ids['id_country'] : Configuration::get('PS_COUNTRY_DEFAULT')); - - return (bool)SpecificPrice::getSpecificPrice((int)$id_product, $context->shop->id, $id_currency, $id_country, $id_group, $quantity); + return (bool)SpecificPrice::getSpecificPrice((int)$id_product, $context->shop->id, $id_currency, $id_country, $id_group, $quantity, null, 0, 0, $quantity); } /** From 11fcd04cb001b2e5cac8203513cd422b75fb2b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Wed, 21 Nov 2012 18:50:16 +0100 Subject: [PATCH 014/316] [-] BO: Fix #PSCFV-5445 - carts are empty on global context in the AdminCarts --- classes/Cart.php | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/classes/Cart.php b/classes/Cart.php index c3bf595c2..de89b0461 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -417,15 +417,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 +434,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 +484,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); } From e09b2d9096c9733d2532e99f7077b19d51a36b11 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Wed, 21 Nov 2012 19:44:14 +0100 Subject: [PATCH 015/316] [-] MO : fixed referralprogram uninstall #PSCFV-5680 --- modules/referralprogram/referralprogram.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/referralprogram/referralprogram.php b/modules/referralprogram/referralprogram.php index fb2c39519..3e2119333 100644 --- a/modules/referralprogram/referralprogram.php +++ b/modules/referralprogram/referralprogram.php @@ -123,8 +123,8 @@ class ReferralProgram extends Module { $langs = Language::getLanguages(false); foreach ($langs AS $lang) - foreach ($this->_mails['name'] AS $name) - foreach ($this->_mails['ext'] AS $ext) + foreach (array('referralprogram-congratulations', 'referralprogram-invitation', 'referralprogram-voucher') AS $name) + foreach (array('txt', 'html') AS $ext) { $file = _PS_MAIL_DIR_.$lang['iso_code'].'/'.$name.'.'.$ext; if (file_exists($file) AND !@unlink($file)) From bae449aea3aa68a7f96b76c3ab4f0aaf908265de Mon Sep 17 00:00:00 2001 From: adonis karavokyros Date: Thu, 22 Nov 2012 09:50:01 +0100 Subject: [PATCH 016/316] Clean selectors in ajax-cart.js Kepp it simple --- modules/blockcart/ajax-cart.js | 85 +++++++++++++++++----------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js index c37e999e1..ac7ae9856 100644 --- a/modules/blockcart/ajax-cart.js +++ b/modules/blockcart/ajax-cart.js @@ -42,7 +42,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 +95,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 +139,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 +168,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 +184,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 +240,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 +269,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 +309,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 +328,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 +400,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 +424,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); @@ -461,30 +461,30 @@ var ajaxCart = { else { var jsonProduct = this; - if($('dt#cart_block_product_' + domIdProduct + ' .quantity').text() != jsonProduct.quantity || $('dt#cart_block_product_' + domIdProduct + ' .price').text() != jsonProduct.priceByLine) + if($('#cart_block_product_' + domIdProduct + ' .quantity').text() != jsonProduct.quantity || $('dt#cart_block_product_' + domIdProduct + ' .price').text() != jsonProduct.priceByLine) { // Usual product if (parseFloat(this.price_float) > 0) - $('dt#cart_block_product_' + domIdProduct + ' .price').text(jsonProduct.priceByLine); + $('#cart_block_product_' + domIdProduct + ' .price').text(jsonProduct.priceByLine); else - $('dt#cart_block_product_' + domIdProduct + ' .price').html(freeProductTranslation); + $('#cart_block_product_' + domIdProduct + ' .price').html(freeProductTranslation); ajaxCart.updateProductQuantity(jsonProduct, jsonProduct.quantity); // Customized product if (jsonProduct.hasCustomizedDatas) { customizationFormatedDatas = ajaxCart.displayNewCustomizedDatas(jsonProduct); - if (!$('#cart_block ul#customization_' + domIdProductAttribute).length) + if (!$('#customization_' + domIdProductAttribute).length) { if (jsonProduct.hasAttributes) - $('#cart_block dd#cart_block_combination_of_' + domIdProduct).append(customizationFormatedDatas); + $('#cart_block_combination_of_' + domIdProduct).append(customizationFormatedDatas); else $('#cart_block dl.products').append(customizationFormatedDatas); } else { - $('#cart_block ul#customization_' + domIdProductAttribute).html(''); - $('#cart_block ul#customization_' + domIdProductAttribute).append(customizationFormatedDatas); + $('#customization_' + domIdProductAttribute).html(''); + $('#customization_' + domIdProductAttribute).append(customizationFormatedDatas); } } } @@ -505,7 +505,7 @@ var ajaxCart = { var content = ''; var productId = parseInt(product.id); var productAttributeId = typeof(product.idCombination) == 'undefined' ? 0 : parseInt(product.idCombination); - var hasAlreadyCustomizations = $('#cart_block ul#customization_' + productId + '_' + productAttributeId).length; + var hasAlreadyCustomizations = $('#customization_' + productId + '_' + productAttributeId).length; if (!hasAlreadyCustomizations) { @@ -544,7 +544,7 @@ var ajaxCart = { if (customizationId) { $('#uploadable_files li div.customizationUploadBrowse img').remove(); - $('#text_fields li input').attr('value', ''); + $('#text_fields input').attr('value', ''); } }); @@ -577,10 +577,10 @@ var ajaxCart = { ajaxCart.refreshVouchers(jsonData); //update 'first' and 'last' item classes - $('#cart_block dl.products dt').removeClass('first_item').removeClass('last_item').removeClass('item'); - $('#cart_block dl.products dt:first').addClass('first_item'); - $('#cart_block dl.products dt:not(:first,:last)').addClass('item'); - $('#cart_block dl.products dt:last').addClass('last_item'); + $('#cart_block .products dt').removeClass('first_item').removeClass('last_item').removeClass('item'); + $('#cart_block .products dt:first').addClass('first_item'); + $('#cart_block .products dt:not(:first,:last)').addClass('item'); + $('#cart_block .products dt:last').addClass('last_item'); //reset the onlick events in relation to the cart block (it allow to bind the onclick event to the new 'delete' buttons added) ajaxCart.overrideButtonsInThePage(); @@ -674,13 +674,13 @@ $(document).ready(function(){ function() { $(this).css('border-radius', '3px 3px 0px 0px'); if (ajaxCart.nb_total_products > 0) - $("#header #cart_block").stop(true, true).slideDown(450); + $("#cart_block").stop(true, true).slideDown(450); }, function() { $('#shopping_cart a').css('border-radius', '3px'); setTimeout(function() { if (!shopping_cart.isHoveringOver() && !cart_block.isHoveringOver()) - $("#header #cart_block").stop(true, true).slideUp(450); + $("#cart_block").stop(true, true).slideUp(450); }, 200); } ); @@ -710,5 +710,4 @@ $(document).ready(function(){ } return false; }); -}); - +}); \ No newline at end of file From 95d26cbcb723bdb7ae559eb1981fbb7138f33ad8 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Thu, 22 Nov 2012 10:12:42 +0100 Subject: [PATCH 017/316] [-] FO : cookie lifetime is now set with the front end lifetime value instead of the BO value #PSCFV-5668 --- config/config.inc.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/config/config.inc.php b/config/config.inc.php index 4ecdb0184..f80438cc0 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -109,21 +109,24 @@ Context::getContext()->country = $defaultCountry; @date_default_timezone_set(Configuration::get('PS_TIMEZONE')); /* Instantiate cookie */ -$cookieLifetime = (time() + (((int)Configuration::get('PS_COOKIE_LIFETIME_BO') > 0 ? (int)Configuration::get('PS_COOKIE_LIFETIME_BO') : 1)* 3600)); + + +$cookie_lifetime = (int)(defined('_PS_ADMIN_DIR_') ? Configuration::get('PS_COOKIE_LIFETIME_BO') : Configuration::get('PS_COOKIE_LIFETIME_FO')); +$cookie_lifetime = time() + (max($cookie_lifetime, 1) * 3600); if (defined('_PS_ADMIN_DIR_')) - $cookie = new Cookie('psAdmin', '', $cookieLifetime); + $cookie = new Cookie('psAdmin', '', $cookie_lifetime); else { if (Context::getContext()->shop->getGroup()->share_order) - $cookie = new Cookie('ps-sg'.Context::getContext()->shop->getGroup()->id, '', $cookieLifetime, Context::getContext()->shop->getUrlsSharedCart()); + $cookie = new Cookie('ps-sg'.Context::getContext()->shop->getGroup()->id, '', $cookie_lifetime, Context::getContext()->shop->getUrlsSharedCart()); else { $domains = null; if(Context::getContext()->shop->domain != Context::getContext()->shop->domain_ssl) $domains = array(Context::getContext()->shop->domain_ssl, Context::getContext()->shop->domain); - $cookie = new Cookie('ps-s'.Context::getContext()->shop->id, '', $cookieLifetime, $domains); + $cookie = new Cookie('ps-s'.Context::getContext()->shop->id, '', $cookie_lifetime, $domains); } } From bd4085ac20c86ad3b4c45a83943ff63e13e1a1b0 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Thu, 22 Nov 2012 10:30:25 +0100 Subject: [PATCH 018/316] [-] BO : tag saving does not crash with a bad line ending anymore #PSCFV-5663 --- classes/Tag.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Tag.php b/classes/Tag.php index cbb123983..2df72a4bf 100644 --- a/classes/Tag.php +++ b/classes/Tag.php @@ -98,7 +98,7 @@ class TagCore extends ObjectModel return false; if (!is_array($tag_list)) - $tag_list = array_unique(array_map('trim', preg_split('#\\'.$separator.'#', $tag_list, null, PREG_SPLIT_NO_EMPTY))); + $tag_list = array_filter(array_unique(array_map('trim', preg_split('#\\'.$separator.'#', $tag_list, null, PREG_SPLIT_NO_EMPTY)))); $list = array(); foreach ($tag_list as $tag) From 38825d655121b5b34f8f8d8654b69b4bb182b583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 22 Nov 2012 10:49:50 +0100 Subject: [PATCH 019/316] [-] Core: Fix #PSCFV-5561 many payment informations are added when product is out of stock on order validation --- classes/PaymentModule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 670ce46c7..9de0ef3df 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -534,7 +534,7 @@ abstract class PaymentModuleCore extends Module { $history = new OrderHistory(); $history->id_order = (int)$order->id; - $history->changeIdOrderState(Configuration::get('PS_OS_OUTOFSTOCK'), $order); + $history->changeIdOrderState(Configuration::get('PS_OS_OUTOFSTOCK'), $order, true); $history->addWithemail(); } From 9b1f6fd07f89e2d2d215b6d0ade3db41b8dc9638 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Thu, 22 Nov 2012 11:08:13 +0100 Subject: [PATCH 020/316] [*] FO : fixed wrong display of weight units in product comparaison #PSCFV-5662 --- themes/default/products-comparison.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/products-comparison.tpl b/themes/default/products-comparison.tpl index e12c2c839..97813c493 100644 --- a/themes/default/products-comparison.tpl +++ b/themes/default/products-comparison.tpl @@ -62,7 +62,7 @@ {if !empty($product->unity) && $product->unit_price_ratio > 0.000000} {math equation="pprice / punit_price" pprice=$product->getPrice($taxes_behavior) punit_price=$product->unit_price_ratio assign=unit_price} -

{convertPrice price=$unit_price} {l s='per %d' sprintf=$product->unity|escape:'htmlall':'UTF-8'}

+

{convertPrice price=$unit_price} {l s='per %s' sprintf=$product->unity|escape:'htmlall':'UTF-8'}

{else}   {/if} From 44a54fd0173b70909e17aa25a3aa27b82575cb63 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 22 Nov 2012 11:21:19 +0100 Subject: [PATCH 021/316] //added CONTRIBUTING.md CONTRIBUTORS.md README.md --- CONTRIBUTING.md | 12 ++++++++++++ CONTRIBUTORS.md | 40 ++++++++++++++++++++++++++++++++++++++++ README.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 CONTRIBUTING.md create mode 100644 CONTRIBUTORS.md create mode 100644 README.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..f9c682fca --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,12 @@ +Contributing +------------ + +PrestaShop is an open-source e-commerce solution - To contribute to our project, you can make pull requests on the development branch. +If you need some help to make a [pull-request][1] +All contributions must respect [the coding norm][2] and [the commit norm][3] in your pull-request. +All core files you commit in your pull request must have Open Software License (OSL 3.0) +All modules files you commit in your pull request must have Academic Free License (AFL 3.0) + +[1]: https://help.github.com/articles/using-pull-requests +[2]: http://docs.prestashop.com/display/PS15/Coding+Standard +[3]: http://docs.prestashop.com/display/PS15/Commit+norme \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 000000000..db8ff6095 --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,40 @@ +CONTRIBUTORS +============ + +- DamienMetzger +- François Gaillard +- Rémi Gaillard +- Vincent Augagneur +- aFolletete +- aKorczak +- aNiassy +- bLeveque +- bMancone +- dMetzger +- dSevere +- fBrignoli +- fSerny +- gBrunier +- gCharmes +- gPoulain +- hAitmansour +- jBreux +- jObregon +- jmCollin +- lBrieu +- lCherifi +- lLefevre +- mBertholino +- mDeflotte +- mMarinetti +- nPellicari +- rGaillard +- rMalie +- rMontagne +- sLorenzini +- sThiebaut +- tDidierjean +- vAugagneur +- vChabot +- vKham +- vSchoener \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 000000000..0d1f0df50 --- /dev/null +++ b/README.md @@ -0,0 +1,48 @@ +README +====== +![PrestaShop](http://www.prestashop.com/images/banners/general/prestashop_728x90.png "PrestaShop") + +PREPARATION +-------- + +To install PrestaShop, you need a remote web server or on your computer (MAMP), with access to a database like MySQL. +You'll need access to phpMyAdmin to create a database and to indicate the information in the database in the installer. + +If you do not host and unable to create your store, we offer a turnkey store, which lets you create your online store in less than 10 minutes without any technical knowledge. +We invite you to visit: [http://www.prestabox.com][1] + +INSTALLATION +-------- + +Simply go to your PrestaShop web directory and use installer :-) + +If you have any PHP error, perhaps you don't have PHP5 or you need to activate it on your web host. +Please go to our forum to find pre-installation settings (PHP 5, htaccess) for certain hosting services (1&1, Free, Lycos, OVH, Infomaniak, Amen, GoDaddy, etc). + +English webhost [specifics settings][2] + + +If you don't find any solution to launch installer, please post on [our forum][3] + + +There are always solutions for your issues ;-) + +DOCUMENTATION +-------- + +For any extra documentation (how-to), please read our [Online documentation][4] + + +FORUMS +-------- + +You can also discuss, help and contribute with PrestaShop community on [our forums][5] + + +Thanks for downloading and using PrestaShop e-commerce Open-source solution! + +[1]: http://www.prestabox.com +[2]: http://www.prestashop.com/forums/topic/2946-pre-installation-settings-php-5-htaccess-for-certain-hosting-services/ +[3]: http://www.prestashop.com/forums/forum/7-installing-prestashop/ +[4]: http://doc.prestashop.com +[5]: http://www.prestashop.com/forums/ \ No newline at end of file From 8ef07b1e34c668f0ea69583a764f0db315953b2c Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Thu, 22 Nov 2012 11:33:01 +0100 Subject: [PATCH 022/316] [-] FO : added missing e-mail control on identity controller #PSCFV-5645 --- controllers/front/IdentityController.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/controllers/front/IdentityController.php b/controllers/front/IdentityController.php index 4ef77d8dc..63a10bd0a 100644 --- a/controllers/front/IdentityController.php +++ b/controllers/front/IdentityController.php @@ -56,15 +56,17 @@ class IdentityControllerCore extends FrontController $this->errors[] = Tools::displayError('Invalid date of birth'); else { + $email = trim(Tools::getValue('email')); $this->customer->birthday = (empty($_POST['years']) ? '' : (int)$_POST['years'].'-'.(int)$_POST['months'].'-'.(int)$_POST['days']); - - if (Customer::customerExists(Tools::getValue('email'), true) && $this->customer->email != Tools::getValue('email')) - $this->errors[] = Tools::displayError('An account is already registered with this e-mail.'); - $_POST['old_passwd'] = trim($_POST['old_passwd']); - if (empty($_POST['old_passwd']) || (Tools::encrypt($_POST['old_passwd']) != $this->context->cookie->passwd)) + + if (!Validate::isEmail($email)) + $this->errors[] = Tools::displayError('This e-mail address is not valid'); + elseif ($this->customer->email != $email && Customer::customerExists($email, true)) + $this->errors[] = Tools::displayError('An account is already registered with this e-mail.'); + elseif (empty($_POST['old_passwd']) || (Tools::encrypt($_POST['old_passwd']) != $this->context->cookie->passwd)) $this->errors[] = Tools::displayError('Your password is incorrect.'); - else if ($_POST['passwd'] != $_POST['confirmation']) + elseif ($_POST['passwd'] != $_POST['confirmation']) $this->errors[] = Tools::displayError('Password and confirmation do not match'); else { From a1db83ef41636029a1ff431362deabbb3e8d0793 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 22 Nov 2012 11:57:40 +0100 Subject: [PATCH 023/316] //remove svn keyword @version Release: $ --- 404.php | 1 - address.php | 1 - addresses.php | 1 - admin-dev/ajax-tab.php | 1 - admin-dev/ajax.php | 1 - admin-dev/ajax_products_list.php | 1 - admin-dev/ajaxfilemanager/inc/index.php | 1 - admin-dev/ajaxfilemanager/index.php | 1 - admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php | 1 - admin-dev/ajaxfilemanager/jscripts/edit_area/index.php | 1 - admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php | 1 - .../ajaxfilemanager/jscripts/edit_area/reg_syntax/index.php | 1 - admin-dev/ajaxfilemanager/jscripts/index.php | 1 - admin-dev/ajaxfilemanager/langs/index.php | 1 - admin-dev/ajaxfilemanager/session/index.php | 1 - admin-dev/ajaxfilemanager/theme/default/css/index.php | 1 - .../ajaxfilemanager/theme/default/images/action/index.php | 1 - .../ajaxfilemanager/theme/default/images/big_icon/index.php | 1 - .../ajaxfilemanager/theme/default/images/file_type/index.php | 1 - admin-dev/ajaxfilemanager/theme/default/images/index.php | 1 - .../ajaxfilemanager/theme/default/images/pagination/index.php | 1 - .../ajaxfilemanager/theme/default/images/standard/index.php | 1 - admin-dev/ajaxfilemanager/theme/default/index.php | 1 - admin-dev/ajaxfilemanager/theme/index.php | 1 - admin-dev/autoupgrade/index.php | 3 +-- admin-dev/backup.php | 1 - admin-dev/backups/index.php | 1 - admin-dev/cron_currency_rates.php | 1 - admin-dev/displayImage.php | 1 - admin-dev/drawer.php | 1 - admin-dev/export/index.php | 1 - admin-dev/footer.inc.php | 1 - admin-dev/functions.php | 1 - admin-dev/get-file-admin.php | 1 - admin-dev/grider.php | 1 - admin-dev/header.inc.php | 1 - admin-dev/import/index.php | 1 - admin-dev/index.php | 1 - admin-dev/init.php | 1 - admin-dev/login.php | 1 - admin-dev/password.php | 1 - admin-dev/pdf.php | 1 - admin-dev/searchcron.php | 1 - admin-dev/tabs/index.php | 1 - admin-dev/themes/default/css/index.php | 1 - admin-dev/themes/default/img/index.php | 1 - admin-dev/themes/default/index.php | 1 - admin-dev/themes/default/template/content.tpl | 1 - .../default/template/controllers/access/helpers/form/form.tpl | 1 - .../default/template/controllers/access/helpers/form/index.php | 3 +-- .../default/template/controllers/access/helpers/index.php | 3 +-- admin-dev/themes/default/template/controllers/access/index.php | 3 +-- .../default/template/controllers/addons_catalog/content.tpl | 1 - .../default/template/controllers/addons_catalog/index.php | 3 +-- .../template/controllers/addresses/helpers/form/form.tpl | 1 - .../template/controllers/addresses/helpers/form/index.php | 3 +-- .../default/template/controllers/addresses/helpers/index.php | 3 +-- .../template/controllers/addresses/helpers/list/index.php | 3 +-- .../controllers/addresses/helpers/list/list_header.tpl | 1 - .../themes/default/template/controllers/addresses/index.php | 3 +-- .../themes/default/template/controllers/attachments/index.php | 3 +-- .../template/controllers/attachments/list_action_delete.tpl | 1 - .../template/controllers/attribute_generator/content.tpl | 1 - .../default/template/controllers/attribute_generator/index.php | 3 +-- .../template/controllers/attributes/helpers/form/form.tpl | 1 - .../template/controllers/attributes/helpers/form/index.php | 3 +-- .../default/template/controllers/attributes/helpers/index.php | 3 +-- .../template/controllers/attributes/helpers/list/index.php | 3 +-- .../controllers/attributes/helpers/list/list_content.tpl | 1 - .../themes/default/template/controllers/attributes/index.php | 3 +-- .../controllers/attributes_groups/helpers/form/form.tpl | 1 - .../controllers/attributes_groups/helpers/form/index.php | 3 +-- .../template/controllers/attributes_groups/helpers/index.php | 3 +-- .../controllers/attributes_groups/helpers/list/index.php | 3 +-- .../controllers/attributes_groups/helpers/list/list_header.tpl | 1 - .../default/template/controllers/attributes_groups/index.php | 3 +-- .../default/template/controllers/backup/download/index.php | 3 +-- .../default/template/controllers/backup/download/view.tpl | 1 - .../default/template/controllers/backup/helpers/index.php | 3 +-- .../default/template/controllers/backup/helpers/list/index.php | 3 +-- .../template/controllers/backup/helpers/list/list_header.tpl | 1 - .../default/template/controllers/backup/helpers/view/index.php | 3 +-- .../default/template/controllers/backup/helpers/view/view.tpl | 1 - admin-dev/themes/default/template/controllers/backup/index.php | 3 +-- .../template/controllers/carriers/helpers/form/form.tpl | 1 - .../template/controllers/carriers/helpers/form/index.php | 3 +-- .../default/template/controllers/carriers/helpers/index.php | 3 +-- .../themes/default/template/controllers/carriers/index.php | 3 +-- .../themes/default/template/controllers/cart_rules/form.js | 1 - .../default/template/controllers/cart_rules/helpers/index.php | 3 +-- .../template/controllers/cart_rules/helpers/list/index.php | 3 +-- .../controllers/cart_rules/helpers/list/list_header.tpl | 1 - .../themes/default/template/controllers/cart_rules/index.php | 3 +-- .../default/template/controllers/carts/helpers/index.php | 3 +-- .../default/template/controllers/carts/helpers/view/index.php | 3 +-- .../default/template/controllers/carts/helpers/view/view.tpl | 1 - admin-dev/themes/default/template/controllers/carts/index.php | 3 +-- .../template/controllers/categories/helpers/form/form.tpl | 1 - .../template/controllers/categories/helpers/form/index.php | 3 +-- .../default/template/controllers/categories/helpers/index.php | 3 +-- .../template/controllers/categories/helpers/list/index.php | 3 +-- .../controllers/categories/helpers/list/list_header.tpl | 1 - .../themes/default/template/controllers/categories/index.php | 3 +-- .../default/template/controllers/cms/helpers/form/form.tpl | 1 - .../default/template/controllers/cms/helpers/form/index.php | 3 +-- .../themes/default/template/controllers/cms/helpers/index.php | 3 +-- admin-dev/themes/default/template/controllers/cms/index.php | 3 +-- .../template/controllers/cms_categories/helpers/form/form.tpl | 1 - .../template/controllers/cms_categories/helpers/form/index.php | 3 +-- .../template/controllers/cms_categories/helpers/index.php | 3 +-- .../default/template/controllers/cms_categories/index.php | 3 +-- .../default/template/controllers/cms_content/content.tpl | 1 - .../themes/default/template/controllers/cms_content/index.php | 3 +-- .../template/controllers/countries/helpers/form/form.tpl | 1 - .../template/controllers/countries/helpers/form/index.php | 3 +-- .../default/template/controllers/countries/helpers/index.php | 3 +-- .../template/controllers/countries/helpers/list/index.php | 3 +-- .../controllers/countries/helpers/list/list_footer.tpl | 1 - .../themes/default/template/controllers/countries/index.php | 3 +-- .../template/controllers/customer_threads/helpers/index.php | 3 +-- .../controllers/customer_threads/helpers/list/index.php | 3 +-- .../controllers/customer_threads/helpers/list/list_header.tpl | 1 - .../controllers/customer_threads/helpers/options/index.php | 3 +-- .../controllers/customer_threads/helpers/options/options.tpl | 1 - .../controllers/customer_threads/helpers/view/index.php | 3 +-- .../controllers/customer_threads/helpers/view/view.tpl | 1 - .../default/template/controllers/customer_threads/index.php | 3 +-- .../default/template/controllers/customer_threads/message.tpl | 1 - .../default/template/controllers/customers/helpers/index.php | 3 +-- .../template/controllers/customers/helpers/list/index.php | 3 +-- .../controllers/customers/helpers/list/list_header.tpl | 1 - .../template/controllers/customers/helpers/view/index.php | 3 +-- .../template/controllers/customers/helpers/view/view.tpl | 1 - .../themes/default/template/controllers/customers/index.php | 3 +-- .../themes/default/template/controllers/emails/content.tpl | 1 - admin-dev/themes/default/template/controllers/emails/index.php | 3 +-- .../template/controllers/employees/helpers/form/form.tpl | 1 - .../template/controllers/employees/helpers/form/index.php | 3 +-- .../default/template/controllers/employees/helpers/index.php | 3 +-- .../themes/default/template/controllers/employees/index.php | 3 +-- .../template/controllers/feature_value/helpers/form/form.tpl | 1 - .../template/controllers/feature_value/helpers/form/index.php | 3 +-- .../template/controllers/feature_value/helpers/index.php | 3 +-- .../default/template/controllers/feature_value/index.php | 3 +-- .../template/controllers/features/helpers/form/form.tpl | 1 - .../template/controllers/features/helpers/form/index.php | 3 +-- .../default/template/controllers/features/helpers/index.php | 3 +-- .../themes/default/template/controllers/features/index.php | 3 +-- .../default/template/controllers/geolocation/helpers/index.php | 3 +-- .../template/controllers/geolocation/helpers/options/index.php | 3 +-- .../controllers/geolocation/helpers/options/options.tpl | 1 - .../themes/default/template/controllers/geolocation/index.php | 3 +-- .../default/template/controllers/groups/helpers/form/form.tpl | 1 - .../default/template/controllers/groups/helpers/form/index.php | 3 +-- .../default/template/controllers/groups/helpers/index.php | 3 +-- .../default/template/controllers/groups/helpers/view/index.php | 3 +-- .../default/template/controllers/groups/helpers/view/view.tpl | 1 - admin-dev/themes/default/template/controllers/groups/index.php | 3 +-- admin-dev/themes/default/template/controllers/home/content.tpl | 1 - admin-dev/themes/default/template/controllers/home/index.php | 3 +-- .../default/template/controllers/home/optimizationTips.tpl | 1 - .../themes/default/template/controllers/images/content.tpl | 1 - admin-dev/themes/default/template/controllers/images/index.php | 3 +-- .../default/template/controllers/import/helpers/form/form.tpl | 1 - .../default/template/controllers/import/helpers/form/index.php | 3 +-- .../default/template/controllers/import/helpers/index.php | 3 +-- .../default/template/controllers/import/helpers/view/index.php | 3 +-- .../default/template/controllers/import/helpers/view/view.tpl | 1 - admin-dev/themes/default/template/controllers/import/index.php | 3 +-- admin-dev/themes/default/template/controllers/index.php | 3 +-- .../default/template/controllers/information/helpers/index.php | 3 +-- .../template/controllers/information/helpers/view/index.php | 3 +-- .../template/controllers/information/helpers/view/view.tpl | 1 - .../themes/default/template/controllers/information/index.php | 3 +-- .../template/controllers/invoices/helpers/form/form.tpl | 1 - .../template/controllers/invoices/helpers/form/index.php | 3 +-- .../default/template/controllers/invoices/helpers/index.php | 3 +-- .../themes/default/template/controllers/invoices/index.php | 3 +-- .../template/controllers/languages/helpers/form/form.tpl | 1 - .../template/controllers/languages/helpers/form/index.php | 3 +-- .../default/template/controllers/languages/helpers/index.php | 3 +-- .../themes/default/template/controllers/languages/index.php | 3 +-- .../default/template/controllers/localization/content.tpl | 1 - .../themes/default/template/controllers/localization/index.php | 3 +-- .../themes/default/template/controllers/login/content.tpl | 1 - admin-dev/themes/default/template/controllers/login/index.php | 3 +-- .../themes/default/template/controllers/logs/helpers/index.php | 3 +-- .../default/template/controllers/logs/helpers/list/index.php | 3 +-- .../template/controllers/logs/helpers/list/list_header.tpl | 1 - admin-dev/themes/default/template/controllers/logs/index.php | 3 +-- .../default/template/controllers/maintenance/helpers/index.php | 3 +-- .../template/controllers/maintenance/helpers/options/index.php | 3 +-- .../controllers/maintenance/helpers/options/options.tpl | 1 - .../themes/default/template/controllers/maintenance/index.php | 3 +-- .../template/controllers/manufacturers/helpers/index.php | 3 +-- .../template/controllers/manufacturers/helpers/view/index.php | 3 +-- .../template/controllers/manufacturers/helpers/view/view.tpl | 1 - .../default/template/controllers/manufacturers/index.php | 3 +-- .../themes/default/template/controllers/meta/helpers/index.php | 3 +-- .../template/controllers/meta/helpers/options/index.php | 3 +-- .../template/controllers/meta/helpers/options/options.tpl | 1 - admin-dev/themes/default/template/controllers/meta/index.php | 3 +-- .../themes/default/template/controllers/modules/content.tpl | 1 - .../themes/default/template/controllers/modules/filters.tpl | 1 - .../themes/default/template/controllers/modules/header.tpl | 1 - .../themes/default/template/controllers/modules/index.php | 3 +-- admin-dev/themes/default/template/controllers/modules/js.tpl | 3 +-- admin-dev/themes/default/template/controllers/modules/list.tpl | 3 +-- admin-dev/themes/default/template/controllers/modules/page.tpl | 1 - .../default/template/controllers/modules_positions/form.tpl | 1 - .../default/template/controllers/modules_positions/index.php | 3 +-- .../template/controllers/modules_positions/list_modules.tpl | 1 - .../themes/default/template/controllers/not_found/content.tpl | 1 - .../themes/default/template/controllers/not_found/index.php | 3 +-- .../template/controllers/order_preferences/helpers/index.php | 3 +-- .../controllers/order_preferences/helpers/options/index.php | 3 +-- .../controllers/order_preferences/helpers/options/options.tpl | 1 - .../default/template/controllers/order_preferences/index.php | 3 +-- .../default/template/controllers/orders/_customized_data.tpl | 1 - .../default/template/controllers/orders/_discount_form.tpl | 1 - .../themes/default/template/controllers/orders/_documents.tpl | 1 - .../default/template/controllers/orders/_new_product.tpl | 1 - .../default/template/controllers/orders/_print_pdf_icon.tpl | 1 - .../default/template/controllers/orders/_product_line.tpl | 1 - .../themes/default/template/controllers/orders/_shipping.tpl | 1 - admin-dev/themes/default/template/controllers/orders/form.tpl | 1 - .../controllers/orders/form_customization_feedback.tpl | 1 - .../default/template/controllers/orders/helpers/index.php | 3 +-- .../default/template/controllers/orders/helpers/view/index.php | 3 +-- .../default/template/controllers/orders/helpers/view/view.tpl | 1 - admin-dev/themes/default/template/controllers/orders/index.php | 3 +-- .../template/controllers/outstanding/_print_pdf_icon.tpl | 1 - .../themes/default/template/controllers/outstanding/index.php | 3 +-- .../default/template/controllers/payment/helpers/index.php | 3 +-- .../template/controllers/payment/helpers/view/index.php | 3 +-- .../default/template/controllers/payment/helpers/view/view.tpl | 1 - .../themes/default/template/controllers/payment/index.php | 3 +-- .../default/template/controllers/payment/restrictions.tpl | 1 - .../template/controllers/performance/helpers/form/form.tpl | 1 - .../template/controllers/performance/helpers/form/index.php | 3 +-- .../default/template/controllers/performance/helpers/index.php | 3 +-- .../themes/default/template/controllers/performance/index.php | 3 +-- .../default/template/controllers/preferences/helpers/index.php | 3 +-- .../template/controllers/preferences/helpers/options/index.php | 3 +-- .../controllers/preferences/helpers/options/options.tpl | 1 - .../themes/default/template/controllers/preferences/index.php | 3 +-- .../default/template/controllers/products/associations.tpl | 1 - .../default/template/controllers/products/attachments.tpl | 1 - .../controllers/products/combination/helpers/index.php | 3 +-- .../controllers/products/combination/helpers/list/index.php | 3 +-- .../products/combination/helpers/list/list_footer.tpl | 1 - .../template/controllers/products/combination/index.php | 3 +-- .../default/template/controllers/products/combinations.tpl | 1 - .../default/template/controllers/products/customization.tpl | 1 - .../themes/default/template/controllers/products/features.tpl | 1 - .../template/controllers/products/helpers/form/form.tpl | 1 - .../template/controllers/products/helpers/form/index.php | 3 +-- .../default/template/controllers/products/helpers/index.php | 3 +-- .../template/controllers/products/helpers/list/index.php | 3 +-- .../template/controllers/products/helpers/list/list_header.tpl | 1 - .../themes/default/template/controllers/products/images.tpl | 1 - .../themes/default/template/controllers/products/index.php | 3 +-- .../default/template/controllers/products/informations.tpl | 1 - .../default/template/controllers/products/input_text_lang.tpl | 1 - .../template/controllers/products/multishop/check_fields.tpl | 1 - .../template/controllers/products/multishop/checkbox.tpl | 1 - .../default/template/controllers/products/multishop/index.php | 3 +-- .../themes/default/template/controllers/products/pack.tpl | 1 - .../themes/default/template/controllers/products/prices.tpl | 1 - .../default/template/controllers/products/quantities.tpl | 1 - admin-dev/themes/default/template/controllers/products/seo.tpl | 1 - .../themes/default/template/controllers/products/shipping.tpl | 1 - .../themes/default/template/controllers/products/suppliers.tpl | 1 - .../default/template/controllers/products/textarea_lang.tpl | 1 - .../default/template/controllers/products/virtualproduct.tpl | 1 - .../default/template/controllers/products/warehouses.tpl | 1 - .../themes/default/template/controllers/referrers/calendar.tpl | 1 - .../default/template/controllers/referrers/form_settings.tpl | 1 - .../template/controllers/referrers/helpers/form/form.tpl | 1 - .../template/controllers/referrers/helpers/form/index.php | 3 +-- .../default/template/controllers/referrers/helpers/index.php | 3 +-- .../template/controllers/referrers/helpers/list/index.php | 3 +-- .../controllers/referrers/helpers/list/list_header.tpl | 1 - .../template/controllers/referrers/helpers/view/index.php | 3 +-- .../template/controllers/referrers/helpers/view/view.tpl | 1 - .../themes/default/template/controllers/referrers/index.php | 3 +-- .../template/controllers/request_sql/helpers/form/form.tpl | 1 - .../template/controllers/request_sql/helpers/form/index.php | 3 +-- .../default/template/controllers/request_sql/helpers/index.php | 3 +-- .../template/controllers/request_sql/helpers/view/index.php | 3 +-- .../template/controllers/request_sql/helpers/view/view.tpl | 1 - .../themes/default/template/controllers/request_sql/index.php | 3 +-- .../template/controllers/request_sql/list_action_export.tpl | 1 - .../default/template/controllers/return/helpers/form/form.tpl | 1 - .../default/template/controllers/return/helpers/form/index.php | 3 +-- .../default/template/controllers/return/helpers/index.php | 3 +-- admin-dev/themes/default/template/controllers/return/index.php | 3 +-- .../default/template/controllers/scenes/helpers/form/form.tpl | 1 - .../default/template/controllers/scenes/helpers/form/index.php | 3 +-- .../default/template/controllers/scenes/helpers/index.php | 3 +-- admin-dev/themes/default/template/controllers/scenes/index.php | 3 +-- .../default/template/controllers/search/helpers/index.php | 3 +-- .../default/template/controllers/search/helpers/view/index.php | 3 +-- .../default/template/controllers/search/helpers/view/view.tpl | 1 - admin-dev/themes/default/template/controllers/search/index.php | 3 +-- .../themes/default/template/controllers/shipping/content.tpl | 1 - .../themes/default/template/controllers/shipping/index.php | 3 +-- admin-dev/themes/default/template/controllers/shop/content.tpl | 1 - .../default/template/controllers/shop/helpers/form/form.tpl | 1 - .../default/template/controllers/shop/helpers/form/index.php | 3 +-- .../themes/default/template/controllers/shop/helpers/index.php | 3 +-- .../default/template/controllers/shop/helpers/list/index.php | 3 +-- .../controllers/shop/helpers/list/list_action_delete.tpl | 1 - .../template/controllers/shop/helpers/list/list_content.tpl | 1 - admin-dev/themes/default/template/controllers/shop/index.php | 3 +-- admin-dev/themes/default/template/controllers/shop/tree.tpl | 1 - .../themes/default/template/controllers/shop_group/content.tpl | 1 - .../template/controllers/shop_group/helpers/form/form.tpl | 1 - .../template/controllers/shop_group/helpers/form/index.php | 3 +-- .../default/template/controllers/shop_group/helpers/index.php | 3 +-- .../themes/default/template/controllers/shop_group/index.php | 3 +-- .../themes/default/template/controllers/shop_url/content.tpl | 1 - .../template/controllers/shop_url/helpers/form/form.tpl | 1 - .../template/controllers/shop_url/helpers/form/index.php | 3 +-- .../default/template/controllers/shop_url/helpers/index.php | 3 +-- .../template/controllers/shop_url/helpers/list/index.php | 3 +-- .../controllers/shop_url/helpers/list/list_content.tpl | 1 - .../themes/default/template/controllers/shop_url/index.php | 3 +-- .../default/template/controllers/slip/_print_pdf_icon.tpl | 1 - .../default/template/controllers/slip/helpers/form/form.tpl | 1 - .../default/template/controllers/slip/helpers/form/index.php | 3 +-- .../themes/default/template/controllers/slip/helpers/index.php | 3 +-- admin-dev/themes/default/template/controllers/slip/index.php | 3 +-- .../controllers/specific_price_rule/helpers/form/form.tpl | 1 - .../controllers/specific_price_rule/helpers/form/index.php | 3 +-- .../template/controllers/specific_price_rule/helpers/index.php | 3 +-- .../default/template/controllers/specific_price_rule/index.php | 3 +-- admin-dev/themes/default/template/controllers/states/index.php | 3 +-- .../themes/default/template/controllers/states/list_footer.tpl | 1 - .../themes/default/template/controllers/stats/calendar.tpl | 1 - .../themes/default/template/controllers/stats/engines.tpl | 1 - .../default/template/controllers/stats/helpers/index.php | 3 +-- .../default/template/controllers/stats/helpers/view/index.php | 3 +-- .../default/template/controllers/stats/helpers/view/view.tpl | 1 - admin-dev/themes/default/template/controllers/stats/index.php | 3 +-- admin-dev/themes/default/template/controllers/stats/menu.tpl | 1 - admin-dev/themes/default/template/controllers/stats/stats.tpl | 1 - .../template/controllers/statuses/helpers/form/form.tpl | 1 - .../template/controllers/statuses/helpers/form/index.php | 3 +-- .../default/template/controllers/statuses/helpers/index.php | 3 +-- .../themes/default/template/controllers/statuses/index.php | 3 +-- .../default/template/controllers/stock_cover/helpers/index.php | 3 +-- .../template/controllers/stock_cover/helpers/list/index.php | 3 +-- .../controllers/stock_cover/helpers/list/list_header.tpl | 1 - .../themes/default/template/controllers/stock_cover/index.php | 3 +-- .../template/controllers/stock_instant_state/helpers/index.php | 3 +-- .../controllers/stock_instant_state/helpers/list/index.php | 3 +-- .../stock_instant_state/helpers/list/list_header.tpl | 1 - .../default/template/controllers/stock_instant_state/index.php | 3 +-- .../default/template/controllers/stock_mvt/helpers/index.php | 3 +-- .../template/controllers/stock_mvt/helpers/list/index.php | 3 +-- .../controllers/stock_mvt/helpers/list/list_header.tpl | 1 - .../themes/default/template/controllers/stock_mvt/index.php | 3 +-- .../default/template/controllers/stores/helpers/form/form.tpl | 1 - .../default/template/controllers/stores/helpers/form/index.php | 3 +-- .../default/template/controllers/stores/helpers/index.php | 3 +-- .../template/controllers/stores/helpers/options/index.php | 3 +-- .../template/controllers/stores/helpers/options/options.tpl | 1 - admin-dev/themes/default/template/controllers/stores/index.php | 3 +-- .../default/template/controllers/suppliers/helpers/index.php | 3 +-- .../template/controllers/suppliers/helpers/view/index.php | 3 +-- .../template/controllers/suppliers/helpers/view/view.tpl | 1 - .../themes/default/template/controllers/suppliers/index.php | 3 +-- .../template/controllers/supply_orders/helpers/form/form.tpl | 1 - .../template/controllers/supply_orders/helpers/form/index.php | 3 +-- .../template/controllers/supply_orders/helpers/index.php | 3 +-- .../template/controllers/supply_orders/helpers/list/index.php | 3 +-- .../controllers/supply_orders/helpers/list/list_header.tpl | 1 - .../template/controllers/supply_orders/helpers/view/index.php | 3 +-- .../template/controllers/supply_orders/helpers/view/view.tpl | 1 - .../default/template/controllers/supply_orders/index.php | 3 +-- .../supply_orders_change_state/helpers/form/form.tpl | 1 - .../supply_orders_change_state/helpers/form/index.php | 3 +-- .../controllers/supply_orders_change_state/helpers/index.php | 3 +-- .../template/controllers/supply_orders_change_state/index.php | 3 +-- .../supply_orders_receipt_history/helpers/index.php | 3 +-- .../supply_orders_receipt_history/helpers/list/index.php | 3 +-- .../supply_orders_receipt_history/helpers/list/list_header.tpl | 1 - .../controllers/supply_orders_receipt_history/index.php | 3 +-- .../default/template/controllers/tags/helpers/form/form.tpl | 1 - .../default/template/controllers/tags/helpers/form/index.php | 3 +-- .../themes/default/template/controllers/tags/helpers/index.php | 3 +-- admin-dev/themes/default/template/controllers/tags/index.php | 3 +-- .../template/controllers/tax_rules/helpers/form/form.tpl | 1 - .../template/controllers/tax_rules/helpers/form/index.php | 3 +-- .../default/template/controllers/tax_rules/helpers/index.php | 3 +-- .../template/controllers/tax_rules/helpers/list/index.php | 3 +-- .../controllers/tax_rules/helpers/list/list_action_edit.tpl | 1 - .../controllers/tax_rules/helpers/list/list_content.tpl | 1 - .../controllers/tax_rules/helpers/list/list_header.tpl | 1 - .../themes/default/template/controllers/tax_rules/index.php | 3 +-- .../template/controllers/tax_rules_group/helpers/form/form.tpl | 1 - .../controllers/tax_rules_group/helpers/form/index.php | 3 +-- .../template/controllers/tax_rules_group/helpers/index.php | 3 +-- .../default/template/controllers/tax_rules_group/index.php | 3 +-- .../default/template/controllers/themes/helpers/index.php | 3 +-- .../template/controllers/themes/helpers/options/index.php | 3 +-- .../template/controllers/themes/helpers/options/options.tpl | 1 - admin-dev/themes/default/template/controllers/themes/index.php | 3 +-- .../default/template/controllers/tracking/helpers/index.php | 3 +-- .../template/controllers/tracking/helpers/list/index.php | 3 +-- .../template/controllers/tracking/helpers/list/list_header.tpl | 1 - .../themes/default/template/controllers/tracking/index.php | 3 +-- .../template/controllers/translations/auto_translate.tpl | 1 - .../template/controllers/translations/helpers/index.php | 3 +-- .../template/controllers/translations/helpers/view/index.php | 3 +-- .../template/controllers/translations/helpers/view/main.tpl | 1 - .../translations/helpers/view/translation_errors.tpl | 1 - .../controllers/translations/helpers/view/translation_form.tpl | 1 - .../translations/helpers/view/translation_mails.tpl | 1 - .../translations/helpers/view/translation_modules.tpl | 1 - .../themes/default/template/controllers/translations/index.php | 3 +-- .../default/template/controllers/warehouses/helpers/index.php | 3 +-- .../template/controllers/warehouses/helpers/view/index.php | 3 +-- .../template/controllers/warehouses/helpers/view/view.tpl | 1 - .../themes/default/template/controllers/warehouses/index.php | 3 +-- .../template/controllers/webservice/helpers/form/form.tpl | 1 - .../template/controllers/webservice/helpers/form/index.php | 3 +-- .../default/template/controllers/webservice/helpers/index.php | 3 +-- .../themes/default/template/controllers/webservice/index.php | 3 +-- admin-dev/themes/default/template/footer.tpl | 1 - admin-dev/themes/default/template/form_submit_ajax.tpl | 1 - admin-dev/themes/default/template/header.tpl | 1 - admin-dev/themes/default/template/helpers/form/assoshop.tpl | 1 - admin-dev/themes/default/template/helpers/form/form.tpl | 1 - .../themes/default/template/helpers/form/form_category.tpl | 1 - admin-dev/themes/default/template/helpers/form/form_group.tpl | 1 - admin-dev/themes/default/template/helpers/form/index.php | 3 +-- .../themes/default/template/helpers/help_access/index.php | 3 +-- admin-dev/themes/default/template/helpers/index.php | 3 +-- admin-dev/themes/default/template/helpers/list/index.php | 3 +-- admin-dev/themes/default/template/helpers/list/list.tpl | 1 - .../default/template/helpers/list/list_action_addstock.tpl | 1 - .../default/template/helpers/list/list_action_default.tpl | 1 - .../default/template/helpers/list/list_action_delete.tpl | 1 - .../default/template/helpers/list/list_action_details.tpl | 1 - .../default/template/helpers/list/list_action_duplicate.tpl | 1 - .../themes/default/template/helpers/list/list_action_edit.tpl | 1 - .../default/template/helpers/list/list_action_enable.tpl | 1 - .../default/template/helpers/list/list_action_removestock.tpl | 1 - .../helpers/list/list_action_supplier_order_receipt.tpl | 1 - .../helpers/list/list_action_supply_order_change_state.tpl | 1 - .../list/list_action_supply_order_create_from_template.tpl | 1 - .../template/helpers/list/list_action_supply_order_receipt.tpl | 1 - .../template/helpers/list/list_action_transferstock.tpl | 1 - .../themes/default/template/helpers/list/list_action_view.tpl | 1 - .../themes/default/template/helpers/list/list_content.tpl | 1 - admin-dev/themes/default/template/helpers/list/list_footer.tpl | 1 - admin-dev/themes/default/template/helpers/list/list_header.tpl | 1 - admin-dev/themes/default/template/helpers/options/index.php | 3 +-- admin-dev/themes/default/template/helpers/options/options.tpl | 1 - admin-dev/themes/default/template/helpers/required_fields.tpl | 1 - admin-dev/themes/default/template/helpers/view/index.php | 3 +-- admin-dev/themes/default/template/helpers/view/view.tpl | 1 - admin-dev/themes/default/template/index.php | 1 - admin-dev/themes/default/template/invalid_token.tpl | 1 - admin-dev/themes/default/template/layout-ajax.tpl | 1 - admin-dev/themes/default/template/layout.tpl | 1 - admin-dev/themes/default/template/toolbar.tpl | 1 - admin-dev/themes/index.php | 1 - admin-dev/uploadProductFile.php | 1 - admin-dev/uploadProductFileAttribute.php | 3 +-- attachment.php | 1 - authentication.php | 1 - best-sales.php | 1 - cache/cachefs/index.php | 1 - cache/index.php | 1 - cart.php | 1 - category.php | 1 - changecurrency.php | 1 - classes/Address.php | 1 - classes/AddressFormat.php | 1 - classes/AdminTab.php | 1 - classes/Alias.php | 1 - classes/Attachment.php | 1 - classes/Attribute.php | 1 - classes/AttributeGroup.php | 1 - classes/Autoload.php | 1 - classes/Backup.php | 1 - classes/Blowfish.php | 1 - classes/CMS.php | 1 - classes/CMSCategory.php | 1 - classes/CSV.php | 1 - classes/Carrier.php | 1 - classes/Cart.php | 1 - classes/CartRule.php | 1 - classes/Category.php | 1 - classes/Chart.php | 1 - classes/Collection.php | 1 - classes/Combination.php | 1 - classes/CompareProduct.php | 3 +-- classes/Configuration.php | 1 - classes/ConfigurationTest.php | 1 - classes/Connection.php | 1 - classes/ConnectionsSource.php | 1 - classes/Contact.php | 1 - classes/Context.php | 1 - classes/ControllerFactory.php | 1 - classes/Cookie.php | 1 - classes/Country.php | 1 - classes/County.php | 1 - classes/Currency.php | 1 - classes/Customer.php | 1 - classes/CustomerMessage.php | 1 - classes/CustomerThread.php | 1 - classes/Customization.php | 1 - classes/DateRange.php | 1 - classes/Delivery.php | 1 - classes/Discount.php | 1 - classes/Dispatcher.php | 1 - classes/Employee.php | 1 - classes/Feature.php | 1 - classes/FeatureValue.php | 1 - classes/FileUploader.php | 1 - classes/Gender.php | 1 - classes/Group.php | 1 - classes/GroupReduction.php | 1 - classes/Guest.php | 1 - classes/HelpAccess.php | 1 - classes/Hook.php | 1 - classes/Image.php | 1 - classes/ImageManager.php | 1 - classes/ImageType.php | 1 - classes/Language.php | 1 - classes/Link.php | 1 - classes/LocalizationPack.php | 1 - classes/Logger.php | 1 - classes/Mail.php | 1 - classes/Manufacturer.php | 1 - classes/Media.php | 1 - classes/Message.php | 1 - classes/Meta.php | 1 - classes/Notification.php | 3 +-- classes/ObjectModel.php | 1 - classes/Pack.php | 1 - classes/Page.php | 1 - classes/PaymentCC.php | 1 - classes/PaymentModule.php | 1 - classes/Product.php | 1 - classes/ProductDownload.php | 1 - classes/ProductSale.php | 1 - classes/ProductSupplier.php | 1 - classes/Profile.php | 1 - classes/QuickAccess.php | 1 - classes/Referrer.php | 1 - classes/RequestSql.php | 1 - classes/Rijndael.php | 1 - classes/Risk.php | 1 - classes/Scene.php | 1 - classes/Search.php | 1 - classes/SearchEngine.php | 1 - classes/SpecificPrice.php | 1 - classes/SpecificPriceRule.php | 1 - classes/State.php | 1 - classes/Store.php | 1 - classes/Supplier.php | 1 - classes/Tab.php | 1 - classes/Tag.php | 1 - classes/Theme.php | 1 - classes/Tools.php | 1 - classes/Translate.php | 1 - classes/TranslatedConfiguration.php | 1 - classes/Upgrader.php | 1 - classes/Validate.php | 1 - classes/Zone.php | 1 - classes/cache/Cache.php | 1 - classes/cache/CacheApc.php | 1 - classes/cache/CacheFs.php | 1 - classes/cache/CacheMemcache.php | 1 - classes/cache/CacheXcache.php | 1 - classes/cache/index.php | 3 +-- classes/controller/AdminController.php | 1 - classes/controller/Controller.php | 1 - classes/controller/FrontController.php | 1 - classes/controller/ModuleAdminController.php | 1 - classes/controller/ModuleFrontController.php | 1 - classes/controller/index.php | 3 +-- classes/db/Db.php | 1 - classes/db/DbMySQLi.php | 1 - classes/db/DbPDO.php | 3 +-- classes/db/DbQuery.php | 1 - classes/db/MySQL.php | 1 - classes/db/index.php | 3 +-- classes/exception/PrestaShopDatabaseException.php | 1 - classes/exception/PrestaShopException.php | 3 +-- classes/exception/PrestaShopModuleException.php | 1 - classes/exception/PrestaShopPaymentException.php | 1 - classes/exception/index.php | 1 - classes/helper/Helper.php | 1 - classes/helper/HelperForm.php | 1 - classes/helper/HelperHelpAccess.php | 1 - classes/helper/HelperList.php | 1 - classes/helper/HelperOptions.php | 1 - classes/helper/HelperView.php | 1 - classes/helper/index.php | 3 +-- classes/index.php | 1 - classes/log/AbstractLogger.php | 1 - classes/log/FileLogger.php | 1 - classes/log/index.php | 3 +-- classes/module/CarrierModule.php | 1 - classes/module/Module.php | 1 - classes/module/ModuleGraph.php | 1 - classes/module/ModuleGraphEngine.php | 1 - classes/module/ModuleGrid.php | 1 - classes/module/ModuleGridEngine.php | 1 - classes/module/index.php | 3 +-- classes/order/Order.php | 1 - classes/order/OrderCarrier.php | 1 - classes/order/OrderCartRule.php | 1 - classes/order/OrderDetail.php | 1 - classes/order/OrderDiscount.php | 1 - classes/order/OrderHistory.php | 1 - classes/order/OrderInvoice.php | 1 - classes/order/OrderMessage.php | 1 - classes/order/OrderPayment.php | 1 - classes/order/OrderReturn.php | 1 - classes/order/OrderReturnState.php | 1 - classes/order/OrderSlip.php | 1 - classes/order/OrderState.php | 1 - classes/order/index.php | 3 +-- classes/pdf/HTMLTemplate.php | 1 - classes/pdf/HTMLTemplateDeliverySlip.php | 1 - classes/pdf/HTMLTemplateInvoice.php | 1 - classes/pdf/HTMLTemplateOrderReturn.php | 1 - classes/pdf/HTMLTemplateSupplyOrderForm.php | 1 - classes/pdf/PDF.php | 1 - classes/pdf/PDFGenerator.php | 1 - classes/pdf/index.php | 3 +-- classes/range/RangePrice.php | 1 - classes/range/RangeWeight.php | 1 - classes/range/index.php | 3 +-- classes/shop/Shop.php | 1 - classes/shop/ShopGroup.php | 1 - classes/shop/ShopUrl.php | 1 - classes/shop/index.php | 3 +-- classes/stock/Stock.php | 1 - classes/stock/StockAvailable.php | 1 - classes/stock/StockManager.php | 1 - classes/stock/StockManagerFactory.php | 1 - classes/stock/StockManagerInterface.php | 1 - classes/stock/StockManagerModule.php | 1 - classes/stock/StockMvt.php | 1 - classes/stock/StockMvtReason.php | 1 - classes/stock/StockMvtWS.php | 1 - classes/stock/SupplyOrder.php | 1 - classes/stock/SupplyOrderDetail.php | 1 - classes/stock/SupplyOrderHistory.php | 1 - classes/stock/SupplyOrderReceiptHistory.php | 1 - classes/stock/SupplyOrderState.php | 1 - classes/stock/Warehouse.php | 1 - classes/stock/WarehouseProductLocation.php | 1 - classes/stock/index.php | 3 +-- classes/tax/Tax.php | 1 - classes/tax/TaxCalculator.php | 1 - classes/tax/TaxManagerFactory.php | 1 - classes/tax/TaxManagerInterface.php | 1 - classes/tax/TaxManagerModule.php | 1 - classes/tax/TaxRule.php | 1 - classes/tax/TaxRulesGroup.php | 1 - classes/tax/TaxRulesTaxManager.php | 1 - classes/tax/index.php | 3 +-- classes/webservice/WebserviceException.php | 1 - classes/webservice/WebserviceKey.php | 1 - classes/webservice/WebserviceOutputBuilder.php | 1 - classes/webservice/WebserviceOutputInterface.php | 1 - classes/webservice/WebserviceOutputXML.php | 1 - classes/webservice/WebserviceRequest.php | 1 - classes/webservice/WebserviceSpecificManagementImages.php | 1 - classes/webservice/WebserviceSpecificManagementInterface.php | 1 - classes/webservice/WebserviceSpecificManagementSearch.php | 1 - classes/webservice/index.php | 3 +-- cms.php | 1 - config/alias.php | 1 - config/autoload.php | 1 - config/config.inc.php | 1 - config/defines.inc.php | 1 - config/defines_uri.inc.php | 1 - config/index.php | 1 - config/smarty.config.inc.php | 1 - config/smartyadmin.config.inc.php | 1 - config/smartyfront.config.inc.php | 1 - config/xml/index.php | 1 - contact-form.php | 1 - controllers/admin/AdminAccessController.php | 1 - controllers/admin/AdminAddonsCatalogController.php | 1 - controllers/admin/AdminAddressesController.php | 1 - controllers/admin/AdminAdminPreferencesController.php | 1 - controllers/admin/AdminAttachmentsController.php | 1 - controllers/admin/AdminAttributeGeneratorController.php | 1 - controllers/admin/AdminAttributesGroupsController.php | 1 - controllers/admin/AdminBackupController.php | 1 - controllers/admin/AdminCarriersController.php | 1 - controllers/admin/AdminCartRulesController.php | 1 - controllers/admin/AdminCartsController.php | 1 - controllers/admin/AdminCategoriesController.php | 1 - controllers/admin/AdminCmsCategoriesController.php | 1 - controllers/admin/AdminCmsContentController.php | 1 - controllers/admin/AdminCmsController.php | 1 - controllers/admin/AdminContactsController.php | 1 - controllers/admin/AdminCountriesController.php | 1 - controllers/admin/AdminCurrenciesController.php | 1 - controllers/admin/AdminCustomerPreferencesController.php | 1 - controllers/admin/AdminCustomerThreadsController.php | 1 - controllers/admin/AdminCustomersController.php | 1 - controllers/admin/AdminDeliverySlipController.php | 1 - controllers/admin/AdminEmailsController.php | 1 - controllers/admin/AdminEmployeesController.php | 1 - controllers/admin/AdminFeaturesController.php | 1 - controllers/admin/AdminGendersController.php | 1 - controllers/admin/AdminGeolocationController.php | 1 - controllers/admin/AdminGroupsController.php | 1 - controllers/admin/AdminHomeController.php | 1 - controllers/admin/AdminImagesController.php | 1 - controllers/admin/AdminImportController.php | 1 - controllers/admin/AdminInformationController.php | 1 - controllers/admin/AdminInvoicesController.php | 1 - controllers/admin/AdminLanguagesController.php | 1 - controllers/admin/AdminLocalizationController.php | 1 - controllers/admin/AdminLoginController.php | 1 - controllers/admin/AdminLogsController.php | 1 - controllers/admin/AdminMaintenanceController.php | 1 - controllers/admin/AdminManufacturersController.php | 1 - controllers/admin/AdminMetaController.php | 1 - controllers/admin/AdminModulesController.php | 1 - controllers/admin/AdminModulesPositionsController.php | 1 - controllers/admin/AdminOrderMessageController.php | 1 - controllers/admin/AdminOrderPreferencesController.php | 1 - controllers/admin/AdminOrdersController.php | 1 - controllers/admin/AdminOutstandingController.php | 1 - controllers/admin/AdminPPreferencesController.php | 1 - controllers/admin/AdminPaymentController.php | 1 - controllers/admin/AdminPdfController.php | 1 - controllers/admin/AdminPerformanceController.php | 1 - controllers/admin/AdminPreferencesController.php | 1 - controllers/admin/AdminProductsController.php | 1 - controllers/admin/AdminProfilesController.php | 1 - controllers/admin/AdminQuickAccessesController.php | 1 - controllers/admin/AdminRangePriceController.php | 1 - controllers/admin/AdminRangeWeightController.php | 1 - controllers/admin/AdminReferrersController.php | 1 - controllers/admin/AdminRequestSqlController.php | 1 - controllers/admin/AdminReturnController.php | 1 - controllers/admin/AdminScenesController.php | 1 - controllers/admin/AdminSearchConfController.php | 1 - controllers/admin/AdminSearchController.php | 1 - controllers/admin/AdminSearchEnginesController.php | 1 - controllers/admin/AdminShippingController.php | 1 - controllers/admin/AdminShopController.php | 1 - controllers/admin/AdminShopGroupController.php | 1 - controllers/admin/AdminShopUrlController.php | 1 - controllers/admin/AdminSlipController.php | 1 - controllers/admin/AdminSpecificPriceRuleController.php | 1 - controllers/admin/AdminStatesController.php | 1 - controllers/admin/AdminStatsController.php | 1 - controllers/admin/AdminStatsTabController.php | 1 - controllers/admin/AdminStatusesController.php | 1 - controllers/admin/AdminStockConfigurationController.php | 1 - controllers/admin/AdminStockCoverController.php | 1 - controllers/admin/AdminStockInstantStateController.php | 1 - controllers/admin/AdminStockManagementController.php | 1 - controllers/admin/AdminStockMvtController.php | 1 - controllers/admin/AdminStoresController.php | 1 - controllers/admin/AdminSuppliersController.php | 1 - controllers/admin/AdminSupplyOrdersController.php | 1 - controllers/admin/AdminTabsController.php | 1 - controllers/admin/AdminTagsController.php | 1 - controllers/admin/AdminTaxRulesGroupController.php | 1 - controllers/admin/AdminTaxesController.php | 1 - controllers/admin/AdminThemesController.php | 1 - controllers/admin/AdminTrackingController.php | 1 - controllers/admin/AdminTranslationsController.php | 1 - controllers/admin/AdminWarehousesController.php | 1 - controllers/admin/AdminWebserviceController.php | 1 - controllers/admin/AdminZonesController.php | 1 - controllers/admin/index.php | 3 +-- controllers/front/AddressController.php | 1 - controllers/front/AddressesController.php | 1 - controllers/front/AttachmentController.php | 1 - controllers/front/AuthController.php | 1 - controllers/front/BestSalesController.php | 1 - controllers/front/CartController.php | 1 - controllers/front/CategoryController.php | 1 - controllers/front/ChangeCurrencyController.php | 1 - controllers/front/CmsController.php | 1 - controllers/front/CompareController.php | 1 - controllers/front/ContactController.php | 1 - controllers/front/DiscountController.php | 1 - controllers/front/GetFileController.php | 1 - controllers/front/GuestTrackingController.php | 1 - controllers/front/HistoryController.php | 1 - controllers/front/IdentityController.php | 1 - controllers/front/IndexController.php | 1 - controllers/front/ManufacturerController.php | 1 - controllers/front/MyAccountController.php | 1 - controllers/front/NewProductsController.php | 1 - controllers/front/OrderConfirmationController.php | 1 - controllers/front/OrderController.php | 1 - controllers/front/OrderDetailController.php | 1 - controllers/front/OrderFollowController.php | 1 - controllers/front/OrderOpcController.php | 1 - controllers/front/OrderReturnController.php | 1 - controllers/front/OrderSlipController.php | 1 - controllers/front/PageNotFoundController.php | 1 - controllers/front/ParentOrderController.php | 1 - controllers/front/PasswordController.php | 1 - controllers/front/PdfInvoiceController.php | 1 - controllers/front/PdfOrderReturnController.php | 1 - controllers/front/PdfOrderSlipController.php | 1 - controllers/front/PricesDropController.php | 1 - controllers/front/ProductController.php | 1 - controllers/front/SearchController.php | 1 - controllers/front/SitemapController.php | 1 - controllers/front/StatisticsController.php | 1 - controllers/front/StoresController.php | 1 - controllers/front/SupplierController.php | 1 - controllers/front/index.php | 1 - controllers/index.php | 1 - css/index.php | 1 - discount.php | 1 - docs/csv_import/index.php | 1 - docs/dev/index.php | 1 - docs/index.php | 1 - docs/licences/index.php | 1 - footer.php | 1 - get-file.php | 1 - guest-tracking.php | 1 - header.php | 1 - history.php | 1 - identity.php | 1 - images.inc.php | 1 - img/admin/index.php | 1 - img/c/index.php | 1 - img/cms/index.php | 1 - img/co/index.php | 1 - img/genders/index.php | 1 - img/index.php | 1 - img/jquery-ui/index.php | 1 - img/l/index.php | 1 - img/m/index.php | 1 - img/os/index.php | 1 - img/p/index.php | 1 - img/s/index.php | 1 - img/scenes/index.php | 1 - img/scenes/thumbs/index.php | 1 - img/st/index.php | 1 - img/su/index.php | 1 - img/t/index.php | 1 - img/tmp/index.php | 1 - index.php | 1 - install-dev/classes/controllerHttp.php | 1 - install-dev/classes/exception.php | 1 - install-dev/classes/index.php | 3 +-- install-dev/classes/language.php | 1 - install-dev/classes/languages.php | 1 - install-dev/classes/model.php | 1 - install-dev/classes/session.php | 1 - install-dev/classes/simplexml.php | 1 - install-dev/classes/sqlLoader.php | 1 - install-dev/classes/xmlLoader.php | 1 - install-dev/controllers/console/index.php | 3 +-- install-dev/controllers/http/configure.php | 1 - install-dev/controllers/http/database.php | 1 - install-dev/controllers/http/index.php | 3 +-- install-dev/controllers/http/process.php | 1 - install-dev/controllers/http/system.php | 1 - install-dev/controllers/http/welcome.php | 1 - install-dev/controllers/index.php | 3 +-- install-dev/data/img/genders/index.php | 3 +-- install-dev/data/img/index.php | 3 +-- install-dev/data/img/os/index.php | 3 +-- install-dev/data/img/t/index.php | 3 +-- install-dev/data/index.php | 3 +-- install-dev/data/xml/index.php | 3 +-- install-dev/fixtures/apple/data/index.php | 3 +-- install-dev/fixtures/apple/img/c/index.php | 3 +-- install-dev/fixtures/apple/img/index.php | 3 +-- install-dev/fixtures/apple/img/m/index.php | 3 +-- install-dev/fixtures/apple/img/p/index.php | 3 +-- install-dev/fixtures/apple/img/scenes/index.php | 3 +-- install-dev/fixtures/apple/img/scenes/thumbs/index.php | 3 +-- install-dev/fixtures/apple/img/st/index.php | 3 +-- install-dev/fixtures/apple/img/su/index.php | 3 +-- install-dev/fixtures/apple/index.php | 3 +-- install-dev/fixtures/apple/install.php | 1 - install-dev/fixtures/apple/langs/br/data/index.php | 3 +-- install-dev/fixtures/apple/langs/br/index.php | 3 +-- install-dev/fixtures/apple/langs/de/data/index.php | 3 +-- install-dev/fixtures/apple/langs/de/index.php | 3 +-- install-dev/fixtures/apple/langs/en/data/index.php | 3 +-- install-dev/fixtures/apple/langs/en/index.php | 3 +-- install-dev/fixtures/apple/langs/es/data/index.php | 3 +-- install-dev/fixtures/apple/langs/es/index.php | 3 +-- install-dev/fixtures/apple/langs/fr/data/index.php | 3 +-- install-dev/fixtures/apple/langs/fr/index.php | 3 +-- install-dev/fixtures/apple/langs/index.php | 3 +-- install-dev/fixtures/apple/langs/it/data/index.php | 3 +-- install-dev/fixtures/apple/langs/it/index.php | 3 +-- install-dev/fixtures/index.php | 3 +-- install-dev/index.php | 1 - install-dev/init.php | 1 - install-dev/install_version.php | 1 - install-dev/langs/br/data/index.php | 3 +-- install-dev/langs/br/img/index.php | 3 +-- install-dev/langs/br/index.php | 3 +-- install-dev/langs/de/data/index.php | 3 +-- install-dev/langs/de/img/index.php | 3 +-- install-dev/langs/de/index.php | 3 +-- install-dev/langs/en/data/index.php | 3 +-- install-dev/langs/en/img/index.php | 3 +-- install-dev/langs/en/index.php | 3 +-- install-dev/langs/es/data/index.php | 3 +-- install-dev/langs/es/img/index.php | 3 +-- install-dev/langs/es/index.php | 3 +-- install-dev/langs/fr/data/index.php | 3 +-- install-dev/langs/fr/img/index.php | 3 +-- install-dev/langs/fr/index.php | 3 +-- install-dev/langs/index.php | 3 +-- install-dev/langs/it/data/index.php | 3 +-- install-dev/langs/it/img/index.php | 3 +-- install-dev/langs/it/index.php | 3 +-- install-dev/models/database.php | 1 - install-dev/models/index.php | 3 +-- install-dev/models/install.php | 1 - install-dev/models/mail.php | 1 - install-dev/models/system.php | 1 - install-dev/theme/img/index.php | 1 - install-dev/theme/index.php | 3 +-- install-dev/theme/js/index.php | 3 +-- install-dev/theme/js/jquery.chosen/index.php | 3 +-- install-dev/theme/views/index.php | 3 +-- install-dev/upgrade/classes/AbstractLogger.php | 1 - install-dev/upgrade/classes/AddConfToFile.php | 1 - install-dev/upgrade/classes/FileLogger.php | 1 - install-dev/upgrade/classes/ToolsInstall.php | 1 - install-dev/upgrade/classes/index.php | 3 +-- install-dev/upgrade/index.php | 3 +-- install-dev/upgrade/php/add_attribute_position.php | 1 - install-dev/upgrade/php/add_carrier_position.php | 1 - .../php/add_column_order_state_deleted_if_not_exists.php | 1 - .../upgrade/php/add_column_orders_reference_if_not_exists.php | 1 - .../upgrade/php/add_default_restrictions_modules_groups.php | 1 - install-dev/upgrade/php/add_feature_position.php | 1 - install-dev/upgrade/php/add_group_attribute_position.php | 1 - install-dev/upgrade/php/add_id_shop_to_shipper_lang_index.php | 1 - install-dev/upgrade/php/add_missing_columns_customer.php | 1 - install-dev/upgrade/php/add_missing_rewrite_value.php | 1 - .../upgrade/php/add_missing_shop_column_pagenotfound.php | 1 - install-dev/upgrade/php/add_module_to_hook.php | 1 - install-dev/upgrade/php/add_new_groups.php | 1 - install-dev/upgrade/php/add_new_tab.php | 1 - .../upgrade/php/add_order_reference_in_order_payment.php | 1 - install-dev/upgrade/php/add_order_state.php | 1 - .../upgrade/php/add_required_customization_field_flag.php | 1 - install-dev/upgrade/php/add_stock_tab.php | 1 - install-dev/upgrade/php/add_unknown_gender.php | 1 - install-dev/upgrade/php/alter_blocklink.php | 1 - install-dev/upgrade/php/alter_cms_block.php | 1 - install-dev/upgrade/php/alter_productcomments_guest_index.php | 1 - install-dev/upgrade/php/attribute_group_clean_combinations.php | 1 - install-dev/upgrade/php/blocknewsletter.php | 1 - install-dev/upgrade/php/blocknewsletter1530.php | 1 - install-dev/upgrade/php/category_product_index_unique.php | 1 - install-dev/upgrade/php/check_webservice_account_table.php | 1 - install-dev/upgrade/php/clean_category_product.php | 1 - install-dev/upgrade/php/cms_block.php | 1 - install-dev/upgrade/php/configuration_double_cleaner.php | 1 - install-dev/upgrade/php/convert_product_price.php | 1 - install-dev/upgrade/php/country_to_timezone.php | 1 - install-dev/upgrade/php/deactivate_custom_modules.php | 1 - install-dev/upgrade/php/delivery_number_set.php | 1 - install-dev/upgrade/php/drop_image_type_non_unique_index.php | 1 - install-dev/upgrade/php/ecotax_tax_application_fix.php | 1 - install-dev/upgrade/php/editorial_update.php | 1 - install-dev/upgrade/php/editorial_update_multishop.php | 1 - install-dev/upgrade/php/fix_cms_shop_1520.php | 1 - install-dev/upgrade/php/fix_unique_specific_price.php | 1 - install-dev/upgrade/php/generate_ntree.php | 1 - install-dev/upgrade/php/generate_tax_rules.php | 1 - install-dev/upgrade/php/gridextjs_deprecated.php | 1 - install-dev/upgrade/php/group_reduction_column_fix.php | 1 - install-dev/upgrade/php/hook_blocksearch_on_header.php | 1 - install-dev/upgrade/php/id_currency_country_fix.php | 1 - install-dev/upgrade/php/index.php | 1 - install-dev/upgrade/php/invoice_number_set.php | 1 - install-dev/upgrade/php/latin1_database_to_utf8.php | 1 - install-dev/upgrade/php/migrate_block_info_to_cms_block.php | 1 - install-dev/upgrade/php/migrate_orders.php | 1 - install-dev/upgrade/php/moduleReinstaller.php | 1 - install-dev/upgrade/php/module_blockwishlist_multishop.php | 1 - install-dev/upgrade/php/module_reinstall_blockmyaccount.php | 1 - install-dev/upgrade/php/module_reinstall_blocksearch.php | 1 - .../upgrade/php/p15010_drop_column_id_address_if_exists.php | 1 - install-dev/upgrade/php/p15012_add_missing_columns.php | 1 - install-dev/upgrade/php/p15013_add_missing_columns.php | 1 - install-dev/upgrade/php/p15014_add_missing_columns.php | 1 - .../php/p15014_copy_missing_images_tab_from_installer.php | 1 - install-dev/upgrade/php/p15014_upgrade_sekeywords.php | 1 - install-dev/upgrade/php/p15015_blockadvertising_extension.php | 1 - install-dev/upgrade/php/p15016_add_missing_columns.php | 1 - install-dev/upgrade/php/p15017_add_id_shop_to_primary_key.php | 1 - install-dev/upgrade/php/p15018_change_image_types.php | 1 - install-dev/upgrade/php/regenerate_level_depth.php | 1 - install-dev/upgrade/php/remove_duplicate_category_groups.php | 1 - install-dev/upgrade/php/remove_module_from_hook.php | 1 - install-dev/upgrade/php/reorderpositions.php | 1 - install-dev/upgrade/php/setAllGroupsOnHomeCategory.php | 1 - install-dev/upgrade/php/set_discount_category.php | 1 - install-dev/upgrade/php/set_payment_module.php | 1 - install-dev/upgrade/php/set_payment_module_group.php | 1 - install-dev/upgrade/php/shop_url.php | 1 - install-dev/upgrade/php/update_carrier_url.php | 1 - install-dev/upgrade/php/update_feature_detachable_cache.php | 1 - install-dev/upgrade/php/update_image_size_in_db.php | 1 - install-dev/upgrade/php/update_module_blocklayered.php | 1 - install-dev/upgrade/php/update_module_followup.php | 1 - install-dev/upgrade/php/update_module_loyalty.php | 1 - install-dev/upgrade/php/update_module_pagesnotfound.php | 1 - install-dev/upgrade/php/update_module_product_comments.php | 1 - install-dev/upgrade/php/update_modules_sql.php | 1 - install-dev/upgrade/php/update_order_canada.php | 1 - install-dev/upgrade/php/update_order_details.php | 1 - install-dev/upgrade/php/update_products_ecotax_v133.php | 1 - install-dev/upgrade/php/updateproductcomments.php | 1 - install-dev/upgrade/php/updatetabicon_from_11version.php | 1 - install-dev/upgrade/php/upgrade_cms_15.php | 1 - install-dev/upgrade/php/upgrade_cms_15_rename.php | 1 - install-dev/upgrade/sql/index.php | 1 - install-dev/upgrade/upgrade.php | 1 - js/admin-categories-tree.js | 1 - js/admin-dnd.js | 1 - js/admin-products.js | 1 - js/admin-scene-cropping.js | 1 - js/admin-translations.js | 1 - js/admin.js | 1 - js/adminImport.js | 1 - js/admin_order.js | 1 - js/ajax.js | 1 - js/attributesBack.js | 1 - js/checkLangPack.js | 1 - js/fileuploader.js | 1 - js/form.js | 1 - js/index.php | 1 - js/jquery/plugins/ajaxfileupload/index.php | 1 - js/jquery/plugins/alerts/images/index.php | 1 - js/jquery/plugins/alerts/index.php | 1 - js/jquery/plugins/autocomplete/index.php | 1 - js/jquery/plugins/chosen/index.php | 1 - js/jquery/plugins/cluetip/index.php | 1 - js/jquery/plugins/fancybox/images/index.php | 1 - js/jquery/plugins/fancybox/index.php | 1 - js/jquery/plugins/index.php | 1 - js/jquery/plugins/jgrowl/index.php | 1 - js/jquery/plugins/jqzoom/index.php | 1 - js/jquery/plugins/jstree/index.php | 1 - js/jquery/plugins/jstree/themes/apple/index.php | 1 - js/jquery/plugins/jstree/themes/classic/index.php | 1 - js/jquery/plugins/jstree/themes/default-rtl/index.php | 1 - js/jquery/plugins/jstree/themes/default/index.php | 1 - js/jquery/plugins/jstree/themes/index.php | 1 - js/jquery/plugins/tabpane/index.php | 1 - js/jquery/plugins/tagify/index.php | 1 - js/jquery/plugins/thickbox/index.php | 1 - js/jquery/plugins/timepicker/index.php | 1 - js/jquery/plugins/treeview-categories/images/index.php | 1 - js/jquery/plugins/treeview-categories/index.php | 1 - js/jquery/ui/i18n/index.php | 1 - js/jquery/ui/index.php | 1 - js/jquery/ui/themes/base/images/index.php | 1 - js/jquery/ui/themes/base/index.php | 1 - js/jquery/ui/themes/index.php | 1 - js/jquery/ui/themes/ui-lightness/images/index.php | 1 - js/jquery/ui/themes/ui-lightness/index.php | 1 - js/price.js | 1 - js/productTabsManager.js | 1 - js/sendMailTest.js | 1 - js/tiny_mce/index.php | 1 - js/tiny_mce/langs/index.php | 1 - js/tiny_mce/plugins/advhr/css/index.php | 1 - js/tiny_mce/plugins/advhr/index.php | 1 - js/tiny_mce/plugins/advhr/js/index.php | 1 - js/tiny_mce/plugins/advhr/langs/index.php | 1 - js/tiny_mce/plugins/advimage/css/index.php | 1 - js/tiny_mce/plugins/advimage/img/index.php | 1 - js/tiny_mce/plugins/advimage/index.php | 1 - js/tiny_mce/plugins/advimage/js/index.php | 1 - js/tiny_mce/plugins/advimage/langs/index.php | 1 - js/tiny_mce/plugins/advlink/css/index.php | 1 - js/tiny_mce/plugins/advlink/index.php | 1 - js/tiny_mce/plugins/advlink/js/index.php | 1 - js/tiny_mce/plugins/advlink/langs/index.php | 1 - js/tiny_mce/plugins/advlist/index.php | 1 - js/tiny_mce/plugins/autolink/index.php | 1 - js/tiny_mce/plugins/autoresize/index.php | 1 - js/tiny_mce/plugins/autosave/index.php | 1 - js/tiny_mce/plugins/autosave/langs/index.php | 1 - js/tiny_mce/plugins/bbcode/index.php | 1 - js/tiny_mce/plugins/contextmenu/index.php | 1 - js/tiny_mce/plugins/directionality/index.php | 1 - js/tiny_mce/plugins/emotions/img/index.php | 1 - js/tiny_mce/plugins/emotions/index.php | 1 - js/tiny_mce/plugins/emotions/js/index.php | 1 - js/tiny_mce/plugins/emotions/langs/index.php | 1 - js/tiny_mce/plugins/fullpage/css/index.php | 1 - js/tiny_mce/plugins/fullpage/index.php | 1 - js/tiny_mce/plugins/fullpage/js/index.php | 1 - js/tiny_mce/plugins/fullpage/langs/index.php | 1 - js/tiny_mce/plugins/fullscreen/index.php | 1 - js/tiny_mce/plugins/iespell/index.php | 1 - js/tiny_mce/plugins/index.php | 1 - js/tiny_mce/plugins/inlinepopups/index.php | 1 - .../plugins/inlinepopups/skins/clearlooks2/img/index.php | 1 - js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/index.php | 1 - js/tiny_mce/plugins/inlinepopups/skins/index.php | 1 - js/tiny_mce/plugins/insertdatetime/index.php | 1 - js/tiny_mce/plugins/layer/index.php | 1 - js/tiny_mce/plugins/legacyoutput/index.php | 1 - js/tiny_mce/plugins/lists/index.php | 1 - js/tiny_mce/plugins/media/css/index.php | 1 - js/tiny_mce/plugins/media/index.php | 1 - js/tiny_mce/plugins/media/js/index.php | 1 - js/tiny_mce/plugins/media/langs/index.php | 1 - js/tiny_mce/plugins/nonbreaking/index.php | 1 - js/tiny_mce/plugins/noneditable/index.php | 1 - js/tiny_mce/plugins/pagebreak/index.php | 1 - js/tiny_mce/plugins/paste/index.php | 1 - js/tiny_mce/plugins/paste/js/index.php | 1 - js/tiny_mce/plugins/paste/langs/index.php | 1 - js/tiny_mce/plugins/preview/index.php | 1 - js/tiny_mce/plugins/preview/jscripts/index.php | 1 - js/tiny_mce/plugins/print/index.php | 1 - js/tiny_mce/plugins/save/index.php | 1 - js/tiny_mce/plugins/searchreplace/css/index.php | 1 - js/tiny_mce/plugins/searchreplace/index.php | 1 - js/tiny_mce/plugins/searchreplace/js/index.php | 1 - js/tiny_mce/plugins/searchreplace/langs/index.php | 1 - js/tiny_mce/plugins/spellchecker/css/index.php | 1 - js/tiny_mce/plugins/spellchecker/img/index.php | 1 - js/tiny_mce/plugins/spellchecker/index.php | 1 - js/tiny_mce/plugins/style/css/index.php | 1 - js/tiny_mce/plugins/style/index.php | 1 - js/tiny_mce/plugins/style/js/index.php | 1 - js/tiny_mce/plugins/style/langs/index.php | 1 - js/tiny_mce/plugins/tabfocus/index.php | 1 - js/tiny_mce/plugins/table/css/index.php | 1 - js/tiny_mce/plugins/table/index.php | 1 - js/tiny_mce/plugins/table/js/index.php | 1 - js/tiny_mce/plugins/table/langs/index.php | 1 - js/tiny_mce/plugins/template/css/index.php | 1 - js/tiny_mce/plugins/template/index.php | 1 - js/tiny_mce/plugins/template/js/index.php | 1 - js/tiny_mce/plugins/template/langs/index.php | 1 - js/tiny_mce/plugins/visualchars/index.php | 1 - js/tiny_mce/plugins/wordcount/index.php | 1 - js/tiny_mce/plugins/xhtmlxtras/css/index.php | 1 - js/tiny_mce/plugins/xhtmlxtras/index.php | 1 - js/tiny_mce/plugins/xhtmlxtras/js/index.php | 1 - js/tiny_mce/plugins/xhtmlxtras/langs/index.php | 1 - js/tiny_mce/themes/advanced/img/index.php | 1 - js/tiny_mce/themes/advanced/index.php | 1 - js/tiny_mce/themes/advanced/js/index.php | 1 - js/tiny_mce/themes/advanced/langs/index.php | 1 - js/tiny_mce/themes/advanced/skins/cirkuit/img/index.php | 1 - js/tiny_mce/themes/advanced/skins/cirkuit/index.php | 1 - js/tiny_mce/themes/advanced/skins/default/img/index.php | 1 - js/tiny_mce/themes/advanced/skins/default/index.php | 1 - js/tiny_mce/themes/advanced/skins/highcontrast/index.php | 1 - js/tiny_mce/themes/advanced/skins/index.php | 1 - js/tiny_mce/themes/advanced/skins/o2k7/img/index.php | 1 - js/tiny_mce/themes/advanced/skins/o2k7/index.php | 1 - js/tiny_mce/themes/index.php | 1 - js/tiny_mce/utils/index.php | 1 - js/toggle.js | 1 - js/tools.js | 1 - localization/index.php | 1 - log/index.php | 1 - mails/de/index.php | 1 - mails/en/index.php | 1 - mails/en/lang.php | 1 - mails/es/index.php | 1 - mails/fr/index.php | 1 - mails/index.php | 1 - mails/it/index.php | 1 - manufacturer.php | 1 - modules/bankwire/bankwire.php | 1 - modules/bankwire/controllers/front/index.php | 3 +-- modules/bankwire/controllers/front/payment.php | 1 - modules/bankwire/controllers/front/validation.php | 1 - modules/bankwire/controllers/index.php | 3 +-- modules/bankwire/index.php | 1 - modules/bankwire/payment.php | 1 - modules/bankwire/translations/index.php | 1 - modules/bankwire/validation.php | 1 - modules/bankwire/views/index.php | 3 +-- modules/bankwire/views/templates/front/index.php | 3 +-- modules/bankwire/views/templates/front/payment_execution.tpl | 1 - modules/bankwire/views/templates/hook/index.php | 3 +-- modules/bankwire/views/templates/hook/payment.tpl | 1 - modules/bankwire/views/templates/hook/payment_return.tpl | 1 - modules/bankwire/views/templates/index.php | 3 +-- modules/blockadvertising/blockadvertising.php | 1 - modules/blockadvertising/blockadvertising.tpl | 1 - modules/blockadvertising/index.php | 1 - modules/blockadvertising/translations/index.php | 1 - modules/blockbestsellers/blockbestsellers-home.tpl | 1 - modules/blockbestsellers/blockbestsellers.php | 1 - modules/blockbestsellers/blockbestsellers.tpl | 3 +-- modules/blockbestsellers/img/index.php | 1 - modules/blockbestsellers/index.php | 1 - modules/blockbestsellers/translations/index.php | 1 - modules/blockcart/ajax-cart.js | 1 - modules/blockcart/blockcart-ajax.php | 1 - modules/blockcart/blockcart-json.tpl | 1 - modules/blockcart/blockcart-set-collapse.php | 1 - modules/blockcart/blockcart.php | 1 - modules/blockcart/blockcart.tpl | 1 - modules/blockcart/img/icon/index.php | 1 - modules/blockcart/img/index.php | 1 - modules/blockcart/index.php | 1 - modules/blockcart/translations/index.php | 1 - modules/blockcategories/blockcategories.php | 1 - modules/blockcategories/blockcategories.tpl | 1 - modules/blockcategories/blockcategories_footer.tpl | 1 - modules/blockcategories/category-tree-branch.tpl | 1 - modules/blockcategories/img/icon/index.php | 3 +-- modules/blockcategories/img/index.php | 3 +-- modules/blockcategories/index.php | 1 - modules/blockcategories/translations/index.php | 1 - modules/blockcms/BlockCMSModel.php | 1 - modules/blockcms/blockcms.tpl | 1 - modules/blockcms/img/index.php | 1 - modules/blockcms/index.php | 1 - modules/blockcms/translations/index.php | 1 - modules/blockcms/views/index.php | 1 - .../views/templates/admin/_configure/helpers/form/form.tpl | 1 - .../views/templates/admin/_configure/helpers/form/index.php | 1 - .../views/templates/admin/_configure/helpers/index.php | 1 - modules/blockcms/views/templates/admin/_configure/index.php | 1 - modules/blockcms/views/templates/admin/index.php | 1 - modules/blockcms/views/templates/index.php | 1 - modules/blockcontact/blockcontact.php | 3 +-- modules/blockcontact/blockcontact.tpl | 1 - modules/blockcontact/images/index.php | 1 - modules/blockcontact/img/index.php | 1 - modules/blockcontact/index.php | 3 +-- modules/blockcontact/translations/index.php | 1 - modules/blockcontactinfos/blockcontactinfos.php | 3 +-- modules/blockcontactinfos/blockcontactinfos.tpl | 3 +-- modules/blockcontactinfos/index.php | 3 +-- modules/blockcontactinfos/translations/index.php | 1 - modules/blockcurrencies/blockcurrencies.php | 1 - modules/blockcurrencies/blockcurrencies.tpl | 1 - modules/blockcurrencies/img/index.php | 1 - modules/blockcurrencies/index.php | 1 - modules/blockcurrencies/translations/index.php | 1 - modules/blockcustomerprivacy/blockcustomerprivacy.php | 3 +-- modules/blockcustomerprivacy/blockcustomerprivacy.tpl | 1 - modules/blockcustomerprivacy/index.php | 1 - modules/blockcustomerprivacy/translations/index.php | 1 - modules/blocklanguages/blocklanguages.php | 1 - modules/blocklanguages/blocklanguages.tpl | 1 - modules/blocklanguages/img/index.php | 1 - modules/blocklanguages/index.php | 1 - modules/blocklanguages/translations/index.php | 1 - modules/blocklayered/blocklayered-ajax-back.php | 3 +-- modules/blocklayered/blocklayered-ajax.php | 1 - modules/blocklayered/blocklayered-no-products.tpl | 1 - modules/blocklayered/blocklayered.js | 1 - modules/blocklayered/blocklayered.php | 1 - modules/blocklayered/blocklayered.tpl | 1 - modules/blocklayered/img/icon/index.php | 1 - modules/blocklayered/img/index.php | 1 - modules/blocklayered/index.php | 1 - modules/blocklink/blocklink.php | 1 - modules/blocklink/blocklink.tpl | 1 - modules/blocklink/img/index.php | 1 - modules/blocklink/index.php | 1 - modules/blocklink/translations/index.php | 1 - modules/blockmanufacturer/blockmanufacturer.php | 1 - modules/blockmanufacturer/blockmanufacturer.tpl | 1 - modules/blockmanufacturer/img/index.php | 1 - modules/blockmanufacturer/index.php | 1 - modules/blockmanufacturer/translations/index.php | 1 - modules/blockmyaccount/blockmyaccount.php | 1 - modules/blockmyaccount/blockmyaccount.tpl | 1 - modules/blockmyaccount/index.php | 1 - modules/blockmyaccount/translations/index.php | 1 - modules/blockmyaccountfooter/blockmyaccountfooter.php | 1 - modules/blockmyaccountfooter/blockmyaccountfooter.tpl | 1 - modules/blockmyaccountfooter/translations/index.php | 1 - modules/blocknewproducts/blocknewproducts.php | 1 - modules/blocknewproducts/blocknewproducts.tpl | 1 - modules/blocknewproducts/img/index.php | 1 - modules/blocknewproducts/index.php | 1 - modules/blocknewproducts/translations/index.php | 1 - modules/blocknewsletter/blocknewsletter.php | 1 - modules/blocknewsletter/controllers/front/index.php | 1 - modules/blocknewsletter/controllers/front/verification.php | 1 - modules/blocknewsletter/controllers/index.php | 1 - modules/blocknewsletter/img/icon/index.php | 1 - modules/blocknewsletter/img/index.php | 1 - modules/blocknewsletter/index.php | 1 - modules/blocknewsletter/mails/de/index.php | 1 - modules/blocknewsletter/mails/en/index.php | 1 - modules/blocknewsletter/mails/es/index.php | 1 - modules/blocknewsletter/mails/fr/index.php | 1 - modules/blocknewsletter/mails/index.php | 1 - modules/blocknewsletter/mails/it/index.php | 1 - modules/blocknewsletter/translations/index.php | 1 - modules/blocknewsletter/views/index.php | 1 - modules/blocknewsletter/views/templates/front/index.php | 1 - .../views/templates/front/verification_execution.tpl | 1 - .../blocknewsletter/views/templates/hook/blocknewsletter.tpl | 1 - modules/blocknewsletter/views/templates/hook/index.php | 1 - modules/blocknewsletter/views/templates/index.php | 1 - modules/blockpaymentlogo/blockpaymentlogo.php | 1 - modules/blockpaymentlogo/blockpaymentlogo.tpl | 1 - modules/blockpaymentlogo/index.php | 1 - modules/blockpaymentlogo/translations/index.php | 1 - modules/blockpermanentlinks/blockpermanentlinks-footer.tpl | 1 - modules/blockpermanentlinks/blockpermanentlinks-header.tpl | 1 - modules/blockpermanentlinks/blockpermanentlinks.php | 1 - modules/blockpermanentlinks/blockpermanentlinks.tpl | 1 - modules/blockpermanentlinks/img/index.php | 3 +-- modules/blockpermanentlinks/index.php | 1 - modules/blockpermanentlinks/translations/index.php | 1 - modules/blockreinsurance/blockreinsurance.php | 3 +-- modules/blockreinsurance/blockreinsurance.tpl | 1 - modules/blockreinsurance/img/index.php | 1 - modules/blockreinsurance/index.php | 3 +-- modules/blockreinsurance/reinsuranceClass.php | 1 - modules/blockreinsurance/translations/index.php | 1 - modules/blockrss/blockrss.php | 1 - modules/blockrss/blockrss.tpl | 1 - modules/blockrss/img/index.php | 3 +-- modules/blockrss/index.php | 1 - modules/blockrss/translations/index.php | 1 - modules/blocksearch/blocksearch-top.tpl | 1 - modules/blocksearch/blocksearch.php | 1 - modules/blocksearch/blocksearch.tpl | 1 - modules/blocksearch/img/index.php | 1 - modules/blocksearch/index.php | 1 - modules/blocksearch/translations/index.php | 1 - modules/blocksharefb/blocksharefb.php | 3 +-- modules/blocksharefb/blocksharefb.tpl | 3 +-- modules/blocksharefb/index.php | 3 +-- modules/blocksharefb/translations/index.php | 1 - modules/blocksocial/blocksocial.php | 3 +-- modules/blocksocial/blocksocial.tpl | 3 +-- modules/blocksocial/img/index.php | 1 - modules/blocksocial/index.php | 3 +-- modules/blocksocial/translations/index.php | 1 - modules/blockspecials/blockspecials.php | 1 - modules/blockspecials/blockspecials.tpl | 1 - modules/blockspecials/img/index.php | 1 - modules/blockspecials/index.php | 1 - modules/blockspecials/translations/index.php | 1 - modules/blockstore/blockstore.php | 1 - modules/blockstore/blockstore.tpl | 1 - modules/blockstore/index.php | 1 - modules/blockstore/translations/index.php | 1 - modules/blocksupplier/blocksupplier.php | 1 - modules/blocksupplier/blocksupplier.tpl | 1 - modules/blocksupplier/img/index.php | 1 - modules/blocksupplier/index.php | 1 - modules/blocksupplier/translations/index.php | 1 - modules/blocktags/blocktags.php | 1 - modules/blocktags/blocktags.tpl | 1 - modules/blocktags/index.php | 1 - modules/blocktags/translations/index.php | 1 - modules/blocktopmenu/blocktopmenu.php | 1 - modules/blocktopmenu/index.php | 1 - modules/blocktopmenu/menutoplinks.class.php | 1 - modules/blocktopmenu/translations/index.php | 1 - modules/blockuserinfo/blockuserinfo.php | 1 - modules/blockuserinfo/blockuserinfo.tpl | 1 - modules/blockuserinfo/img/icon/index.php | 1 - modules/blockuserinfo/img/index.php | 1 - modules/blockuserinfo/index.php | 1 - modules/blockuserinfo/translations/index.php | 1 - modules/blockviewed/blockviewed.php | 1 - modules/blockviewed/blockviewed.tpl | 1 - modules/blockviewed/index.php | 1 - modules/blockviewed/translations/index.php | 1 - modules/blockwishlist/WishList.php | 1 - modules/blockwishlist/blockwishlist-ajax.tpl | 1 - modules/blockwishlist/blockwishlist-extra.tpl | 1 - modules/blockwishlist/blockwishlist-header.tpl | 1 - modules/blockwishlist/blockwishlist.php | 1 - modules/blockwishlist/blockwishlist.tpl | 1 - modules/blockwishlist/buywishlistproduct.php | 1 - modules/blockwishlist/cart.php | 1 - modules/blockwishlist/controllers/front/index.php | 1 - modules/blockwishlist/controllers/front/mywishlist.php | 1 - modules/blockwishlist/controllers/index.php | 1 - modules/blockwishlist/img/icon/index.php | 1 - modules/blockwishlist/img/index.php | 1 - modules/blockwishlist/index.php | 1 - modules/blockwishlist/js/ajax-wishlist.js | 1 - modules/blockwishlist/js/index.php | 1 - modules/blockwishlist/mails/de/index.php | 1 - modules/blockwishlist/mails/en/index.php | 1 - modules/blockwishlist/mails/es/index.php | 1 - modules/blockwishlist/mails/fr/index.php | 1 - modules/blockwishlist/mails/index.php | 1 - modules/blockwishlist/mails/it/index.php | 1 - modules/blockwishlist/managewishlist.php | 1 - modules/blockwishlist/managewishlist.tpl | 1 - modules/blockwishlist/my-account.tpl | 1 - modules/blockwishlist/mywishlist.php | 1 - modules/blockwishlist/sendwishlist.php | 1 - modules/blockwishlist/translations/index.php | 1 - modules/blockwishlist/view.php | 1 - modules/blockwishlist/view.tpl | 1 - modules/blockwishlist/views/index.php | 1 - modules/blockwishlist/views/templates/front/index.php | 1 - modules/blockwishlist/views/templates/front/mywishlist.tpl | 1 - modules/blockwishlist/views/templates/index.php | 1 - modules/carriercompare/ajax.php | 1 - modules/carriercompare/carriercompare.js | 1 - modules/carriercompare/carriercompare.php | 1 - modules/carriercompare/carriercompare.tpl | 1 - modules/carriercompare/index.php | 1 - modules/carriercompare/template/carriercompare.tpl | 1 - modules/carriercompare/template/index.php | 1 - modules/carriercompare/translations/index.php | 1 - modules/cashondelivery/cashondelivery.php | 1 - modules/cashondelivery/controllers/front/index.php | 1 - modules/cashondelivery/controllers/front/validation.php | 1 - modules/cashondelivery/controllers/index.php | 1 - modules/cashondelivery/index.php | 1 - modules/cashondelivery/translations/index.php | 1 - modules/cashondelivery/views/index.php | 1 - modules/cashondelivery/views/templates/front/index.php | 1 - modules/cashondelivery/views/templates/front/validation.tpl | 1 - modules/cashondelivery/views/templates/hook/confirmation.tpl | 1 - modules/cashondelivery/views/templates/hook/index.php | 1 - modules/cashondelivery/views/templates/hook/payment.tpl | 1 - modules/cashondelivery/views/templates/index.php | 1 - modules/cheque/cheque.php | 1 - modules/cheque/controllers/front/index.php | 1 - modules/cheque/controllers/front/payment.php | 1 - modules/cheque/controllers/front/validation.php | 1 - modules/cheque/controllers/index.php | 1 - modules/cheque/index.php | 1 - modules/cheque/payment.php | 1 - modules/cheque/translations/index.php | 1 - modules/cheque/validation.php | 1 - modules/cheque/views/index.php | 1 - modules/cheque/views/templates/front/index.php | 1 - modules/cheque/views/templates/front/payment_execution.tpl | 1 - modules/cheque/views/templates/hook/index.php | 1 - modules/cheque/views/templates/hook/payment.tpl | 1 - modules/cheque/views/templates/hook/payment_return.tpl | 1 - modules/cheque/views/templates/index.php | 1 - modules/crossselling/crossselling.php | 1 - modules/crossselling/crossselling.tpl | 1 - modules/crossselling/index.php | 1 - modules/crossselling/js/crossselling.js | 1 - modules/crossselling/js/index.php | 1 - modules/crossselling/translations/index.php | 1 - modules/dateofdelivery/beforeCarrier.tpl | 1 - modules/dateofdelivery/dateofdelivery.php | 1 - modules/dateofdelivery/img/index.php | 1 - modules/dateofdelivery/index.php | 1 - modules/dateofdelivery/orderDetail.tpl | 1 - modules/dateofdelivery/translations/index.php | 1 - modules/editorial/EditorialClass.php | 1 - modules/editorial/editorial.php | 1 - modules/editorial/editorial.tpl | 1 - modules/editorial/index.php | 1 - modules/editorial/translations/index.php | 1 - modules/favoriteproducts/FavoriteProduct.php | 1 - modules/favoriteproducts/controllers/front/account.php | 1 - modules/favoriteproducts/controllers/front/actions.php | 1 - modules/favoriteproducts/controllers/front/index.php | 1 - modules/favoriteproducts/controllers/index.php | 1 - modules/favoriteproducts/favoriteproducts-account.php | 1 - modules/favoriteproducts/favoriteproducts-ajax.php | 1 - modules/favoriteproducts/favoriteproducts.php | 1 - modules/favoriteproducts/img/index.php | 1 - modules/favoriteproducts/index.php | 1 - modules/favoriteproducts/translations/index.php | 1 - modules/favoriteproducts/views/index.php | 1 - .../views/templates/front/favoriteproducts-account.tpl | 1 - modules/favoriteproducts/views/templates/front/index.php | 1 - .../views/templates/hook/favoriteproducts-extra.tpl | 1 - .../views/templates/hook/favoriteproducts-header.tpl | 1 - modules/favoriteproducts/views/templates/hook/index.php | 1 - modules/favoriteproducts/views/templates/hook/my-account.tpl | 1 - modules/favoriteproducts/views/templates/index.php | 1 - modules/feeder/feeder.php | 1 - modules/feeder/feederHeader.tpl | 1 - modules/feeder/index.php | 1 - modules/feeder/rss.php | 1 - modules/feeder/translations/index.php | 1 - modules/followup/cron.php | 1 - modules/followup/followup.php | 1 - modules/followup/index.php | 1 - modules/followup/mails/de/index.php | 1 - modules/followup/mails/en/index.php | 1 - modules/followup/mails/es/index.php | 1 - modules/followup/mails/fr/index.php | 1 - modules/followup/mails/index.php | 1 - modules/followup/mails/it/index.php | 1 - modules/followup/translations/index.php | 1 - modules/graphartichow/artichow/cache/index.php | 1 - modules/graphartichow/artichow/font/index.php | 1 - modules/graphartichow/artichow/images/errors/index.php | 1 - modules/graphartichow/artichow/images/index.php | 1 - modules/graphartichow/artichow/inc/drivers/index.php | 1 - modules/graphartichow/artichow/inc/index.php | 1 - modules/graphartichow/artichow/index.php | 1 - modules/graphartichow/artichow/patterns/index.php | 1 - modules/graphartichow/graphartichow.php | 1 - modules/graphartichow/index.php | 1 - modules/graphartichow/translations/index.php | 1 - modules/graphgooglechart/graphgooglechart.php | 1 - modules/graphgooglechart/index.php | 1 - modules/graphgooglechart/translations/index.php | 1 - modules/graphvisifire/graphvisifire.php | 1 - modules/graphvisifire/index.php | 1 - modules/graphvisifire/translations/index.php | 1 - modules/graphvisifire/visifire/index.php | 1 - modules/graphxmlswfcharts/graphxmlswfcharts.php | 1 - modules/graphxmlswfcharts/index.php | 1 - modules/graphxmlswfcharts/translations/index.php | 1 - .../graphxmlswfcharts/xml_swf_charts/charts_library/index.php | 1 - modules/graphxmlswfcharts/xml_swf_charts/index.php | 1 - modules/gridhtml/gridhtml.php | 1 - modules/gridhtml/index.php | 1 - modules/gridhtml/translations/index.php | 1 - modules/gsitemap/gsitemap.php | 1 - modules/gsitemap/index.php | 1 - modules/gsitemap/translations/index.php | 1 - modules/homefeatured/homefeatured.php | 1 - modules/homefeatured/homefeatured.tpl | 1 - modules/homefeatured/img/index.php | 1 - modules/homefeatured/index.php | 1 - modules/homefeatured/translations/index.php | 1 - modules/homeslider/ajax_homeslider.php | 1 - modules/homeslider/images/index.php | 1 - modules/homeslider/js/index.php | 1 - modules/homeslider/translations/index.php | 1 - modules/importerosc/translations/index.php | 1 - modules/index.php | 1 - modules/loyalty/LoyaltyModule.php | 1 - modules/loyalty/LoyaltyStateModule.php | 1 - modules/loyalty/controllers/front/index.php | 1 - modules/loyalty/controllers/index.php | 1 - modules/loyalty/images/index.php | 1 - modules/loyalty/loyalty-program.php | 1 - modules/loyalty/loyalty.php | 1 - modules/loyalty/translations/index.php | 1 - modules/loyalty/views/index.php | 1 - modules/loyalty/views/templates/front/index.php | 1 - modules/loyalty/views/templates/front/loyalty.tpl | 1 - modules/loyalty/views/templates/hook/index.php | 1 - modules/loyalty/views/templates/hook/my-account.tpl | 1 - modules/loyalty/views/templates/hook/product.tpl | 1 - modules/loyalty/views/templates/hook/shopping-cart.tpl | 1 - modules/loyalty/views/templates/index.php | 1 - modules/mailalerts/MailAlert.php | 1 - modules/mailalerts/controllers/front/index.php | 1 - modules/mailalerts/controllers/index.php | 1 - modules/mailalerts/mailalerts-account.php | 1 - modules/mailalerts/mailalerts-ajax.php | 1 - modules/mailalerts/mailalerts-extra.php | 1 - modules/mailalerts/mailalerts.php | 1 - modules/mailalerts/translations/index.php | 1 - modules/mailalerts/views/index.php | 1 - modules/mailalerts/views/templates/front/index.php | 1 - .../mailalerts/views/templates/front/mailalerts-account.tpl | 1 - modules/mailalerts/views/templates/hook/index.php | 1 - modules/mailalerts/views/templates/hook/my-account.tpl | 1 - modules/mailalerts/views/templates/index.php | 1 - modules/newsletter/newsletter.php | 1 - modules/newsletter/translations/index.php | 1 - modules/pagesnotfound/pagesnotfound.php | 1 - modules/pagesnotfound/translations/index.php | 1 - modules/productcomments/ProductComment.php | 1 - modules/productcomments/ProductCommentCriterion.php | 1 - modules/productcomments/ProductCriterion.php | 1 - modules/productcomments/controllers/front/default.php | 1 - modules/productcomments/controllers/front/index.php | 1 - modules/productcomments/controllers/index.php | 1 - modules/productcomments/js/moderate.js | 1 - modules/productcomments/js/productCriterion.js | 1 - modules/productcomments/js/products-comparison.js | 1 - modules/productcomments/productcomments.php | 1 - modules/productcomments/productcomments.tpl | 1 - modules/productcomments/productcommentscriterion.php | 1 - modules/productcomments/products-comparison.tpl | 1 - modules/productcomments/tab.tpl | 1 - modules/productcomments/translations/index.php | 1 - modules/productscategory/productscategory.js | 1 - modules/productscategory/productscategory.php | 1 - modules/productscategory/productscategory.tpl | 1 - modules/productscategory/translations/index.php | 1 - modules/producttooltip/producttooltip.php | 1 - modules/producttooltip/producttooltip.tpl | 1 - modules/producttooltip/translations/index.php | 1 - modules/referralprogram/ReferralProgramModule.php | 1 - modules/referralprogram/controllers/front/email.php | 1 - modules/referralprogram/controllers/front/index.php | 1 - modules/referralprogram/controllers/front/program.php | 1 - modules/referralprogram/controllers/front/rules.php | 1 - modules/referralprogram/controllers/index.php | 1 - modules/referralprogram/referralprogram.php | 1 - modules/referralprogram/translations/index.php | 1 - modules/referralprogram/views/index.php | 1 - modules/referralprogram/views/templates/front/email.tpl | 1 - modules/referralprogram/views/templates/front/index.php | 1 - modules/referralprogram/views/templates/front/program.tpl | 1 - modules/referralprogram/views/templates/front/rules.tpl | 1 - .../referralprogram/views/templates/hook/authentication.tpl | 1 - modules/referralprogram/views/templates/hook/index.php | 1 - modules/referralprogram/views/templates/hook/my-account.tpl | 1 - .../views/templates/hook/order-confirmation.tpl | 1 - modules/referralprogram/views/templates/hook/shopping-cart.tpl | 1 - modules/referralprogram/views/templates/index.php | 1 - modules/sekeywords/sekeywords.php | 1 - modules/sekeywords/translations/index.php | 1 - modules/sendtoafriend/sendtoafriend.php | 1 - modules/sendtoafriend/translations/index.php | 1 - modules/shopimporter/translations/index.php | 1 - modules/statsbestcategories/statsbestcategories.php | 1 - modules/statsbestcategories/translations/index.php | 1 - modules/statsbestcustomers/statsbestcustomers.php | 1 - modules/statsbestcustomers/translations/index.php | 1 - modules/statsbestmanufacturers/statsbestmanufacturers.php | 1 - modules/statsbestmanufacturers/translations/index.php | 1 - modules/statsbestproducts/statsbestproducts.php | 1 - modules/statsbestproducts/translations/index.php | 1 - modules/statsbestsuppliers/statsbestsuppliers.php | 1 - modules/statsbestsuppliers/translations/index.php | 1 - modules/statsbestvouchers/statsbestvouchers.php | 1 - modules/statsbestvouchers/translations/index.php | 1 - modules/statscarrier/statscarrier.php | 1 - modules/statscarrier/translations/index.php | 1 - modules/statscatalog/statscatalog.php | 1 - modules/statscatalog/translations/index.php | 1 - modules/statscheckup/statscheckup.php | 1 - modules/statscheckup/translations/index.php | 1 - modules/statsdata/statsdata.php | 1 - modules/statsdata/translations/index.php | 1 - modules/statsequipment/statsequipment.php | 1 - modules/statsequipment/translations/index.php | 1 - modules/statsforecast/statsforecast.php | 1 - modules/statsforecast/translations/index.php | 1 - modules/statsgeolocation/config.php | 1 - modules/statsgeolocation/drawer.php | 1 - modules/statsgeolocation/statsgeolocation.js | 1 - modules/statsgeolocation/statsgeolocation.php | 1 - modules/statsgeolocation/translations/index.php | 1 - modules/statslive/statslive.php | 1 - modules/statslive/translations/index.php | 1 - modules/statsnewsletter/statsnewsletter.php | 1 - modules/statsnewsletter/translations/index.php | 1 - modules/statsorigin/statsorigin.php | 1 - modules/statsorigin/translations/index.php | 1 - modules/statspersonalinfos/statspersonalinfos.php | 1 - modules/statspersonalinfos/translations/index.php | 1 - modules/statsproduct/statsproduct.php | 1 - modules/statsproduct/translations/index.php | 1 - modules/statsregistrations/statsregistrations.php | 1 - modules/statsregistrations/translations/index.php | 1 - modules/statssales/statssales.php | 1 - modules/statssales/translations/index.php | 1 - modules/statssearch/statssearch.php | 1 - modules/statssearch/translations/index.php | 1 - modules/statsstock/statsstock.php | 1 - modules/statsstock/translations/index.php | 1 - modules/statsvisits/statsvisits.php | 1 - modules/statsvisits/translations/index.php | 1 - modules/trackingfront/account.tpl | 1 - modules/trackingfront/footer.tpl | 1 - modules/trackingfront/header.tpl | 1 - modules/trackingfront/login.tpl | 1 - modules/trackingfront/stats.php | 1 - modules/trackingfront/trackingfront.php | 1 - modules/trackingfront/translations/index.php | 1 - modules/vatnumber/ajax.php | 1 - modules/vatnumber/translations/index.php | 1 - modules/vatnumber/vatnumber.php | 1 - modules/watermark/translations/index.php | 1 - modules/watermark/watermark.php | 1 - my-account.php | 1 - new-products.php | 1 - order-confirmation.php | 1 - order-detail.php | 1 - order-follow.php | 1 - order-opc.php | 1 - order-return.php | 1 - order-slip.php | 1 - order.php | 1 - override/classes/_Tools.php | 1 - override/classes/cache/index.php | 3 +-- override/classes/controller/index.php | 3 +-- override/classes/db/index.php | 3 +-- override/classes/helper/index.php | 3 +-- override/classes/log/index.php | 3 +-- override/classes/module/index.php | 3 +-- override/classes/order/index.php | 3 +-- override/classes/pdf/index.php | 3 +-- override/classes/range/index.php | 3 +-- override/classes/shop/index.php | 3 +-- override/classes/stock/index.php | 3 +-- override/classes/tax/index.php | 3 +-- override/controllers/admin/index.php | 3 +-- override/controllers/admin/templates/index.php | 3 +-- password.php | 1 - pdf-invoice.php | 1 - pdf-order-return.php | 1 - pdf-order-slip.php | 1 - pdf/delivery-slip.tpl | 1 - pdf/footer.tpl | 1 - pdf/header.tpl | 1 - pdf/invoice-b2b.tpl | 1 - pdf/invoice.tax-tab.tpl | 1 - pdf/invoice.tpl | 1 - pdf/order-return.tpl | 1 - pdf/order-slip.tpl | 1 - prices-drop.php | 1 - product-sort.php | 1 - product.php | 1 - products-comparison.php | 1 - search.php | 1 - sitemap.php | 1 - statistics.php | 1 - stores.php | 1 - supplier.php | 1 - themes/debug.tpl | 1 - themes/default/404.tpl | 1 - themes/default/address.tpl | 1 - themes/default/addresses.tpl | 1 - themes/default/authentication.tpl | 1 - themes/default/best-sales.tpl | 1 - themes/default/breadcrumb.tpl | 1 - themes/default/category-cms-tree-branch.tpl | 1 - themes/default/category-tree-branch.tpl | 1 - themes/default/category.tpl | 1 - themes/default/cms.tpl | 1 - themes/default/contact-form.tpl | 1 - themes/default/css/index.php | 1 - themes/default/discount.tpl | 1 - themes/default/errors.tpl | 1 - themes/default/footer.tpl | 1 - themes/default/guest-tracking.tpl | 1 - themes/default/header.tpl | 1 - themes/default/history.tpl | 1 - themes/default/identity.tpl | 1 - themes/default/index.php | 1 - themes/default/index.tpl | 1 - themes/default/js/cart-summary.js | 1 - themes/default/js/cms.js | 1 - themes/default/js/contact-form.js | 1 - themes/default/js/history.js | 1 - themes/default/js/index.php | 1 - themes/default/js/modules/index.php | 1 - themes/default/js/order-address.js | 1 - themes/default/js/order-opc.js | 1 - themes/default/js/product.js | 1 - themes/default/js/products-comparison.js | 1 - themes/default/js/scenes.js | 1 - themes/default/js/stores.js | 1 - themes/default/js/tools.js | 1 - themes/default/js/tools/index.php | 1 - themes/default/maintenance.tpl | 1 - themes/default/manufacturer-list.tpl | 1 - themes/default/manufacturer.tpl | 1 - themes/default/mobile/404.tpl | 1 - themes/default/mobile/address.tpl | 1 - themes/default/mobile/addresses.tpl | 1 - themes/default/mobile/authentication.tpl | 1 - themes/default/mobile/best-sales.tpl | 1 - themes/default/mobile/category-cms-tree-branch.tpl | 1 - themes/default/mobile/category-product-list.tpl | 1 - themes/default/mobile/category-product-sort.tpl | 1 - themes/default/mobile/category-tree-branch.tpl | 1 - themes/default/mobile/category.tpl | 1 - themes/default/mobile/cms.tpl | 1 - themes/default/mobile/contact-form.tpl | 1 - themes/default/mobile/css/index.php | 1 - themes/default/mobile/discount.tpl | 1 - themes/default/mobile/errors.tpl | 1 - themes/default/mobile/footer.tpl | 1 - themes/default/mobile/header.tpl | 1 - themes/default/mobile/history.tpl | 1 - themes/default/mobile/identity.tpl | 1 - themes/default/mobile/img/icon/index.php | 1 - themes/default/mobile/img/index.php | 1 - themes/default/mobile/index.php | 3 +-- themes/default/mobile/index.tpl | 1 - themes/default/mobile/js/history.js | 1 - themes/default/mobile/js/index.php | 1 - themes/default/mobile/js/product.js | 1 - themes/default/mobile/js/stores.js | 1 - themes/default/mobile/layout.tpl | 1 - themes/default/mobile/maintenance.tpl | 1 - themes/default/mobile/manufacturer-list.tpl | 1 - themes/default/mobile/manufacturer.tpl | 1 - themes/default/mobile/my-account.tpl | 1 - themes/default/mobile/new-products.tpl | 1 - themes/default/mobile/order-detail-product-li.tpl | 1 - themes/default/mobile/order-detail.tpl | 1 - themes/default/mobile/order-follow.tpl | 1 - themes/default/mobile/order-opc-address.tpl | 1 - themes/default/mobile/order-opc-carrier.tpl | 1 - themes/default/mobile/order-opc-payment.tpl | 1 - themes/default/mobile/order-opc.tpl | 1 - themes/default/mobile/order-slip.tpl | 1 - themes/default/mobile/pages-list.tpl | 1 - themes/default/mobile/pagination.tpl | 1 - themes/default/mobile/password.tpl | 1 - themes/default/mobile/prices-drop.tpl | 1 - themes/default/mobile/product-attributes.tpl | 1 - themes/default/mobile/product-images.tpl | 1 - themes/default/mobile/product-js.tpl | 1 - themes/default/mobile/product-prices.tpl | 1 - themes/default/mobile/product-quantity-discount.tpl | 1 - themes/default/mobile/product.tpl | 1 - themes/default/mobile/search.tpl | 1 - themes/default/mobile/sitemap.tpl | 1 - themes/default/mobile/stores.tpl | 1 - themes/default/mobile/supplier-list.tpl | 1 - themes/default/mobile/supplier.tpl | 1 - themes/default/mobile/test.tpl | 1 - themes/default/my-account.tpl | 1 - themes/default/new-products.tpl | 1 - themes/default/order-address.tpl | 1 - themes/default/order-carrier.tpl | 1 - themes/default/order-confirmation.tpl | 1 - themes/default/order-detail.tpl | 1 - themes/default/order-follow.tpl | 1 - themes/default/order-opc.tpl | 1 - themes/default/order-payment.tpl | 1 - themes/default/order-return.tpl | 1 - themes/default/order-slip.tpl | 1 - themes/default/order-steps.tpl | 1 - themes/default/pagination.tpl | 1 - themes/default/password.tpl | 1 - themes/default/pdf/index.php | 1 - themes/default/prices-drop.tpl | 1 - themes/default/product-compare.tpl | 1 - themes/default/product-list.tpl | 1 - themes/default/product-sort.tpl | 1 - themes/default/product.tpl | 1 - themes/default/products-comparison.tpl | 1 - themes/default/restricted-country.tpl | 1 - themes/default/scenes.tpl | 1 - themes/default/search.tpl | 1 - themes/default/shopping-cart-product-line.tpl | 1 - themes/default/shopping-cart.tpl | 1 - themes/default/sitemap.tpl | 1 - themes/default/store_infos.tpl | 1 - themes/default/stores.tpl | 1 - themes/default/supplier-list.tpl | 1 - themes/default/supplier.tpl | 1 - themes/index.php | 1 - themes/live_edit.tpl | 1 - tools/mobile_Detect/index.php | 3 +-- tools/parser_sql/index.php | 1 - tools/profiling/Controller.php | 1 - tools/profiling/Hook.php | 1 - tools/smarty/index.php | 3 +-- tools/smarty/plugins/index.php | 3 +-- tools/smarty/sysplugins/index.php | 3 +-- tools/tcpdf/cache/index.php | 3 +-- tools/tcpdf/config/index.php | 3 +-- tools/tcpdf/config/lang/index.php | 3 +-- tools/tcpdf/fonts/index.php | 3 +-- tools/tcpdf/index.php | 3 +-- upload/index.php | 1 - webservice/dispatcher.php | 1 - webservice/index.php | 1 - 1885 files changed, 363 insertions(+), 2248 deletions(-) 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..cadb1ea6e 100644 --- a/admin-dev/autoupgrade/index.php +++ b/admin-dev/autoupgrade/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/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..a6b808ac6 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 */ 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..022bcf676 100644 --- a/admin-dev/searchcron.php +++ b/admin-dev/searchcron.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/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/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/access/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/access/helpers/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/access/index.php +++ b/admin-dev/themes/default/template/controllers/access/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/addons_catalog/index.php +++ b/admin-dev/themes/default/template/controllers/addons_catalog/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/addresses/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/addresses/helpers/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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/addresses/index.php +++ b/admin-dev/themes/default/template/controllers/addresses/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/attachments/index.php +++ b/admin-dev/themes/default/template/controllers/attachments/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/attribute_generator/index.php +++ b/admin-dev/themes/default/template/controllers/attribute_generator/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/attributes/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/attributes/helpers/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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/attributes/index.php +++ b/admin-dev/themes/default/template/controllers/attributes/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 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 @@ -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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/attributes_groups/index.php +++ b/admin-dev/themes/default/template/controllers/attributes_groups/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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/backup/download/index.php +++ b/admin-dev/themes/default/template/controllers/backup/download/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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/backup/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/backup/helpers/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/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..bbc3550b8 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 @@ -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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/backup/index.php +++ b/admin-dev/themes/default/template/controllers/backup/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/carriers/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/carriers/helpers/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/carriers/index.php +++ b/admin-dev/themes/default/template/controllers/carriers/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/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..50814f2d6 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 @@ -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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/index.php +++ b/admin-dev/themes/default/template/controllers/cart_rules/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/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/index.php b/admin-dev/themes/default/template/controllers/carts/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/carts/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/carts/helpers/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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/carts/index.php +++ b/admin-dev/themes/default/template/controllers/carts/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/categories/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/categories/helpers/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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/categories/index.php +++ b/admin-dev/themes/default/template/controllers/categories/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/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..dca7b479c 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,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/cms/helpers/form/index.php b/admin-dev/themes/default/template/controllers/cms/helpers/form/index.php index 52007a42a..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/cms/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/cms/helpers/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/cms/index.php +++ b/admin-dev/themes/default/template/controllers/cms/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/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..6c5c3de00 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,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/cms_categories/helpers/form/index.php b/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/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/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/index.php b/admin-dev/themes/default/template/controllers/cms_categories/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/cms_categories/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/cms_categories/helpers/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/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/index.php b/admin-dev/themes/default/template/controllers/cms_categories/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/cms_categories/index.php +++ b/admin-dev/themes/default/template/controllers/cms_categories/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/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_content/content.tpl b/admin-dev/themes/default/template/controllers/cms_content/content.tpl index 8902331f2..f5cac9031 100644 --- a/admin-dev/themes/default/template/controllers/cms_content/content.tpl +++ b/admin-dev/themes/default/template/controllers/cms_content/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/cms_content/index.php b/admin-dev/themes/default/template/controllers/cms_content/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/cms_content/index.php +++ b/admin-dev/themes/default/template/controllers/cms_content/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/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/countries/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl index 01fe88b79..0a459e4ed 100644 --- a/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/countries/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/countries/helpers/form/index.php b/admin-dev/themes/default/template/controllers/countries/helpers/form/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/countries/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/countries/helpers/form/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/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/countries/helpers/index.php b/admin-dev/themes/default/template/controllers/countries/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/countries/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/countries/helpers/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/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/countries/helpers/list/index.php b/admin-dev/themes/default/template/controllers/countries/helpers/list/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/countries/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/countries/helpers/list/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/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/countries/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl index 676ec0e27..6c3c0aef7 100644 --- a/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl +++ b/admin-dev/themes/default/template/controllers/countries/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/countries/index.php b/admin-dev/themes/default/template/controllers/countries/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/countries/index.php +++ b/admin-dev/themes/default/template/controllers/countries/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/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/customer_threads/helpers/index.php b/admin-dev/themes/default/template/controllers/customer_threads/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/customer_threads/helpers/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/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/customer_threads/helpers/list/index.php b/admin-dev/themes/default/template/controllers/customer_threads/helpers/list/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/customer_threads/helpers/list/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/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/customer_threads/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/list/list_header.tpl index 1a74a31db..23417559a 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/customer_threads/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/customer_threads/helpers/options/index.php b/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/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/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/customer_threads/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl index bc11efa63..2f4f88434 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.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/customer_threads/helpers/view/index.php b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/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/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/customer_threads/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl index a4931c0b5..a14710ebe 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/customer_threads/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/customer_threads/index.php b/admin-dev/themes/default/template/controllers/customer_threads/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/index.php +++ b/admin-dev/themes/default/template/controllers/customer_threads/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/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/customer_threads/message.tpl b/admin-dev/themes/default/template/controllers/customer_threads/message.tpl index 6464a3b3a..8a8355493 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/message.tpl +++ b/admin-dev/themes/default/template/controllers/customer_threads/message.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/customers/helpers/index.php b/admin-dev/themes/default/template/controllers/customers/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/customers/helpers/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/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/customers/helpers/list/index.php b/admin-dev/themes/default/template/controllers/customers/helpers/list/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/customers/helpers/list/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/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/customers/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl index 309ea02df..a0cf976ce 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl @@ -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/customers/helpers/view/index.php b/admin-dev/themes/default/template/controllers/customers/helpers/view/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/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/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/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl index b3b59b61d..b1c334656 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/customers/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/controllers/customers/index.php b/admin-dev/themes/default/template/controllers/customers/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/customers/index.php +++ b/admin-dev/themes/default/template/controllers/customers/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/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/emails/content.tpl b/admin-dev/themes/default/template/controllers/emails/content.tpl index 1dd47b488..8931488e6 100644 --- a/admin-dev/themes/default/template/controllers/emails/content.tpl +++ b/admin-dev/themes/default/template/controllers/emails/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/emails/index.php b/admin-dev/themes/default/template/controllers/emails/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/emails/index.php +++ b/admin-dev/themes/default/template/controllers/emails/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/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/employees/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl index 69d483cd3..d098a80c1 100644 --- a/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/employees/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/employees/helpers/form/index.php b/admin-dev/themes/default/template/controllers/employees/helpers/form/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/employees/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/employees/helpers/form/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/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/employees/helpers/index.php b/admin-dev/themes/default/template/controllers/employees/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/employees/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/employees/helpers/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/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/employees/index.php b/admin-dev/themes/default/template/controllers/employees/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/employees/index.php +++ b/admin-dev/themes/default/template/controllers/employees/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/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/feature_value/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl index 2dc9c43df..0d6bd3738 100644 --- a/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/feature_value/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/feature_value/helpers/form/index.php b/admin-dev/themes/default/template/controllers/feature_value/helpers/form/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/feature_value/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/feature_value/helpers/form/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/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/feature_value/helpers/index.php b/admin-dev/themes/default/template/controllers/feature_value/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/feature_value/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/feature_value/helpers/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/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/feature_value/index.php b/admin-dev/themes/default/template/controllers/feature_value/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/feature_value/index.php +++ b/admin-dev/themes/default/template/controllers/feature_value/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/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/features/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl index dc62deb97..dca284960 100644 --- a/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/features/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/features/helpers/form/index.php b/admin-dev/themes/default/template/controllers/features/helpers/form/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/features/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/features/helpers/form/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/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/features/helpers/index.php b/admin-dev/themes/default/template/controllers/features/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/features/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/features/helpers/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/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/features/index.php b/admin-dev/themes/default/template/controllers/features/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/features/index.php +++ b/admin-dev/themes/default/template/controllers/features/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/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/geolocation/helpers/index.php b/admin-dev/themes/default/template/controllers/geolocation/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/geolocation/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/geolocation/helpers/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/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/geolocation/helpers/options/index.php b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/geolocation/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/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/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/geolocation/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl index 0728a007b..34515d2b1 100644 --- a/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.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/geolocation/index.php b/admin-dev/themes/default/template/controllers/geolocation/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/geolocation/index.php +++ b/admin-dev/themes/default/template/controllers/geolocation/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/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/groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl index 1c2d8d445..bdfc29d88 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/groups/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/groups/helpers/form/index.php b/admin-dev/themes/default/template/controllers/groups/helpers/form/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/groups/helpers/form/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/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/groups/helpers/index.php b/admin-dev/themes/default/template/controllers/groups/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/groups/helpers/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/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/groups/helpers/view/index.php b/admin-dev/themes/default/template/controllers/groups/helpers/view/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/groups/helpers/view/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/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/groups/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl index adae86604..b284e6f9f 100755 --- a/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/groups/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/groups/index.php b/admin-dev/themes/default/template/controllers/groups/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/groups/index.php +++ b/admin-dev/themes/default/template/controllers/groups/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/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/home/content.tpl b/admin-dev/themes/default/template/controllers/home/content.tpl index 25e145cf8..ea0725740 100644 --- a/admin-dev/themes/default/template/controllers/home/content.tpl +++ b/admin-dev/themes/default/template/controllers/home/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/home/index.php b/admin-dev/themes/default/template/controllers/home/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/home/index.php +++ b/admin-dev/themes/default/template/controllers/home/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/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/home/optimizationTips.tpl b/admin-dev/themes/default/template/controllers/home/optimizationTips.tpl index c578c640a..9ddfca027 100644 --- a/admin-dev/themes/default/template/controllers/home/optimizationTips.tpl +++ b/admin-dev/themes/default/template/controllers/home/optimizationTips.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/images/content.tpl b/admin-dev/themes/default/template/controllers/images/content.tpl index 41a149278..0ec1f0a2e 100644 --- a/admin-dev/themes/default/template/controllers/images/content.tpl +++ b/admin-dev/themes/default/template/controllers/images/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/images/index.php b/admin-dev/themes/default/template/controllers/images/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/images/index.php +++ b/admin-dev/themes/default/template/controllers/images/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/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/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl index 9089c848e..7b36488f9 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/import/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/import/helpers/form/index.php b/admin-dev/themes/default/template/controllers/import/helpers/form/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/import/helpers/form/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/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/import/helpers/index.php b/admin-dev/themes/default/template/controllers/import/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/import/helpers/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/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/import/helpers/view/index.php b/admin-dev/themes/default/template/controllers/import/helpers/view/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/import/helpers/view/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/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/import/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl index fa655d9a8..173e4108c 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/import/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/controllers/import/index.php b/admin-dev/themes/default/template/controllers/import/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/import/index.php +++ b/admin-dev/themes/default/template/controllers/import/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/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/index.php b/admin-dev/themes/default/template/controllers/index.php index f18b9ff6e..192f88787 100644 --- a/admin-dev/themes/default/template/controllers/index.php +++ b/admin-dev/themes/default/template/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/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/information/helpers/index.php b/admin-dev/themes/default/template/controllers/information/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/information/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/information/helpers/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/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/information/helpers/view/index.php b/admin-dev/themes/default/template/controllers/information/helpers/view/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/information/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/information/helpers/view/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/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/information/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl index 933c0de35..da9d5daf8 100644 --- a/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/information/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/information/index.php b/admin-dev/themes/default/template/controllers/information/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/information/index.php +++ b/admin-dev/themes/default/template/controllers/information/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/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/invoices/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl index ababcb1f3..873130cd4 100644 --- a/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/invoices/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/invoices/helpers/form/index.php b/admin-dev/themes/default/template/controllers/invoices/helpers/form/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/invoices/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/invoices/helpers/form/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/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/invoices/helpers/index.php b/admin-dev/themes/default/template/controllers/invoices/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/invoices/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/invoices/helpers/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/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/invoices/index.php b/admin-dev/themes/default/template/controllers/invoices/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/invoices/index.php +++ b/admin-dev/themes/default/template/controllers/invoices/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/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/languages/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl index b3b013d32..e29a421e8 100644 --- a/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/languages/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/languages/helpers/form/index.php b/admin-dev/themes/default/template/controllers/languages/helpers/form/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/languages/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/languages/helpers/form/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/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/languages/helpers/index.php b/admin-dev/themes/default/template/controllers/languages/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/languages/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/languages/helpers/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/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/languages/index.php b/admin-dev/themes/default/template/controllers/languages/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/languages/index.php +++ b/admin-dev/themes/default/template/controllers/languages/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/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/localization/content.tpl b/admin-dev/themes/default/template/controllers/localization/content.tpl index 5f83cd664..f8abc659f 100644 --- a/admin-dev/themes/default/template/controllers/localization/content.tpl +++ b/admin-dev/themes/default/template/controllers/localization/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/localization/index.php b/admin-dev/themes/default/template/controllers/localization/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/localization/index.php +++ b/admin-dev/themes/default/template/controllers/localization/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/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/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl index f876952bc..c945e3981 100755 --- a/admin-dev/themes/default/template/controllers/login/content.tpl +++ b/admin-dev/themes/default/template/controllers/login/content.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8858 $ * @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/login/index.php b/admin-dev/themes/default/template/controllers/login/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/login/index.php +++ b/admin-dev/themes/default/template/controllers/login/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/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/logs/helpers/index.php b/admin-dev/themes/default/template/controllers/logs/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/logs/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/logs/helpers/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/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/logs/helpers/list/index.php b/admin-dev/themes/default/template/controllers/logs/helpers/list/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/logs/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/logs/helpers/list/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/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/logs/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl index 92297a6e8..b380c5844 100644 --- a/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/logs/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/logs/index.php b/admin-dev/themes/default/template/controllers/logs/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/logs/index.php +++ b/admin-dev/themes/default/template/controllers/logs/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/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/maintenance/helpers/index.php b/admin-dev/themes/default/template/controllers/maintenance/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/maintenance/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/maintenance/helpers/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/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/maintenance/helpers/options/index.php b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/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/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/maintenance/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl index 55a4930ac..7ea689a25 100644 --- a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.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/maintenance/index.php b/admin-dev/themes/default/template/controllers/maintenance/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/maintenance/index.php +++ b/admin-dev/themes/default/template/controllers/maintenance/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/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/manufacturers/helpers/index.php b/admin-dev/themes/default/template/controllers/manufacturers/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/manufacturers/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/manufacturers/helpers/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/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/manufacturers/helpers/view/index.php b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/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/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/manufacturers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl index af7af0f79..6fb27f342 100644 --- a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9646 $ * @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/manufacturers/index.php b/admin-dev/themes/default/template/controllers/manufacturers/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/manufacturers/index.php +++ b/admin-dev/themes/default/template/controllers/manufacturers/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/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/meta/helpers/index.php b/admin-dev/themes/default/template/controllers/meta/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/meta/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/meta/helpers/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/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/meta/helpers/options/index.php b/admin-dev/themes/default/template/controllers/meta/helpers/options/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/meta/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/meta/helpers/options/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/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/meta/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl index 96c0934e5..07f87c6d1 100644 --- a/admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 13686 $ * @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/meta/index.php b/admin-dev/themes/default/template/controllers/meta/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/meta/index.php +++ b/admin-dev/themes/default/template/controllers/meta/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/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/modules/content.tpl b/admin-dev/themes/default/template/controllers/modules/content.tpl index 0ac7ca076..a60f596ae 100644 --- a/admin-dev/themes/default/template/controllers/modules/content.tpl +++ b/admin-dev/themes/default/template/controllers/modules/content.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9771 $ * @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/modules/filters.tpl b/admin-dev/themes/default/template/controllers/modules/filters.tpl index f291f4af1..67a57a254 100644 --- a/admin-dev/themes/default/template/controllers/modules/filters.tpl +++ b/admin-dev/themes/default/template/controllers/modules/filters.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9771 $ * @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/modules/header.tpl b/admin-dev/themes/default/template/controllers/modules/header.tpl index 21d3a1ddc..971cdb035 100644 --- a/admin-dev/themes/default/template/controllers/modules/header.tpl +++ b/admin-dev/themes/default/template/controllers/modules/header.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9771 $ * @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/modules/index.php b/admin-dev/themes/default/template/controllers/modules/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/modules/index.php +++ b/admin-dev/themes/default/template/controllers/modules/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/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/modules/js.tpl b/admin-dev/themes/default/template/controllers/modules/js.tpl index 59e91a4c8..73e463c13 100644 --- a/admin-dev/themes/default/template/controllers/modules/js.tpl +++ b/admin-dev/themes/default/template/controllers/modules/js.tpl @@ -18,8 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9771 $ +* @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/admin-dev/themes/default/template/controllers/modules/list.tpl b/admin-dev/themes/default/template/controllers/modules/list.tpl index c091a759a..63e60a2b4 100644 --- a/admin-dev/themes/default/template/controllers/modules/list.tpl +++ b/admin-dev/themes/default/template/controllers/modules/list.tpl @@ -18,8 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9771 $ +* @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/admin-dev/themes/default/template/controllers/modules/page.tpl b/admin-dev/themes/default/template/controllers/modules/page.tpl index 6370f635b..888ef4c26 100644 --- a/admin-dev/themes/default/template/controllers/modules/page.tpl +++ b/admin-dev/themes/default/template/controllers/modules/page.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9771 $ * @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/modules_positions/form.tpl b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl index 341349287..d5b356883 100644 --- a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl +++ b/admin-dev/themes/default/template/controllers/modules_positions/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/modules_positions/index.php b/admin-dev/themes/default/template/controllers/modules_positions/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/modules_positions/index.php +++ b/admin-dev/themes/default/template/controllers/modules_positions/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/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/modules_positions/list_modules.tpl b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl index 02ae0e1f5..a23a751a8 100644 --- a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl +++ b/admin-dev/themes/default/template/controllers/modules_positions/list_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/not_found/content.tpl b/admin-dev/themes/default/template/controllers/not_found/content.tpl index f136b527b..f2df6da4c 100644 --- a/admin-dev/themes/default/template/controllers/not_found/content.tpl +++ b/admin-dev/themes/default/template/controllers/not_found/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/not_found/index.php b/admin-dev/themes/default/template/controllers/not_found/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/not_found/index.php +++ b/admin-dev/themes/default/template/controllers/not_found/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/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/order_preferences/helpers/index.php b/admin-dev/themes/default/template/controllers/order_preferences/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/order_preferences/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/order_preferences/helpers/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/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/order_preferences/helpers/options/index.php b/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/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/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/order_preferences/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/options.tpl index 638ab1d44..04b7f7c69 100644 --- a/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/options.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/order_preferences/index.php b/admin-dev/themes/default/template/controllers/order_preferences/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/order_preferences/index.php +++ b/admin-dev/themes/default/template/controllers/order_preferences/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/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/orders/_customized_data.tpl b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl index 83a011448..61cf4e531 100755 --- a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_customized_data.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/orders/_discount_form.tpl b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl index 64682a4f8..b68240298 100644 --- a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_discount_form.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/orders/_documents.tpl b/admin-dev/themes/default/template/controllers/orders/_documents.tpl index 80de83dc3..b1ca81630 100644 --- a/admin-dev/themes/default/template/controllers/orders/_documents.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_documents.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/orders/_new_product.tpl b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl index 619aad2c4..7da1b4d27 100644 --- a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_new_product.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/orders/_print_pdf_icon.tpl b/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl index 412411841..42a7c6a60 100644 --- a/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_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/orders/_product_line.tpl b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl index fcb8ecd27..c22b4b15f 100755 --- a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_product_line.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/orders/_shipping.tpl b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl index 4e57c6502..e777df913 100644 --- a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_shipping.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/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl index e7e80b404..2f0b1af18 100755 --- a/admin-dev/themes/default/template/controllers/orders/form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/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/orders/form_customization_feedback.tpl b/admin-dev/themes/default/template/controllers/orders/form_customization_feedback.tpl index 024b6bdf9..7eb93e197 100644 --- a/admin-dev/themes/default/template/controllers/orders/form_customization_feedback.tpl +++ b/admin-dev/themes/default/template/controllers/orders/form_customization_feedback.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/orders/helpers/index.php b/admin-dev/themes/default/template/controllers/orders/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/orders/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/orders/helpers/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/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/orders/helpers/view/index.php b/admin-dev/themes/default/template/controllers/orders/helpers/view/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/orders/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/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/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/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl index 294bb0ac8..c844c492a 100755 --- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/orders/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/orders/index.php b/admin-dev/themes/default/template/controllers/orders/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/orders/index.php +++ b/admin-dev/themes/default/template/controllers/orders/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/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/outstanding/_print_pdf_icon.tpl b/admin-dev/themes/default/template/controllers/outstanding/_print_pdf_icon.tpl index 31b042325..807ba74df 100644 --- a/admin-dev/themes/default/template/controllers/outstanding/_print_pdf_icon.tpl +++ b/admin-dev/themes/default/template/controllers/outstanding/_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/outstanding/index.php b/admin-dev/themes/default/template/controllers/outstanding/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/outstanding/index.php +++ b/admin-dev/themes/default/template/controllers/outstanding/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/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/payment/helpers/index.php b/admin-dev/themes/default/template/controllers/payment/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/payment/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/payment/helpers/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/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/payment/helpers/view/index.php b/admin-dev/themes/default/template/controllers/payment/helpers/view/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/payment/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/payment/helpers/view/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/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/payment/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl index cf79bb8bc..4ba446ae2 100644 --- a/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9635 $ * @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/payment/index.php b/admin-dev/themes/default/template/controllers/payment/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/payment/index.php +++ b/admin-dev/themes/default/template/controllers/payment/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/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/payment/restrictions.tpl b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl index fa8c9eecc..31cd0f100 100644 --- a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl +++ b/admin-dev/themes/default/template/controllers/payment/restrictions.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/performance/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl index 7f0482663..2e1d68908 100644 --- a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/performance/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/performance/helpers/form/index.php b/admin-dev/themes/default/template/controllers/performance/helpers/form/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/performance/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/performance/helpers/form/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/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/performance/helpers/index.php b/admin-dev/themes/default/template/controllers/performance/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/performance/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/performance/helpers/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/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/performance/index.php b/admin-dev/themes/default/template/controllers/performance/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/performance/index.php +++ b/admin-dev/themes/default/template/controllers/performance/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/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/preferences/helpers/index.php b/admin-dev/themes/default/template/controllers/preferences/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/preferences/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/preferences/helpers/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/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/preferences/helpers/options/index.php b/admin-dev/themes/default/template/controllers/preferences/helpers/options/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/preferences/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/preferences/helpers/options/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/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/preferences/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/preferences/helpers/options/options.tpl index 246fe4392..ccf8bbf2c 100644 --- a/admin-dev/themes/default/template/controllers/preferences/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/preferences/helpers/options/options.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9540 $ * @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/preferences/index.php b/admin-dev/themes/default/template/controllers/preferences/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/preferences/index.php +++ b/admin-dev/themes/default/template/controllers/preferences/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/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/associations.tpl b/admin-dev/themes/default/template/controllers/products/associations.tpl index b19104252..a1d6b688b 100644 --- a/admin-dev/themes/default/template/controllers/products/associations.tpl +++ b/admin-dev/themes/default/template/controllers/products/associations.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/attachments.tpl b/admin-dev/themes/default/template/controllers/products/attachments.tpl index f17f56af9..014021e15 100644 --- a/admin-dev/themes/default/template/controllers/products/attachments.tpl +++ b/admin-dev/themes/default/template/controllers/products/attachments.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/products/combination/helpers/index.php b/admin-dev/themes/default/template/controllers/products/combination/helpers/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/products/combination/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/products/combination/helpers/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/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/combination/helpers/list/index.php b/admin-dev/themes/default/template/controllers/products/combination/helpers/list/index.php index ce1264b18..52b2a6a6e 100644 --- a/admin-dev/themes/default/template/controllers/products/combination/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/products/combination/helpers/list/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/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/combination/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/products/combination/helpers/list/list_footer.tpl index 3cd7899c9..81982313f 100644 --- a/admin-dev/themes/default/template/controllers/products/combination/helpers/list/list_footer.tpl +++ b/admin-dev/themes/default/template/controllers/products/combination/helpers/list/list_footer.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 10634 $ * @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/combination/index.php b/admin-dev/themes/default/template/controllers/products/combination/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/products/combination/index.php +++ b/admin-dev/themes/default/template/controllers/products/combination/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/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/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl index b6fcb46c5..b117bf101 100644 --- a/admin-dev/themes/default/template/controllers/products/combinations.tpl +++ b/admin-dev/themes/default/template/controllers/products/combinations.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/customization.tpl b/admin-dev/themes/default/template/controllers/products/customization.tpl index ca7584557..f91024a07 100644 --- a/admin-dev/themes/default/template/controllers/products/customization.tpl +++ b/admin-dev/themes/default/template/controllers/products/customization.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/products/features.tpl b/admin-dev/themes/default/template/controllers/products/features.tpl index 56aca05bb..ed9cbab9b 100644 --- a/admin-dev/themes/default/template/controllers/products/features.tpl +++ b/admin-dev/themes/default/template/controllers/products/features.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/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl index 2ee94bee2..9c28265ef 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/products/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/products/helpers/form/index.php b/admin-dev/themes/default/template/controllers/products/helpers/form/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/products/helpers/form/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/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/helpers/index.php b/admin-dev/themes/default/template/controllers/products/helpers/index.php index 63e0af4de..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/products/helpers/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/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/helpers/list/index.php b/admin-dev/themes/default/template/controllers/products/helpers/list/index.php index 52007a42a..bbc3550b8 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/products/helpers/list/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/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/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl index 90f6b39b0..c0b86f3c3 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/products/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/products/images.tpl b/admin-dev/themes/default/template/controllers/products/images.tpl index 615f10329..150d9ba0e 100644 --- a/admin-dev/themes/default/template/controllers/products/images.tpl +++ b/admin-dev/themes/default/template/controllers/products/images.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/index.php b/admin-dev/themes/default/template/controllers/products/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/products/index.php +++ b/admin-dev/themes/default/template/controllers/products/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/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/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl index ad9aa9692..8e56f4b88 100644 --- a/admin-dev/themes/default/template/controllers/products/informations.tpl +++ b/admin-dev/themes/default/template/controllers/products/informations.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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/products/multishop/index.php +++ b/admin-dev/themes/default/template/controllers/products/multishop/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/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..1fce35216 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 *} 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..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/referrers/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/referrers/helpers/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/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..bbc3550b8 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 @@ -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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/referrers/index.php +++ b/admin-dev/themes/default/template/controllers/referrers/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 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 @@ -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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/request_sql/index.php +++ b/admin-dev/themes/default/template/controllers/request_sql/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/return/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/return/helpers/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/return/index.php +++ b/admin-dev/themes/default/template/controllers/return/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/scenes/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/scenes/helpers/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/scenes/index.php +++ b/admin-dev/themes/default/template/controllers/scenes/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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/search/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/search/helpers/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/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..bbc3550b8 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 @@ -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/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..31c1f0935 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 *} diff --git a/admin-dev/themes/default/template/controllers/search/index.php b/admin-dev/themes/default/template/controllers/search/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/search/index.php +++ b/admin-dev/themes/default/template/controllers/search/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/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..a6ad75bf6 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 *} diff --git a/admin-dev/themes/default/template/controllers/shipping/index.php b/admin-dev/themes/default/template/controllers/shipping/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/shipping/index.php +++ b/admin-dev/themes/default/template/controllers/shipping/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/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..bfba5f161 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 *} 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..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/shop/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/shop/helpers/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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/shop/index.php +++ b/admin-dev/themes/default/template/controllers/shop/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/shop_group/index.php +++ b/admin-dev/themes/default/template/controllers/shop_group/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 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 @@ -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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/shop_url/index.php +++ b/admin-dev/themes/default/template/controllers/shop_url/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/slip/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/slip/helpers/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/slip/index.php +++ b/admin-dev/themes/default/template/controllers/slip/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 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 @@ -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/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..bc2f36987 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 @@ -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/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/index.php b/admin-dev/themes/default/template/controllers/states/index.php index 6644723cb..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/states/index.php +++ b/admin-dev/themes/default/template/controllers/states/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/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/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/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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/stats/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/stats/helpers/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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/stats/index.php +++ b/admin-dev/themes/default/template/controllers/stats/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/statuses/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/statuses/helpers/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/statuses/index.php +++ b/admin-dev/themes/default/template/controllers/statuses/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/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..50814f2d6 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 @@ -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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/stock_cover/index.php +++ b/admin-dev/themes/default/template/controllers/stock_cover/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/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..50814f2d6 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 @@ -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/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..bbc3550b8 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 @@ -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/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..bc2f36987 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 @@ -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/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..50814f2d6 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 @@ -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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/stock_mvt/index.php +++ b/admin-dev/themes/default/template/controllers/stock_mvt/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/stores/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/stores/helpers/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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/stores/index.php +++ b/admin-dev/themes/default/template/controllers/stores/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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/suppliers/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/suppliers/helpers/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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/suppliers/index.php +++ b/admin-dev/themes/default/template/controllers/suppliers/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 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 @@ -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/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..bbc3550b8 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 @@ -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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders/index.php +++ b/admin-dev/themes/default/template/controllers/supply_orders/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 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 @@ -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/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..bc2f36987 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 @@ -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/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..50814f2d6 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 @@ -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/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..bbc3550b8 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 @@ -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/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..bc2f36987 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 @@ -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/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..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/tags/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/tags/helpers/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/tags/index.php +++ b/admin-dev/themes/default/template/controllers/tags/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 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 @@ -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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/tax_rules/index.php +++ b/admin-dev/themes/default/template/controllers/tax_rules/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 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 @@ -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/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..bc2f36987 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/themes/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/themes/helpers/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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/themes/index.php +++ b/admin-dev/themes/default/template/controllers/themes/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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/tracking/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/tracking/helpers/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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/tracking/index.php +++ b/admin-dev/themes/default/template/controllers/tracking/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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/translations/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/translations/helpers/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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/translations/index.php +++ b/admin-dev/themes/default/template/controllers/translations/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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/warehouses/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/warehouses/helpers/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/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..bbc3550b8 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 @@ -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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/warehouses/index.php +++ b/admin-dev/themes/default/template/controllers/warehouses/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/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..bbc3550b8 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 @@ -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/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..50814f2d6 100644 --- a/admin-dev/themes/default/template/controllers/webservice/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/webservice/helpers/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/controllers/webservice/index.php +++ b/admin-dev/themes/default/template/controllers/webservice/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/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..8f9a8c34d 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 *} 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..6efa5784b 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 *} 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..bc2f36987 100644 --- a/admin-dev/themes/default/template/helpers/form/index.php +++ b/admin-dev/themes/default/template/helpers/form/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/helpers/help_access/index.php +++ b/admin-dev/themes/default/template/helpers/help_access/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/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..192f88787 100644 --- a/admin-dev/themes/default/template/helpers/index.php +++ b/admin-dev/themes/default/template/helpers/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/helpers/list/index.php +++ b/admin-dev/themes/default/template/helpers/list/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/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..bc2f36987 100644 --- a/admin-dev/themes/default/template/helpers/options/index.php +++ b/admin-dev/themes/default/template/helpers/options/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/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..dc270ac08 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 *} 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..bc2f36987 100644 --- a/admin-dev/themes/default/template/helpers/view/index.php +++ b/admin-dev/themes/default/template/helpers/view/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/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..0daabdd41 100644 --- a/admin-dev/uploadProductFileAttribute.php +++ b/admin-dev/uploadProductFileAttribute.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/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..f5fe8cd4a 100644 --- a/cache/cachefs/index.php +++ b/cache/cachefs/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/cache/index.php b/cache/index.php index a9bf4a463..f5fe8cd4a 100644 --- a/cache/index.php +++ b/cache/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/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..bd2daea0e 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 */ 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..71e324c15 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 */ 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..86f10851d 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 */ diff --git a/classes/Cart.php b/classes/Cart.php index de89b0461..6941b6471 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 */ diff --git a/classes/CartRule.php b/classes/CartRule.php index a8a7419b5..5f1bf625a 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 */ diff --git a/classes/Category.php b/classes/Category.php index 9d95a7cd9..d814db0be 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 */ 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..da5e6de2d 100644 --- a/classes/CompareProduct.php +++ b/classes/CompareProduct.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$ +* @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 */ diff --git a/classes/Configuration.php b/classes/Configuration.php index 0d63e10f9..af7c23b66 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 */ 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..7790dc27c 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 */ 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 83e3b8bda..67d941779 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 */ 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..5facc03f2 100644 --- a/classes/County.php +++ b/classes/County.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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..fd22cb9f4 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 */ diff --git a/classes/Customer.php b/classes/Customer.php index 14d0e6ed1..c6eb3f70d 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 */ 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 2d0c46d3f..8fabc3853 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 */ 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..326eb9ef3 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 */ 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 538cf4cae..eb5e76f21 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 */ diff --git a/classes/Image.php b/classes/Image.php index 4ffc68ba7..0f56d1295 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 */ diff --git a/classes/ImageManager.php b/classes/ImageManager.php index c7a5ecb83..468e8231a 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 */ diff --git a/classes/ImageType.php b/classes/ImageType.php index 81f3e1d20..2c2d54e0c 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 */ diff --git a/classes/Language.php b/classes/Language.php index 83393a6a4..1a4c91a1e 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 */ diff --git a/classes/Link.php b/classes/Link.php index f950f1950..1671cbc76 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 */ diff --git a/classes/LocalizationPack.php b/classes/LocalizationPack.php index 46253a362..24a94e56f 100644 --- a/classes/LocalizationPack.php +++ b/classes/LocalizationPack.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/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..5296db846 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 */ 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 db69d26a6..8641821f0 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 */ diff --git a/classes/Message.php b/classes/Message.php index 070804a22..1680fa846 100644 --- a/classes/Message.php +++ b/classes/Message.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/Meta.php b/classes/Meta.php index 2052210c2..631b71478 100644 --- a/classes/Meta.php +++ b/classes/Meta.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7445 $ * @license 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/Notification.php b/classes/Notification.php index 11c90b5dc..31fd0d60a 100644 --- a/classes/Notification.php +++ b/classes/Notification.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: 6856 $ +* @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 */ diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index 30bdb49f1..16e24d106 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.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/Pack.php b/classes/Pack.php index 2bef33322..55701f109 100644 --- a/classes/Pack.php +++ b/classes/Pack.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/Page.php b/classes/Page.php index 9e16c3617..c9e85757b 100644 --- a/classes/Page.php +++ b/classes/Page.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6946 $ * @license 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/PaymentCC.php b/classes/PaymentCC.php index 78227870b..4d64c24f1 100644 --- a/classes/PaymentCC.php +++ b/classes/PaymentCC.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/PaymentModule.php b/classes/PaymentModule.php index 9de0ef3df..afd50e8b1 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/Product.php b/classes/Product.php index 739a0c096..efdbd36d6 100644 --- a/classes/Product.php +++ b/classes/Product.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 */ diff --git a/classes/ProductDownload.php b/classes/ProductDownload.php index 246033c4c..cc33de984 100644 --- a/classes/ProductDownload.php +++ b/classes/ProductDownload.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7099 $ * @license 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/ProductSale.php b/classes/ProductSale.php index 789c284d1..bd9046fad 100644 --- a/classes/ProductSale.php +++ b/classes/ProductSale.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7484 $ * @license 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/ProductSupplier.php b/classes/ProductSupplier.php index ea2509d29..32c6dbc95 100644 --- a/classes/ProductSupplier.php +++ b/classes/ProductSupplier.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/Profile.php b/classes/Profile.php index 4d314ca91..fa4ec33ed 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/QuickAccess.php b/classes/QuickAccess.php index 1853275a2..9ab0a7998 100644 --- a/classes/QuickAccess.php +++ b/classes/QuickAccess.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/Referrer.php b/classes/Referrer.php index f7d7762ef..ae7b6e1bd 100644 --- a/classes/Referrer.php +++ b/classes/Referrer.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/RequestSql.php b/classes/RequestSql.php index afafaa490..db0555811 100644 --- a/classes/RequestSql.php +++ b/classes/RequestSql.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/Rijndael.php b/classes/Rijndael.php index 27125935a..5494faf98 100644 --- a/classes/Rijndael.php +++ b/classes/Rijndael.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/Risk.php b/classes/Risk.php index d5d740692..86b47957e 100644 --- a/classes/Risk.php +++ b/classes/Risk.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 11158 $ * @license 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/Scene.php b/classes/Scene.php index f44ccd2e4..fd7929d9d 100644 --- a/classes/Scene.php +++ b/classes/Scene.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/Search.php b/classes/Search.php index 3f9149b93..518ec0154 100644 --- a/classes/Search.php +++ b/classes/Search.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7489 $ * @license 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/SearchEngine.php b/classes/SearchEngine.php index 9f8331bf8..a1cb93262 100644 --- a/classes/SearchEngine.php +++ b/classes/SearchEngine.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/SpecificPrice.php b/classes/SpecificPrice.php index 693f92201..1ea49c337 100644 --- a/classes/SpecificPrice.php +++ b/classes/SpecificPrice.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7158 $ * @license 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/SpecificPriceRule.php b/classes/SpecificPriceRule.php index c3ef68d03..f57ab91bd 100755 --- a/classes/SpecificPriceRule.php +++ b/classes/SpecificPriceRule.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7158 $ * @license 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/State.php b/classes/State.php index 125386361..8bf51fa4b 100644 --- a/classes/State.php +++ b/classes/State.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/Store.php b/classes/Store.php index d5d2c08a0..d92ae792b 100644 --- a/classes/Store.php +++ b/classes/Store.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/Supplier.php b/classes/Supplier.php index 816573b25..466c911e4 100644 --- a/classes/Supplier.php +++ b/classes/Supplier.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/Tab.php b/classes/Tab.php index 939dd42bf..07c4ad814 100644 --- a/classes/Tab.php +++ b/classes/Tab.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/Tag.php b/classes/Tag.php index 2df72a4bf..5ab25cee8 100644 --- a/classes/Tag.php +++ b/classes/Tag.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/Theme.php b/classes/Theme.php index 774677085..68726f36b 100644 --- a/classes/Theme.php +++ b/classes/Theme.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 1.4 $ * @license 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/Tools.php b/classes/Tools.php index c6022516b..10c5479e9 100644 --- a/classes/Tools.php +++ b/classes/Tools.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 */ diff --git a/classes/Translate.php b/classes/Translate.php index 9005e9366..bfd852601 100644 --- a/classes/Translate.php +++ b/classes/Translate.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/TranslatedConfiguration.php b/classes/TranslatedConfiguration.php index 765a0fe93..3f67682f8 100755 --- a/classes/TranslatedConfiguration.php +++ b/classes/TranslatedConfiguration.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/Upgrader.php b/classes/Upgrader.php index 03fcac837..a1f7fa9ce 100644 --- a/classes/Upgrader.php +++ b/classes/Upgrader.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/Validate.php b/classes/Validate.php index 56f418502..2aa05df0c 100644 --- a/classes/Validate.php +++ b/classes/Validate.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/Zone.php b/classes/Zone.php index d04bb2b9a..38e41668c 100644 --- a/classes/Zone.php +++ b/classes/Zone.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/cache/Cache.php b/classes/cache/Cache.php index e6eaab318..c32fc4e9b 100755 --- a/classes/cache/Cache.php +++ b/classes/cache/Cache.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/cache/CacheApc.php b/classes/cache/CacheApc.php index 8ff34b512..4a6e5924c 100644 --- a/classes/cache/CacheApc.php +++ b/classes/cache/CacheApc.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/cache/CacheFs.php b/classes/cache/CacheFs.php index 6af06beff..a573a5b5c 100755 --- a/classes/cache/CacheFs.php +++ b/classes/cache/CacheFs.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/cache/CacheMemcache.php b/classes/cache/CacheMemcache.php index 26b4ccede..6a25787c1 100755 --- a/classes/cache/CacheMemcache.php +++ b/classes/cache/CacheMemcache.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/cache/CacheXcache.php b/classes/cache/CacheXcache.php index 4f8b59eda..6cc0a3302 100644 --- a/classes/cache/CacheXcache.php +++ b/classes/cache/CacheXcache.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/cache/index.php b/classes/cache/index.php index d11b574fe..cadb1ea6e 100644 --- a/classes/cache/index.php +++ b/classes/cache/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 058a81bc5..b2d4a4af2 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.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/controller/Controller.php b/classes/controller/Controller.php index a33e7c20d..06551ff51 100644 --- a/classes/controller/Controller.php +++ b/classes/controller/Controller.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/controller/FrontController.php b/classes/controller/FrontController.php index 06ab7e983..967c20dbd 100755 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7483 $ * @license 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/controller/ModuleAdminController.php b/classes/controller/ModuleAdminController.php index dc0a4b835..a65c1bb9f 100644 --- a/classes/controller/ModuleAdminController.php +++ b/classes/controller/ModuleAdminController.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/controller/ModuleFrontController.php b/classes/controller/ModuleFrontController.php index 5064369e2..5b53494b5 100644 --- a/classes/controller/ModuleFrontController.php +++ b/classes/controller/ModuleFrontController.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/controller/index.php b/classes/controller/index.php index d11b574fe..cadb1ea6e 100644 --- a/classes/controller/index.php +++ b/classes/controller/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/db/Db.php b/classes/db/Db.php index ba6b659cf..2fb5b04bd 100644 --- a/classes/db/Db.php +++ b/classes/db/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/classes/db/DbMySQLi.php b/classes/db/DbMySQLi.php index 2d344d381..af060a9a3 100644 --- a/classes/db/DbMySQLi.php +++ b/classes/db/DbMySQLi.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/db/DbPDO.php b/classes/db/DbPDO.php index ef11ee5b0..79c3c0688 100644 --- a/classes/db/DbPDO.php +++ b/classes/db/DbPDO.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$ +* @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 */ diff --git a/classes/db/DbQuery.php b/classes/db/DbQuery.php index 53fa8ea99..24f8ab1ef 100644 --- a/classes/db/DbQuery.php +++ b/classes/db/DbQuery.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/db/MySQL.php b/classes/db/MySQL.php index 65a72f95f..182872dc4 100644 --- a/classes/db/MySQL.php +++ b/classes/db/MySQL.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6856 $ * @license 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/db/index.php b/classes/db/index.php index d11b574fe..cadb1ea6e 100644 --- a/classes/db/index.php +++ b/classes/db/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/exception/PrestaShopDatabaseException.php b/classes/exception/PrestaShopDatabaseException.php index 2bda9e8bd..8cba0f5d6 100644 --- a/classes/exception/PrestaShopDatabaseException.php +++ b/classes/exception/PrestaShopDatabaseException.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/exception/PrestaShopException.php b/classes/exception/PrestaShopException.php index ba6e0bd10..4db08c4cd 100644 --- a/classes/exception/PrestaShopException.php +++ b/classes/exception/PrestaShopException.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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/exception/PrestaShopModuleException.php b/classes/exception/PrestaShopModuleException.php index 2997ea94a..f454bb35d 100644 --- a/classes/exception/PrestaShopModuleException.php +++ b/classes/exception/PrestaShopModuleException.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/exception/PrestaShopPaymentException.php b/classes/exception/PrestaShopPaymentException.php index 9b91f4f72..dc0595aa7 100644 --- a/classes/exception/PrestaShopPaymentException.php +++ b/classes/exception/PrestaShopPaymentException.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/exception/index.php b/classes/exception/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/classes/exception/index.php +++ b/classes/exception/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/classes/helper/Helper.php b/classes/helper/Helper.php index a79f9be83..f33c2cbf7 100755 --- a/classes/helper/Helper.php +++ b/classes/helper/Helper.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/helper/HelperForm.php b/classes/helper/HelperForm.php index 45e24be2b..3f4340625 100644 --- a/classes/helper/HelperForm.php +++ b/classes/helper/HelperForm.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9194 $ * @license 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/helper/HelperHelpAccess.php b/classes/helper/HelperHelpAccess.php index e82049b29..bdda9c415 100644 --- a/classes/helper/HelperHelpAccess.php +++ b/classes/helper/HelperHelpAccess.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/helper/HelperList.php b/classes/helper/HelperList.php index bb596ed95..b7deb6e3d 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.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/helper/HelperOptions.php b/classes/helper/HelperOptions.php index 2974287ed..a8900c36c 100644 --- a/classes/helper/HelperOptions.php +++ b/classes/helper/HelperOptions.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/helper/HelperView.php b/classes/helper/HelperView.php index c2b313f42..9766eb006 100644 --- a/classes/helper/HelperView.php +++ b/classes/helper/HelperView.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9194 $ * @license 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/helper/index.php b/classes/helper/index.php index d11b574fe..cadb1ea6e 100644 --- a/classes/helper/index.php +++ b/classes/helper/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/index.php b/classes/index.php index 60bc2ce27..88e934d59 100644 --- a/classes/index.php +++ b/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/classes/log/AbstractLogger.php b/classes/log/AbstractLogger.php index 2e0bf0006..c040dfbd0 100644 --- a/classes/log/AbstractLogger.php +++ b/classes/log/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/classes/log/FileLogger.php b/classes/log/FileLogger.php index 7dddadfd1..af8e1d37c 100644 --- a/classes/log/FileLogger.php +++ b/classes/log/FileLogger.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/log/index.php b/classes/log/index.php index d11b574fe..cadb1ea6e 100644 --- a/classes/log/index.php +++ b/classes/log/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/module/CarrierModule.php b/classes/module/CarrierModule.php index 6b96295a5..5e6d6eb3d 100644 --- a/classes/module/CarrierModule.php +++ b/classes/module/CarrierModule.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/module/Module.php b/classes/module/Module.php index 6aee25b61..0d02d66ba 100644 --- a/classes/module/Module.php +++ b/classes/module/Module.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7436 $ * @license 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/module/ModuleGraph.php b/classes/module/ModuleGraph.php index dfe214a6f..1b85533f3 100644 --- a/classes/module/ModuleGraph.php +++ b/classes/module/ModuleGraph.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7329 $ * @license 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/module/ModuleGraphEngine.php b/classes/module/ModuleGraphEngine.php index 8c8ab74ab..3db85db2d 100644 --- a/classes/module/ModuleGraphEngine.php +++ b/classes/module/ModuleGraphEngine.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/module/ModuleGrid.php b/classes/module/ModuleGrid.php index d3b320e2d..7986bf5b7 100644 --- a/classes/module/ModuleGrid.php +++ b/classes/module/ModuleGrid.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/classes/module/ModuleGridEngine.php b/classes/module/ModuleGridEngine.php index 7aec7c122..6291f0678 100644 --- a/classes/module/ModuleGridEngine.php +++ b/classes/module/ModuleGridEngine.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/module/index.php b/classes/module/index.php index d11b574fe..cadb1ea6e 100644 --- a/classes/module/index.php +++ b/classes/module/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/order/Order.php b/classes/order/Order.php index 022286358..0a5597c27 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.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 */ diff --git a/classes/order/OrderCarrier.php b/classes/order/OrderCarrier.php index 04ff4b297..247ef03d1 100644 --- a/classes/order/OrderCarrier.php +++ b/classes/order/OrderCarrier.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/order/OrderCartRule.php b/classes/order/OrderCartRule.php index 0e8f1f9c7..8bd0f7032 100644 --- a/classes/order/OrderCartRule.php +++ b/classes/order/OrderCartRule.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/order/OrderDetail.php b/classes/order/OrderDetail.php index 1854bde8a..a01f8332d 100644 --- a/classes/order/OrderDetail.php +++ b/classes/order/OrderDetail.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/order/OrderDiscount.php b/classes/order/OrderDiscount.php index e593548d6..8fc06fc51 100644 --- a/classes/order/OrderDiscount.php +++ b/classes/order/OrderDiscount.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/order/OrderHistory.php b/classes/order/OrderHistory.php index 54f5427fc..556821ed4 100644 --- a/classes/order/OrderHistory.php +++ b/classes/order/OrderHistory.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/order/OrderInvoice.php b/classes/order/OrderInvoice.php index fb5d44ba8..e048edafa 100644 --- a/classes/order/OrderInvoice.php +++ b/classes/order/OrderInvoice.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/order/OrderMessage.php b/classes/order/OrderMessage.php index aaff80964..45153b617 100644 --- a/classes/order/OrderMessage.php +++ b/classes/order/OrderMessage.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/order/OrderPayment.php b/classes/order/OrderPayment.php index 412d6b796..c0806253a 100644 --- a/classes/order/OrderPayment.php +++ b/classes/order/OrderPayment.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/order/OrderReturn.php b/classes/order/OrderReturn.php index c141b1051..9d665ee45 100644 --- a/classes/order/OrderReturn.php +++ b/classes/order/OrderReturn.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/order/OrderReturnState.php b/classes/order/OrderReturnState.php index d55c0d2be..dcbf2811e 100644 --- a/classes/order/OrderReturnState.php +++ b/classes/order/OrderReturnState.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/order/OrderSlip.php b/classes/order/OrderSlip.php index e94adfb89..290330611 100644 --- a/classes/order/OrderSlip.php +++ b/classes/order/OrderSlip.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/order/OrderState.php b/classes/order/OrderState.php index 192cc7b80..536c23734 100644 --- a/classes/order/OrderState.php +++ b/classes/order/OrderState.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/order/index.php b/classes/order/index.php index d11b574fe..cadb1ea6e 100644 --- a/classes/order/index.php +++ b/classes/order/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/pdf/HTMLTemplate.php b/classes/pdf/HTMLTemplate.php index 5b0e7a49b..ee6ba0763 100755 --- a/classes/pdf/HTMLTemplate.php +++ b/classes/pdf/HTMLTemplate.php @@ -21,7 +21,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8797 $ * @license 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/pdf/HTMLTemplateDeliverySlip.php b/classes/pdf/HTMLTemplateDeliverySlip.php index 87b9ca792..13bc1c7e9 100755 --- a/classes/pdf/HTMLTemplateDeliverySlip.php +++ b/classes/pdf/HTMLTemplateDeliverySlip.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8797 $ * @license 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/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php index 9c6d3596a..2bc879f61 100755 --- a/classes/pdf/HTMLTemplateInvoice.php +++ b/classes/pdf/HTMLTemplateInvoice.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8797 $ * @license 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/pdf/HTMLTemplateOrderReturn.php b/classes/pdf/HTMLTemplateOrderReturn.php index 0ba35584f..ed1b3ff37 100755 --- a/classes/pdf/HTMLTemplateOrderReturn.php +++ b/classes/pdf/HTMLTemplateOrderReturn.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8797 $ * @license 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/pdf/HTMLTemplateSupplyOrderForm.php b/classes/pdf/HTMLTemplateSupplyOrderForm.php index 515f541ef..e9e320953 100644 --- a/classes/pdf/HTMLTemplateSupplyOrderForm.php +++ b/classes/pdf/HTMLTemplateSupplyOrderForm.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/pdf/PDF.php b/classes/pdf/PDF.php index d93b4d639..e3904b33c 100755 --- a/classes/pdf/PDF.php +++ b/classes/pdf/PDF.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8797 $ * @license 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/pdf/PDFGenerator.php b/classes/pdf/PDFGenerator.php index 7357f2b28..d9e840364 100755 --- a/classes/pdf/PDFGenerator.php +++ b/classes/pdf/PDFGenerator.php @@ -24,7 +24,6 @@ require_once(_PS_TOOL_DIR_.'tcpdf/tcpdf.php'); * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8797 $ * @license 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/pdf/index.php b/classes/pdf/index.php index d11b574fe..cadb1ea6e 100644 --- a/classes/pdf/index.php +++ b/classes/pdf/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/range/RangePrice.php b/classes/range/RangePrice.php index eb000e905..877568eff 100644 --- a/classes/range/RangePrice.php +++ b/classes/range/RangePrice.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/range/RangeWeight.php b/classes/range/RangeWeight.php index 87694f28a..89f9db117 100644 --- a/classes/range/RangeWeight.php +++ b/classes/range/RangeWeight.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/range/index.php b/classes/range/index.php index d11b574fe..cadb1ea6e 100644 --- a/classes/range/index.php +++ b/classes/range/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php index 96d8d5349..e01abf3ee 100644 --- a/classes/shop/Shop.php +++ b/classes/shop/Shop.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/shop/ShopGroup.php b/classes/shop/ShopGroup.php index df314769e..932180260 100644 --- a/classes/shop/ShopGroup.php +++ b/classes/shop/ShopGroup.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/shop/ShopUrl.php b/classes/shop/ShopUrl.php index 381ac92ac..cdd34fcd0 100644 --- a/classes/shop/ShopUrl.php +++ b/classes/shop/ShopUrl.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/shop/index.php b/classes/shop/index.php index d11b574fe..cadb1ea6e 100644 --- a/classes/shop/index.php +++ b/classes/shop/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/stock/Stock.php b/classes/stock/Stock.php index 5ed4fdf32..785da1fca 100644 --- a/classes/stock/Stock.php +++ b/classes/stock/Stock.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/stock/StockAvailable.php b/classes/stock/StockAvailable.php index 535a2c2a9..e545d21ac 100644 --- a/classes/stock/StockAvailable.php +++ b/classes/stock/StockAvailable.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/stock/StockManager.php b/classes/stock/StockManager.php index d223e8d62..c6e2331eb 100644 --- a/classes/stock/StockManager.php +++ b/classes/stock/StockManager.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9202 $ * @license 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/stock/StockManagerFactory.php b/classes/stock/StockManagerFactory.php index a792e1af9..160850221 100644 --- a/classes/stock/StockManagerFactory.php +++ b/classes/stock/StockManagerFactory.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/stock/StockManagerInterface.php b/classes/stock/StockManagerInterface.php index fc370e7f9..d902abc3c 100644 --- a/classes/stock/StockManagerInterface.php +++ b/classes/stock/StockManagerInterface.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/stock/StockManagerModule.php b/classes/stock/StockManagerModule.php index 22904deb0..3180ed914 100644 --- a/classes/stock/StockManagerModule.php +++ b/classes/stock/StockManagerModule.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/stock/StockMvt.php b/classes/stock/StockMvt.php index ce7c555fc..fa0f00100 100644 --- a/classes/stock/StockMvt.php +++ b/classes/stock/StockMvt.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/stock/StockMvtReason.php b/classes/stock/StockMvtReason.php index 353d8be8d..27a060f80 100644 --- a/classes/stock/StockMvtReason.php +++ b/classes/stock/StockMvtReason.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/stock/StockMvtWS.php b/classes/stock/StockMvtWS.php index 6a90da01e..258dc031d 100644 --- a/classes/stock/StockMvtWS.php +++ b/classes/stock/StockMvtWS.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/stock/SupplyOrder.php b/classes/stock/SupplyOrder.php index 4e1de22ba..a6901b439 100755 --- a/classes/stock/SupplyOrder.php +++ b/classes/stock/SupplyOrder.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9991 $ * @license 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/stock/SupplyOrderDetail.php b/classes/stock/SupplyOrderDetail.php index 23db9feb5..29f5bf61c 100755 --- a/classes/stock/SupplyOrderDetail.php +++ b/classes/stock/SupplyOrderDetail.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 10014 $ * @license 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/stock/SupplyOrderHistory.php b/classes/stock/SupplyOrderHistory.php index e3c6d8372..767ff6dcc 100755 --- a/classes/stock/SupplyOrderHistory.php +++ b/classes/stock/SupplyOrderHistory.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9659 $ * @license 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/stock/SupplyOrderReceiptHistory.php b/classes/stock/SupplyOrderReceiptHistory.php index 44dab0c91..10e593d03 100755 --- a/classes/stock/SupplyOrderReceiptHistory.php +++ b/classes/stock/SupplyOrderReceiptHistory.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9927 $ * @license 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/stock/SupplyOrderState.php b/classes/stock/SupplyOrderState.php index 3ed00e1d7..38d57c1a5 100755 --- a/classes/stock/SupplyOrderState.php +++ b/classes/stock/SupplyOrderState.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 10019 $ * @license 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/stock/Warehouse.php b/classes/stock/Warehouse.php index e29a9d2ca..0182d7a1b 100644 --- a/classes/stock/Warehouse.php +++ b/classes/stock/Warehouse.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/stock/WarehouseProductLocation.php b/classes/stock/WarehouseProductLocation.php index 54730565e..1d7f90a19 100644 --- a/classes/stock/WarehouseProductLocation.php +++ b/classes/stock/WarehouseProductLocation.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/stock/index.php b/classes/stock/index.php index d11b574fe..cadb1ea6e 100644 --- a/classes/stock/index.php +++ b/classes/stock/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/tax/Tax.php b/classes/tax/Tax.php index ef2294717..8d6beea8a 100644 --- a/classes/tax/Tax.php +++ b/classes/tax/Tax.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/tax/TaxCalculator.php b/classes/tax/TaxCalculator.php index 17b17d5de..2185c76ec 100644 --- a/classes/tax/TaxCalculator.php +++ b/classes/tax/TaxCalculator.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/tax/TaxManagerFactory.php b/classes/tax/TaxManagerFactory.php index 7f730d087..383495835 100644 --- a/classes/tax/TaxManagerFactory.php +++ b/classes/tax/TaxManagerFactory.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/tax/TaxManagerInterface.php b/classes/tax/TaxManagerInterface.php index b20c5406a..b4ad6cb64 100644 --- a/classes/tax/TaxManagerInterface.php +++ b/classes/tax/TaxManagerInterface.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/tax/TaxManagerModule.php b/classes/tax/TaxManagerModule.php index 23b379460..628d0d7dd 100644 --- a/classes/tax/TaxManagerModule.php +++ b/classes/tax/TaxManagerModule.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/tax/TaxRule.php b/classes/tax/TaxRule.php index 2859408c3..c45329f79 100644 --- a/classes/tax/TaxRule.php +++ b/classes/tax/TaxRule.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/tax/TaxRulesGroup.php b/classes/tax/TaxRulesGroup.php index 52a06a01c..f950f46bd 100644 --- a/classes/tax/TaxRulesGroup.php +++ b/classes/tax/TaxRulesGroup.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/tax/TaxRulesTaxManager.php b/classes/tax/TaxRulesTaxManager.php index e4e98c3a0..eb4cabc7a 100644 --- a/classes/tax/TaxRulesTaxManager.php +++ b/classes/tax/TaxRulesTaxManager.php @@ -21,7 +21,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/tax/index.php b/classes/tax/index.php index d11b574fe..cadb1ea6e 100644 --- a/classes/tax/index.php +++ b/classes/tax/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/classes/webservice/WebserviceException.php b/classes/webservice/WebserviceException.php index 25a8285b7..7f2ebde62 100755 --- a/classes/webservice/WebserviceException.php +++ b/classes/webservice/WebserviceException.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/webservice/WebserviceKey.php b/classes/webservice/WebserviceKey.php index d906effd5..b92cf9516 100755 --- a/classes/webservice/WebserviceKey.php +++ b/classes/webservice/WebserviceKey.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/webservice/WebserviceOutputBuilder.php b/classes/webservice/WebserviceOutputBuilder.php index 0dc2c4504..552e44881 100755 --- a/classes/webservice/WebserviceOutputBuilder.php +++ b/classes/webservice/WebserviceOutputBuilder.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/webservice/WebserviceOutputInterface.php b/classes/webservice/WebserviceOutputInterface.php index 4a75f9197..ac50aab3b 100755 --- a/classes/webservice/WebserviceOutputInterface.php +++ b/classes/webservice/WebserviceOutputInterface.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/webservice/WebserviceOutputXML.php b/classes/webservice/WebserviceOutputXML.php index 6dcdc4fe4..e99673c8a 100755 --- a/classes/webservice/WebserviceOutputXML.php +++ b/classes/webservice/WebserviceOutputXML.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/webservice/WebserviceRequest.php b/classes/webservice/WebserviceRequest.php index 40058aa5d..2df91e930 100644 --- a/classes/webservice/WebserviceRequest.php +++ b/classes/webservice/WebserviceRequest.php @@ -20,7 +20,6 @@ * * @author Prestashop SA * @copyright 2007-2010 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/webservice/WebserviceSpecificManagementImages.php b/classes/webservice/WebserviceSpecificManagementImages.php index 5b1135561..7901617bc 100755 --- a/classes/webservice/WebserviceSpecificManagementImages.php +++ b/classes/webservice/WebserviceSpecificManagementImages.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/webservice/WebserviceSpecificManagementInterface.php b/classes/webservice/WebserviceSpecificManagementInterface.php index 9eae490c6..d6ff7760c 100755 --- a/classes/webservice/WebserviceSpecificManagementInterface.php +++ b/classes/webservice/WebserviceSpecificManagementInterface.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/webservice/WebserviceSpecificManagementSearch.php b/classes/webservice/WebserviceSpecificManagementSearch.php index d0b627f27..ac979dacf 100755 --- a/classes/webservice/WebserviceSpecificManagementSearch.php +++ b/classes/webservice/WebserviceSpecificManagementSearch.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/webservice/index.php b/classes/webservice/index.php index d11b574fe..cadb1ea6e 100644 --- a/classes/webservice/index.php +++ b/classes/webservice/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/cms.php b/cms.php index 1bcb35af3..a100f2513 100644 --- a/cms.php +++ b/cms.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/config/alias.php b/config/alias.php index 0d4611e5e..511c4ec5b 100644 --- a/config/alias.php +++ b/config/alias.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/config/autoload.php b/config/autoload.php index 57c308957..021289250 100644 --- a/config/autoload.php +++ b/config/autoload.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/config/config.inc.php b/config/config.inc.php index f80438cc0..568a8f90a 100644 --- a/config/config.inc.php +++ b/config/config.inc.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 */ diff --git a/config/defines.inc.php b/config/defines.inc.php index 3fcd253c7..7d12cd05e 100755 --- a/config/defines.inc.php +++ b/config/defines.inc.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/config/defines_uri.inc.php b/config/defines_uri.inc.php index 918010c0f..86e0b1242 100644 --- a/config/defines_uri.inc.php +++ b/config/defines_uri.inc.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/config/index.php b/config/index.php index 4ec513be5..c9411c13f 100644 --- a/config/index.php +++ b/config/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/config/smarty.config.inc.php b/config/smarty.config.inc.php index 6061d245d..ecbc44194 100644 --- a/config/smarty.config.inc.php +++ b/config/smarty.config.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/config/smartyadmin.config.inc.php b/config/smartyadmin.config.inc.php index 6423b3692..6c9e82da2 100644 --- a/config/smartyadmin.config.inc.php +++ b/config/smartyadmin.config.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/config/smartyfront.config.inc.php b/config/smartyfront.config.inc.php index 8426ec0be..45b47c6bb 100644 --- a/config/smartyfront.config.inc.php +++ b/config/smartyfront.config.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/config/xml/index.php b/config/xml/index.php index 4ec513be5..c9411c13f 100755 --- a/config/xml/index.php +++ b/config/xml/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/contact-form.php b/contact-form.php index 4a83e3277..2573da9bc 100644 --- a/contact-form.php +++ b/contact-form.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7471 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminAccessController.php b/controllers/admin/AdminAccessController.php index ca3ab9ccb..bcbc90e2c 100644 --- a/controllers/admin/AdminAccessController.php +++ b/controllers/admin/AdminAccessController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminAddonsCatalogController.php b/controllers/admin/AdminAddonsCatalogController.php index 4a32d15b1..0608ea433 100644 --- a/controllers/admin/AdminAddonsCatalogController.php +++ b/controllers/admin/AdminAddonsCatalogController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php index d64fa0670..a59cf68f1 100644 --- a/controllers/admin/AdminAddressesController.php +++ b/controllers/admin/AdminAddressesController.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/controllers/admin/AdminAdminPreferencesController.php b/controllers/admin/AdminAdminPreferencesController.php index 3b282c93a..f1b09435c 100644 --- a/controllers/admin/AdminAdminPreferencesController.php +++ b/controllers/admin/AdminAdminPreferencesController.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/controllers/admin/AdminAttachmentsController.php b/controllers/admin/AdminAttachmentsController.php index a3fb55996..d9b651288 100644 --- a/controllers/admin/AdminAttachmentsController.php +++ b/controllers/admin/AdminAttachmentsController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminAttributeGeneratorController.php b/controllers/admin/AdminAttributeGeneratorController.php index 17fed7aaf..11bc4326d 100644 --- a/controllers/admin/AdminAttributeGeneratorController.php +++ b/controllers/admin/AdminAttributeGeneratorController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php index 623a65340..0f3aed7ac 100644 --- a/controllers/admin/AdminAttributesGroupsController.php +++ b/controllers/admin/AdminAttributesGroupsController.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 */ diff --git a/controllers/admin/AdminBackupController.php b/controllers/admin/AdminBackupController.php index 50fdcc81d..a037769e1 100644 --- a/controllers/admin/AdminBackupController.php +++ b/controllers/admin/AdminBackupController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7320 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index b08410dea..715045420 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php index 2fb64e62d..7e74fdf46 100644 --- a/controllers/admin/AdminCartRulesController.php +++ b/controllers/admin/AdminCartRulesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7060 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 1b65a193a..f1fcbdf82 100755 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php index 34a33484f..6c5f7229b 100644 --- a/controllers/admin/AdminCategoriesController.php +++ b/controllers/admin/AdminCategoriesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminCmsCategoriesController.php b/controllers/admin/AdminCmsCategoriesController.php index 075b97865..ae64435f6 100644 --- a/controllers/admin/AdminCmsCategoriesController.php +++ b/controllers/admin/AdminCmsCategoriesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminCmsContentController.php b/controllers/admin/AdminCmsContentController.php index 74f196964..566e4d591 100644 --- a/controllers/admin/AdminCmsContentController.php +++ b/controllers/admin/AdminCmsContentController.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/controllers/admin/AdminCmsController.php b/controllers/admin/AdminCmsController.php index fd63c6410..8029a1a2b 100644 --- a/controllers/admin/AdminCmsController.php +++ b/controllers/admin/AdminCmsController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7300 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminContactsController.php b/controllers/admin/AdminContactsController.php index c91720abc..4a3b600b5 100644 --- a/controllers/admin/AdminContactsController.php +++ b/controllers/admin/AdminContactsController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7300 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php index da0454a91..42f76443c 100644 --- a/controllers/admin/AdminCountriesController.php +++ b/controllers/admin/AdminCountriesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php index 20276a68d..12e92aa2f 100644 --- a/controllers/admin/AdminCurrenciesController.php +++ b/controllers/admin/AdminCurrenciesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7300 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminCustomerPreferencesController.php b/controllers/admin/AdminCustomerPreferencesController.php index 6475830af..a7188b27d 100644 --- a/controllers/admin/AdminCustomerPreferencesController.php +++ b/controllers/admin/AdminCustomerPreferencesController.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/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php index 29dd8648e..3431f6944 100644 --- a/controllers/admin/AdminCustomerThreadsController.php +++ b/controllers/admin/AdminCustomerThreadsController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7471 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index f1f39517d..6b9a8f54b 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminDeliverySlipController.php b/controllers/admin/AdminDeliverySlipController.php index 74b1cc627..f5156e169 100644 --- a/controllers/admin/AdminDeliverySlipController.php +++ b/controllers/admin/AdminDeliverySlipController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php index 996f82805..e63b76d9d 100644 --- a/controllers/admin/AdminEmailsController.php +++ b/controllers/admin/AdminEmailsController.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 */ diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php index 6662893e7..fbe815d6c 100644 --- a/controllers/admin/AdminEmployeesController.php +++ b/controllers/admin/AdminEmployeesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index e486325ab..e1d50d7a3 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.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 */ diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index 1da132db3..d4fa7af36 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminGeolocationController.php b/controllers/admin/AdminGeolocationController.php index 343bbb728..63156dcde 100755 --- a/controllers/admin/AdminGeolocationController.php +++ b/controllers/admin/AdminGeolocationController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php index 19968ff18..ef8292c8d 100644 --- a/controllers/admin/AdminGroupsController.php +++ b/controllers/admin/AdminGroupsController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7332 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 6a73b8d58..3d3ba36c6 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.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/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index 1d6d75383..03db6a6d4 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.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/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index fc2884519..a6c0ddcf1 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminInformationController.php b/controllers/admin/AdminInformationController.php index d55f5690d..2d1c205fc 100644 --- a/controllers/admin/AdminInformationController.php +++ b/controllers/admin/AdminInformationController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminInvoicesController.php b/controllers/admin/AdminInvoicesController.php index bc9c3d307..c2658675a 100644 --- a/controllers/admin/AdminInvoicesController.php +++ b/controllers/admin/AdminInvoicesController.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/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php index a8682e8c5..2f5607602 100644 --- a/controllers/admin/AdminLanguagesController.php +++ b/controllers/admin/AdminLanguagesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminLocalizationController.php b/controllers/admin/AdminLocalizationController.php index 47c639be1..4641613f9 100644 --- a/controllers/admin/AdminLocalizationController.php +++ b/controllers/admin/AdminLocalizationController.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 */ diff --git a/controllers/admin/AdminLoginController.php b/controllers/admin/AdminLoginController.php index 844af77a6..ba64159b4 100755 --- a/controllers/admin/AdminLoginController.php +++ b/controllers/admin/AdminLoginController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminLogsController.php b/controllers/admin/AdminLogsController.php index 68731736a..5f8808cba 100644 --- a/controllers/admin/AdminLogsController.php +++ b/controllers/admin/AdminLogsController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminMaintenanceController.php b/controllers/admin/AdminMaintenanceController.php index 9e21ae348..8891c9ad5 100644 --- a/controllers/admin/AdminMaintenanceController.php +++ b/controllers/admin/AdminMaintenanceController.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/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index b456f401d..9f87624e2 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index c33ac29bd..a3031e89b 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7445 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 5b24f649b..b3bc20d79 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9790 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminModulesPositionsController.php b/controllers/admin/AdminModulesPositionsController.php index e36a207b4..d5effb528 100644 --- a/controllers/admin/AdminModulesPositionsController.php +++ b/controllers/admin/AdminModulesPositionsController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA o * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7466 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminOrderMessageController.php b/controllers/admin/AdminOrderMessageController.php index 53fa67ca1..dea15a1d9 100644 --- a/controllers/admin/AdminOrderMessageController.php +++ b/controllers/admin/AdminOrderMessageController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminOrderPreferencesController.php b/controllers/admin/AdminOrderPreferencesController.php index 9c604ef42..cd60f3cad 100644 --- a/controllers/admin/AdminOrderPreferencesController.php +++ b/controllers/admin/AdminOrderPreferencesController.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/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index bad5926b4..c42c28797 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.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/controllers/admin/AdminOutstandingController.php b/controllers/admin/AdminOutstandingController.php index ab22b1406..d7ea74bfe 100644 --- a/controllers/admin/AdminOutstandingController.php +++ b/controllers/admin/AdminOutstandingController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php index 60c92d95f..f701401e7 100644 --- a/controllers/admin/AdminPPreferencesController.php +++ b/controllers/admin/AdminPPreferencesController.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 */ diff --git a/controllers/admin/AdminPaymentController.php b/controllers/admin/AdminPaymentController.php index 7ca81c3a4..dbb3f4859 100644 --- a/controllers/admin/AdminPaymentController.php +++ b/controllers/admin/AdminPaymentController.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 */ diff --git a/controllers/admin/AdminPdfController.php b/controllers/admin/AdminPdfController.php index 2f4073484..872b49e0d 100644 --- a/controllers/admin/AdminPdfController.php +++ b/controllers/admin/AdminPdfController.php @@ -20,7 +20,6 @@ ing* * * @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/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php index a3dd63340..08606f101 100644 --- a/controllers/admin/AdminPerformanceController.php +++ b/controllers/admin/AdminPerformanceController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminPreferencesController.php b/controllers/admin/AdminPreferencesController.php index 6f0da3fa0..20e44d438 100644 --- a/controllers/admin/AdminPreferencesController.php +++ b/controllers/admin/AdminPreferencesController.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 */ diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 024ce2a4a..ae2b93f8d 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.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 */ diff --git a/controllers/admin/AdminProfilesController.php b/controllers/admin/AdminProfilesController.php index 552541318..d6e1a4cd7 100644 --- a/controllers/admin/AdminProfilesController.php +++ b/controllers/admin/AdminProfilesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminQuickAccessesController.php b/controllers/admin/AdminQuickAccessesController.php index 18caf0351..3697c186b 100644 --- a/controllers/admin/AdminQuickAccessesController.php +++ b/controllers/admin/AdminQuickAccessesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminRangePriceController.php b/controllers/admin/AdminRangePriceController.php index 535acaf98..614033b7b 100644 --- a/controllers/admin/AdminRangePriceController.php +++ b/controllers/admin/AdminRangePriceController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminRangeWeightController.php b/controllers/admin/AdminRangeWeightController.php index df097336c..5d94514f4 100644 --- a/controllers/admin/AdminRangeWeightController.php +++ b/controllers/admin/AdminRangeWeightController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminReferrersController.php b/controllers/admin/AdminReferrersController.php index 9cf5eea23..0abcd5489 100644 --- a/controllers/admin/AdminReferrersController.php +++ b/controllers/admin/AdminReferrersController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminRequestSqlController.php b/controllers/admin/AdminRequestSqlController.php index 81a28a724..2053fd9dd 100644 --- a/controllers/admin/AdminRequestSqlController.php +++ b/controllers/admin/AdminRequestSqlController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8897 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminReturnController.php b/controllers/admin/AdminReturnController.php index 9ab15170b..4910ad358 100644 --- a/controllers/admin/AdminReturnController.php +++ b/controllers/admin/AdminReturnController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7060 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminScenesController.php b/controllers/admin/AdminScenesController.php index 3b427088d..13a04a315 100644 --- a/controllers/admin/AdminScenesController.php +++ b/controllers/admin/AdminScenesController.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/controllers/admin/AdminSearchConfController.php b/controllers/admin/AdminSearchConfController.php index baabacc6f..a9b5aada1 100644 --- a/controllers/admin/AdminSearchConfController.php +++ b/controllers/admin/AdminSearchConfController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php index fc15b4cea..bdaa0afed 100644 --- a/controllers/admin/AdminSearchController.php +++ b/controllers/admin/AdminSearchController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminSearchEnginesController.php b/controllers/admin/AdminSearchEnginesController.php index 5aa9a6a45..bee6d3a29 100644 --- a/controllers/admin/AdminSearchEnginesController.php +++ b/controllers/admin/AdminSearchEnginesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminShippingController.php b/controllers/admin/AdminShippingController.php index 38fea8837..f7dfcb7b4 100644 --- a/controllers/admin/AdminShippingController.php +++ b/controllers/admin/AdminShippingController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index 8f3ebefb7..02ab4ed3c 100755 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 1.4 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminShopGroupController.php b/controllers/admin/AdminShopGroupController.php index 2ba19b14a..74ace8f31 100644 --- a/controllers/admin/AdminShopGroupController.php +++ b/controllers/admin/AdminShopGroupController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php index 542faea67..2c6d120f1 100644 --- a/controllers/admin/AdminShopUrlController.php +++ b/controllers/admin/AdminShopUrlController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php index 4b77d88ca..ed6e86087 100644 --- a/controllers/admin/AdminSlipController.php +++ b/controllers/admin/AdminSlipController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminSpecificPriceRuleController.php b/controllers/admin/AdminSpecificPriceRuleController.php index 9b23d6d03..32c205957 100755 --- a/controllers/admin/AdminSpecificPriceRuleController.php +++ b/controllers/admin/AdminSpecificPriceRuleController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminStatesController.php b/controllers/admin/AdminStatesController.php index e37f84e4c..4783253cf 100644 --- a/controllers/admin/AdminStatesController.php +++ b/controllers/admin/AdminStatesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 9a0985060..5954cd848 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php index 500e91547..caae937b4 100644 --- a/controllers/admin/AdminStatsTabController.php +++ b/controllers/admin/AdminStatsTabController.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 */ diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php index 6776c30bc..35ed6c7c5 100644 --- a/controllers/admin/AdminStatusesController.php +++ b/controllers/admin/AdminStatusesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminStockConfigurationController.php b/controllers/admin/AdminStockConfigurationController.php index c082f5838..4e56c0445 100644 --- a/controllers/admin/AdminStockConfigurationController.php +++ b/controllers/admin/AdminStockConfigurationController.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/controllers/admin/AdminStockCoverController.php b/controllers/admin/AdminStockCoverController.php index d7179df29..c089eec7e 100644 --- a/controllers/admin/AdminStockCoverController.php +++ b/controllers/admin/AdminStockCoverController.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/controllers/admin/AdminStockInstantStateController.php b/controllers/admin/AdminStockInstantStateController.php index 1c7a961fa..be35ebdc9 100644 --- a/controllers/admin/AdminStockInstantStateController.php +++ b/controllers/admin/AdminStockInstantStateController.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/controllers/admin/AdminStockManagementController.php b/controllers/admin/AdminStockManagementController.php index d9b161c7c..79ecc0f8b 100644 --- a/controllers/admin/AdminStockManagementController.php +++ b/controllers/admin/AdminStockManagementController.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 */ diff --git a/controllers/admin/AdminStockMvtController.php b/controllers/admin/AdminStockMvtController.php index 6486113ab..7a548e4e0 100644 --- a/controllers/admin/AdminStockMvtController.php +++ b/controllers/admin/AdminStockMvtController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9565 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php index 56402a149..288787ee7 100644 --- a/controllers/admin/AdminStoresController.php +++ b/controllers/admin/AdminStoresController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php index 322790bc3..9059907bc 100644 --- a/controllers/admin/AdminSuppliersController.php +++ b/controllers/admin/AdminSuppliersController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7300 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php index b39d1cf64..1d7f81cb2 100644 --- a/controllers/admin/AdminSupplyOrdersController.php +++ b/controllers/admin/AdminSupplyOrdersController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 10019 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminTabsController.php b/controllers/admin/AdminTabsController.php index c6ba84aa2..3c7ee6add 100644 --- a/controllers/admin/AdminTabsController.php +++ b/controllers/admin/AdminTabsController.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 */ diff --git a/controllers/admin/AdminTagsController.php b/controllers/admin/AdminTagsController.php index 1dbee0ac3..070c44d16 100644 --- a/controllers/admin/AdminTagsController.php +++ b/controllers/admin/AdminTagsController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php index f16029cb2..c7621c90f 100644 --- a/controllers/admin/AdminTaxRulesGroupController.php +++ b/controllers/admin/AdminTaxRulesGroupController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminTaxesController.php b/controllers/admin/AdminTaxesController.php index f4b836c74..a063033d8 100644 --- a/controllers/admin/AdminTaxesController.php +++ b/controllers/admin/AdminTaxesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7060 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index c7f326c24..5d498d56e 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7346 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/AdminTrackingController.php b/controllers/admin/AdminTrackingController.php index 3db972175..cf3efd77e 100644 --- a/controllers/admin/AdminTrackingController.php +++ b/controllers/admin/AdminTrackingController.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/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index e7997a368..98cd2748a 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.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/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php index 8a1e4aaba..7ccfcae70 100644 --- a/controllers/admin/AdminWarehousesController.php +++ b/controllers/admin/AdminWarehousesController.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 */ diff --git a/controllers/admin/AdminWebserviceController.php b/controllers/admin/AdminWebserviceController.php index 06a82ef8d..8331fbcf7 100755 --- a/controllers/admin/AdminWebserviceController.php +++ b/controllers/admin/AdminWebserviceController.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/controllers/admin/AdminZonesController.php b/controllers/admin/AdminZonesController.php index 57a2d629c..483da16e7 100644 --- a/controllers/admin/AdminZonesController.php +++ b/controllers/admin/AdminZonesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7300 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/admin/index.php b/controllers/admin/index.php index d11b574fe..cadb1ea6e 100644 --- a/controllers/admin/index.php +++ b/controllers/admin/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php index eac11a436..214720329 100644 --- a/controllers/front/AddressController.php +++ b/controllers/front/AddressController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7095 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/AddressesController.php b/controllers/front/AddressesController.php index 9e0efa374..655818cc8 100644 --- a/controllers/front/AddressesController.php +++ b/controllers/front/AddressesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/AttachmentController.php b/controllers/front/AttachmentController.php index 2ed7a6443..11eb8a71a 100644 --- a/controllers/front/AttachmentController.php +++ b/controllers/front/AttachmentController.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/controllers/front/AuthController.php b/controllers/front/AuthController.php index c067b5ace..92859d12c 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.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/controllers/front/BestSalesController.php b/controllers/front/BestSalesController.php index c68d33d18..170f6c715 100644 --- a/controllers/front/BestSalesController.php +++ b/controllers/front/BestSalesController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php index ef2372e21..61ab0a91b 100644 --- a/controllers/front/CartController.php +++ b/controllers/front/CartController.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/controllers/front/CategoryController.php b/controllers/front/CategoryController.php index 366df5250..bb498b364 100644 --- a/controllers/front/CategoryController.php +++ b/controllers/front/CategoryController.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 */ diff --git a/controllers/front/ChangeCurrencyController.php b/controllers/front/ChangeCurrencyController.php index 8a074a70c..b2ca943d5 100644 --- a/controllers/front/ChangeCurrencyController.php +++ b/controllers/front/ChangeCurrencyController.php @@ -20,7 +20,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/controllers/front/CmsController.php b/controllers/front/CmsController.php index 95d7c1395..8a040d93f 100644 --- a/controllers/front/CmsController.php +++ b/controllers/front/CmsController.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/controllers/front/CompareController.php b/controllers/front/CompareController.php index 86e09c748..16aae6a1b 100644 --- a/controllers/front/CompareController.php +++ b/controllers/front/CompareController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7507 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php index dd133b8fc..fa1f7ecda 100644 --- a/controllers/front/ContactController.php +++ b/controllers/front/ContactController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7471 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/DiscountController.php b/controllers/front/DiscountController.php index 67f9ccbb5..ac41e2cc4 100644 --- a/controllers/front/DiscountController.php +++ b/controllers/front/DiscountController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/GetFileController.php b/controllers/front/GetFileController.php index 394c69af1..ad4f02d9f 100644 --- a/controllers/front/GetFileController.php +++ b/controllers/front/GetFileController.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/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index f5452ab6d..15335ceaa 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8673 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/HistoryController.php b/controllers/front/HistoryController.php index ca40ba357..e4e809d41 100644 --- a/controllers/front/HistoryController.php +++ b/controllers/front/HistoryController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/IdentityController.php b/controllers/front/IdentityController.php index 63a10bd0a..b7ad80b88 100644 --- a/controllers/front/IdentityController.php +++ b/controllers/front/IdentityController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/IndexController.php b/controllers/front/IndexController.php index 640f76a0e..8df828c13 100644 --- a/controllers/front/IndexController.php +++ b/controllers/front/IndexController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/ManufacturerController.php b/controllers/front/ManufacturerController.php index 830acb35d..209754ae8 100644 --- a/controllers/front/ManufacturerController.php +++ b/controllers/front/ManufacturerController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/MyAccountController.php b/controllers/front/MyAccountController.php index 72c6fa7a7..90191dbcb 100644 --- a/controllers/front/MyAccountController.php +++ b/controllers/front/MyAccountController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/NewProductsController.php b/controllers/front/NewProductsController.php index 924933dda..a42daad46 100644 --- a/controllers/front/NewProductsController.php +++ b/controllers/front/NewProductsController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7480 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php index 080bbc0dc..4d9f0d869 100644 --- a/controllers/front/OrderConfirmationController.php +++ b/controllers/front/OrderConfirmationController.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/controllers/front/OrderController.php b/controllers/front/OrderController.php index 54249706e..f0febc16b 100644 --- a/controllers/front/OrderController.php +++ b/controllers/front/OrderController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7095 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index c6b466992..24fc67947 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7091 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/OrderFollowController.php b/controllers/front/OrderFollowController.php index 94a4c72b2..2ac6a39cc 100644 --- a/controllers/front/OrderFollowController.php +++ b/controllers/front/OrderFollowController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7095 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index deabeb839..9bbe1314c 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.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 */ diff --git a/controllers/front/OrderReturnController.php b/controllers/front/OrderReturnController.php index cc6f6a5f0..d5d8e2eec 100644 --- a/controllers/front/OrderReturnController.php +++ b/controllers/front/OrderReturnController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/OrderSlipController.php b/controllers/front/OrderSlipController.php index dbda3f57b..876f0cc5f 100644 --- a/controllers/front/OrderSlipController.php +++ b/controllers/front/OrderSlipController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/PageNotFoundController.php b/controllers/front/PageNotFoundController.php index a39cf56d9..81b831574 100644 --- a/controllers/front/PageNotFoundController.php +++ b/controllers/front/PageNotFoundController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php index ea8db2ed1..bff45d140 100644 --- a/controllers/front/ParentOrderController.php +++ b/controllers/front/ParentOrderController.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/controllers/front/PasswordController.php b/controllers/front/PasswordController.php index 694da2787..5f747f25b 100644 --- a/controllers/front/PasswordController.php +++ b/controllers/front/PasswordController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7471 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/PdfInvoiceController.php b/controllers/front/PdfInvoiceController.php index 36f521e12..ec49d94ba 100644 --- a/controllers/front/PdfInvoiceController.php +++ b/controllers/front/PdfInvoiceController.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/controllers/front/PdfOrderReturnController.php b/controllers/front/PdfOrderReturnController.php index d79b0c587..3b1f195a7 100644 --- a/controllers/front/PdfOrderReturnController.php +++ b/controllers/front/PdfOrderReturnController.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/controllers/front/PdfOrderSlipController.php b/controllers/front/PdfOrderSlipController.php index 7c4b5f495..0ce7f78fb 100644 --- a/controllers/front/PdfOrderSlipController.php +++ b/controllers/front/PdfOrderSlipController.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/controllers/front/PricesDropController.php b/controllers/front/PricesDropController.php index ca8d7ccad..35bf9e45a 100644 --- a/controllers/front/PricesDropController.php +++ b/controllers/front/PricesDropController.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 */ diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index 6839cdf8c..6f2590b4c 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.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 */ diff --git a/controllers/front/SearchController.php b/controllers/front/SearchController.php index 846c47d49..de94d0c62 100644 --- a/controllers/front/SearchController.php +++ b/controllers/front/SearchController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/SitemapController.php b/controllers/front/SitemapController.php index f3d031911..aaa72b560 100644 --- a/controllers/front/SitemapController.php +++ b/controllers/front/SitemapController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/StatisticsController.php b/controllers/front/StatisticsController.php index a8b21059c..669b8106d 100644 --- a/controllers/front/StatisticsController.php +++ b/controllers/front/StatisticsController.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/controllers/front/StoresController.php b/controllers/front/StoresController.php index 70a69e277..77e2bf669 100644 --- a/controllers/front/StoresController.php +++ b/controllers/front/StoresController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7471 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/SupplierController.php b/controllers/front/SupplierController.php index c3f83f178..af980192b 100644 --- a/controllers/front/SupplierController.php +++ b/controllers/front/SupplierController.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/controllers/front/index.php b/controllers/front/index.php index 26febfd8a..f9a2b339c 100644 --- a/controllers/front/index.php +++ b/controllers/front/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/controllers/index.php b/controllers/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/controllers/index.php +++ b/controllers/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/css/index.php b/css/index.php index 4ec513be5..c9411c13f 100644 --- a/css/index.php +++ b/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/discount.php b/discount.php index 9aab28f51..144665fc0 100644 --- a/discount.php +++ b/discount.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/docs/csv_import/index.php b/docs/csv_import/index.php index 9a8d9bf36..7a626751d 100644 --- a/docs/csv_import/index.php +++ b/docs/csv_import/index.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/docs/dev/index.php b/docs/dev/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/docs/dev/index.php +++ b/docs/dev/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/docs/index.php b/docs/index.php index d377b4cba..7a626751d 100644 --- a/docs/index.php +++ b/docs/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/docs/licences/index.php b/docs/licences/index.php index 4ec513be5..c9411c13f 100644 --- a/docs/licences/index.php +++ b/docs/licences/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/footer.php b/footer.php index 5103bfebc..da4d2d42e 100644 --- a/footer.php +++ b/footer.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/get-file.php b/get-file.php index 4ae55b2ad..20b640370 100644 --- a/get-file.php +++ b/get-file.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/guest-tracking.php b/guest-tracking.php index 37545294a..e654d4c38 100644 --- a/guest-tracking.php +++ b/guest-tracking.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/header.php b/header.php index 64c6ffc86..bd81a53be 100644 --- a/header.php +++ b/header.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/history.php b/history.php index 857bc9df9..b752e0c68 100644 --- a/history.php +++ b/history.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/identity.php b/identity.php index f86aab4f1..f0f557be0 100644 --- a/identity.php +++ b/identity.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/images.inc.php b/images.inc.php index 626ebb9ec..062e6a8b9 100644 --- a/images.inc.php +++ b/images.inc.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/img/admin/index.php b/img/admin/index.php index 60bc2ce27..88e934d59 100644 --- a/img/admin/index.php +++ b/img/admin/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/img/c/index.php b/img/c/index.php index 60bc2ce27..88e934d59 100644 --- a/img/c/index.php +++ b/img/c/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/img/cms/index.php b/img/cms/index.php index d377b4cba..7a626751d 100644 --- a/img/cms/index.php +++ b/img/cms/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/img/co/index.php b/img/co/index.php index 60bc2ce27..88e934d59 100644 --- a/img/co/index.php +++ b/img/co/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/img/genders/index.php b/img/genders/index.php index 5be4163e3..08550506c 100644 --- a/img/genders/index.php +++ b/img/genders/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/img/index.php b/img/index.php index 60bc2ce27..88e934d59 100644 --- a/img/index.php +++ b/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/img/jquery-ui/index.php b/img/jquery-ui/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/img/jquery-ui/index.php +++ b/img/jquery-ui/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/img/l/index.php b/img/l/index.php index 60bc2ce27..88e934d59 100644 --- a/img/l/index.php +++ b/img/l/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/img/m/index.php b/img/m/index.php index 60bc2ce27..88e934d59 100644 --- a/img/m/index.php +++ b/img/m/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/img/os/index.php b/img/os/index.php index 60bc2ce27..88e934d59 100644 --- a/img/os/index.php +++ b/img/os/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/img/p/index.php b/img/p/index.php index 60bc2ce27..88e934d59 100644 --- a/img/p/index.php +++ b/img/p/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/img/s/index.php b/img/s/index.php index 60bc2ce27..88e934d59 100644 --- a/img/s/index.php +++ b/img/s/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/img/scenes/index.php b/img/scenes/index.php index 60bc2ce27..88e934d59 100644 --- a/img/scenes/index.php +++ b/img/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/img/scenes/thumbs/index.php b/img/scenes/thumbs/index.php index 60bc2ce27..88e934d59 100644 --- a/img/scenes/thumbs/index.php +++ b/img/scenes/thumbs/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/img/st/index.php b/img/st/index.php index 60bc2ce27..88e934d59 100755 --- a/img/st/index.php +++ b/img/st/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/img/su/index.php b/img/su/index.php index 60bc2ce27..88e934d59 100644 --- a/img/su/index.php +++ b/img/su/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/img/t/index.php b/img/t/index.php index 60bc2ce27..88e934d59 100644 --- a/img/t/index.php +++ b/img/t/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/img/tmp/index.php b/img/tmp/index.php index 60bc2ce27..88e934d59 100644 --- a/img/tmp/index.php +++ b/img/tmp/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/index.php b/index.php index 281143a05..8fb339441 100644 --- a/index.php +++ b/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/classes/controllerHttp.php b/install-dev/classes/controllerHttp.php index 7fccc49a4..4cb1eade6 100644 --- a/install-dev/classes/controllerHttp.php +++ b/install-dev/classes/controllerHttp.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/classes/exception.php b/install-dev/classes/exception.php index 4e934d598..d1e7ace19 100644 --- a/install-dev/classes/exception.php +++ b/install-dev/classes/exception.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/classes/index.php b/install-dev/classes/index.php index d11b574fe..cadb1ea6e 100644 --- a/install-dev/classes/index.php +++ b/install-dev/classes/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/classes/language.php b/install-dev/classes/language.php index 57098df01..d877a8564 100644 --- a/install-dev/classes/language.php +++ b/install-dev/classes/language.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/classes/languages.php b/install-dev/classes/languages.php index df57b5beb..a5031ef87 100644 --- a/install-dev/classes/languages.php +++ b/install-dev/classes/languages.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/classes/model.php b/install-dev/classes/model.php index 15af24e7f..d0215e7cd 100644 --- a/install-dev/classes/model.php +++ b/install-dev/classes/model.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/classes/session.php b/install-dev/classes/session.php index 421faabf4..4d7c5b0c3 100644 --- a/install-dev/classes/session.php +++ b/install-dev/classes/session.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/classes/simplexml.php b/install-dev/classes/simplexml.php index 2c0cf2331..9d0af565c 100644 --- a/install-dev/classes/simplexml.php +++ b/install-dev/classes/simplexml.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/classes/sqlLoader.php b/install-dev/classes/sqlLoader.php index 27b9b4064..0a788eac5 100644 --- a/install-dev/classes/sqlLoader.php +++ b/install-dev/classes/sqlLoader.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/classes/xmlLoader.php b/install-dev/classes/xmlLoader.php index e8c5566b8..87067a7be 100644 --- a/install-dev/classes/xmlLoader.php +++ b/install-dev/classes/xmlLoader.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/controllers/console/index.php b/install-dev/controllers/console/index.php index d4b603ff4..8c890bb60 100644 --- a/install-dev/controllers/console/index.php +++ b/install-dev/controllers/console/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/controllers/http/configure.php b/install-dev/controllers/http/configure.php index ff7160ca6..8feabe68b 100644 --- a/install-dev/controllers/http/configure.php +++ b/install-dev/controllers/http/configure.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/controllers/http/database.php b/install-dev/controllers/http/database.php index 18cc95e7f..ddaff8f83 100644 --- a/install-dev/controllers/http/database.php +++ b/install-dev/controllers/http/database.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/controllers/http/index.php b/install-dev/controllers/http/index.php index d4b603ff4..8c890bb60 100644 --- a/install-dev/controllers/http/index.php +++ b/install-dev/controllers/http/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/controllers/http/process.php b/install-dev/controllers/http/process.php index b54585b7b..8e375c2bb 100644 --- a/install-dev/controllers/http/process.php +++ b/install-dev/controllers/http/process.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/controllers/http/system.php b/install-dev/controllers/http/system.php index 46537d514..f862d703d 100644 --- a/install-dev/controllers/http/system.php +++ b/install-dev/controllers/http/system.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/controllers/http/welcome.php b/install-dev/controllers/http/welcome.php index 3966b389e..e66ccc049 100644 --- a/install-dev/controllers/http/welcome.php +++ b/install-dev/controllers/http/welcome.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/controllers/index.php b/install-dev/controllers/index.php index d11b574fe..cadb1ea6e 100644 --- a/install-dev/controllers/index.php +++ b/install-dev/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/data/img/genders/index.php b/install-dev/data/img/genders/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/data/img/genders/index.php +++ b/install-dev/data/img/genders/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/data/img/index.php b/install-dev/data/img/index.php index d4b603ff4..8c890bb60 100644 --- a/install-dev/data/img/index.php +++ b/install-dev/data/img/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/data/img/os/index.php b/install-dev/data/img/os/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/data/img/os/index.php +++ b/install-dev/data/img/os/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/data/img/t/index.php b/install-dev/data/img/t/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/data/img/t/index.php +++ b/install-dev/data/img/t/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/data/index.php b/install-dev/data/index.php index d11b574fe..cadb1ea6e 100644 --- a/install-dev/data/index.php +++ b/install-dev/data/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/data/xml/index.php b/install-dev/data/xml/index.php index d4b603ff4..8c890bb60 100644 --- a/install-dev/data/xml/index.php +++ b/install-dev/data/xml/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/data/index.php b/install-dev/fixtures/apple/data/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/fixtures/apple/data/index.php +++ b/install-dev/fixtures/apple/data/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/img/c/index.php b/install-dev/fixtures/apple/img/c/index.php index f18b9ff6e..192f88787 100644 --- a/install-dev/fixtures/apple/img/c/index.php +++ b/install-dev/fixtures/apple/img/c/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/img/index.php b/install-dev/fixtures/apple/img/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/fixtures/apple/img/index.php +++ b/install-dev/fixtures/apple/img/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/img/m/index.php b/install-dev/fixtures/apple/img/m/index.php index f18b9ff6e..192f88787 100644 --- a/install-dev/fixtures/apple/img/m/index.php +++ b/install-dev/fixtures/apple/img/m/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/img/p/index.php b/install-dev/fixtures/apple/img/p/index.php index f18b9ff6e..192f88787 100644 --- a/install-dev/fixtures/apple/img/p/index.php +++ b/install-dev/fixtures/apple/img/p/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/img/scenes/index.php b/install-dev/fixtures/apple/img/scenes/index.php index f18b9ff6e..192f88787 100644 --- a/install-dev/fixtures/apple/img/scenes/index.php +++ b/install-dev/fixtures/apple/img/scenes/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/img/scenes/thumbs/index.php b/install-dev/fixtures/apple/img/scenes/thumbs/index.php index 6644723cb..bc2f36987 100644 --- a/install-dev/fixtures/apple/img/scenes/thumbs/index.php +++ b/install-dev/fixtures/apple/img/scenes/thumbs/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/img/st/index.php b/install-dev/fixtures/apple/img/st/index.php index f18b9ff6e..192f88787 100644 --- a/install-dev/fixtures/apple/img/st/index.php +++ b/install-dev/fixtures/apple/img/st/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/img/su/index.php b/install-dev/fixtures/apple/img/su/index.php index f18b9ff6e..192f88787 100644 --- a/install-dev/fixtures/apple/img/su/index.php +++ b/install-dev/fixtures/apple/img/su/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/index.php b/install-dev/fixtures/apple/index.php index d4b603ff4..8c890bb60 100644 --- a/install-dev/fixtures/apple/index.php +++ b/install-dev/fixtures/apple/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/install.php b/install-dev/fixtures/apple/install.php index dbe860794..8959561d4 100644 --- a/install-dev/fixtures/apple/install.php +++ b/install-dev/fixtures/apple/install.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/fixtures/apple/langs/br/data/index.php b/install-dev/fixtures/apple/langs/br/data/index.php index 6644723cb..bc2f36987 100644 --- a/install-dev/fixtures/apple/langs/br/data/index.php +++ b/install-dev/fixtures/apple/langs/br/data/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/langs/br/index.php b/install-dev/fixtures/apple/langs/br/index.php index f18b9ff6e..192f88787 100644 --- a/install-dev/fixtures/apple/langs/br/index.php +++ b/install-dev/fixtures/apple/langs/br/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/langs/de/data/index.php b/install-dev/fixtures/apple/langs/de/data/index.php index 6644723cb..bc2f36987 100644 --- a/install-dev/fixtures/apple/langs/de/data/index.php +++ b/install-dev/fixtures/apple/langs/de/data/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/langs/de/index.php b/install-dev/fixtures/apple/langs/de/index.php index f18b9ff6e..192f88787 100644 --- a/install-dev/fixtures/apple/langs/de/index.php +++ b/install-dev/fixtures/apple/langs/de/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/langs/en/data/index.php b/install-dev/fixtures/apple/langs/en/data/index.php index 6644723cb..bc2f36987 100644 --- a/install-dev/fixtures/apple/langs/en/data/index.php +++ b/install-dev/fixtures/apple/langs/en/data/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/langs/en/index.php b/install-dev/fixtures/apple/langs/en/index.php index f18b9ff6e..192f88787 100644 --- a/install-dev/fixtures/apple/langs/en/index.php +++ b/install-dev/fixtures/apple/langs/en/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/langs/es/data/index.php b/install-dev/fixtures/apple/langs/es/data/index.php index 6644723cb..bc2f36987 100644 --- a/install-dev/fixtures/apple/langs/es/data/index.php +++ b/install-dev/fixtures/apple/langs/es/data/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/langs/es/index.php b/install-dev/fixtures/apple/langs/es/index.php index f18b9ff6e..192f88787 100644 --- a/install-dev/fixtures/apple/langs/es/index.php +++ b/install-dev/fixtures/apple/langs/es/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/langs/fr/data/index.php b/install-dev/fixtures/apple/langs/fr/data/index.php index 6644723cb..bc2f36987 100644 --- a/install-dev/fixtures/apple/langs/fr/data/index.php +++ b/install-dev/fixtures/apple/langs/fr/data/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/langs/fr/index.php b/install-dev/fixtures/apple/langs/fr/index.php index f18b9ff6e..192f88787 100644 --- a/install-dev/fixtures/apple/langs/fr/index.php +++ b/install-dev/fixtures/apple/langs/fr/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/langs/index.php b/install-dev/fixtures/apple/langs/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/fixtures/apple/langs/index.php +++ b/install-dev/fixtures/apple/langs/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/langs/it/data/index.php b/install-dev/fixtures/apple/langs/it/data/index.php index 6644723cb..bc2f36987 100644 --- a/install-dev/fixtures/apple/langs/it/data/index.php +++ b/install-dev/fixtures/apple/langs/it/data/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/apple/langs/it/index.php b/install-dev/fixtures/apple/langs/it/index.php index f18b9ff6e..192f88787 100644 --- a/install-dev/fixtures/apple/langs/it/index.php +++ b/install-dev/fixtures/apple/langs/it/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/fixtures/index.php b/install-dev/fixtures/index.php index d11b574fe..cadb1ea6e 100644 --- a/install-dev/fixtures/index.php +++ b/install-dev/fixtures/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/index.php b/install-dev/index.php index 0a4c9d52c..2e2e0f182 100644 --- a/install-dev/index.php +++ b/install-dev/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/init.php b/install-dev/init.php index ffa9d7e4a..985807060 100644 --- a/install-dev/init.php +++ b/install-dev/init.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/install_version.php b/install-dev/install_version.php index 6253d186f..50180cdd7 100644 --- a/install-dev/install_version.php +++ b/install-dev/install_version.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/langs/br/data/index.php b/install-dev/langs/br/data/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/langs/br/data/index.php +++ b/install-dev/langs/br/data/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/br/img/index.php b/install-dev/langs/br/img/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/langs/br/img/index.php +++ b/install-dev/langs/br/img/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/br/index.php b/install-dev/langs/br/index.php index d4b603ff4..8c890bb60 100644 --- a/install-dev/langs/br/index.php +++ b/install-dev/langs/br/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/de/data/index.php b/install-dev/langs/de/data/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/langs/de/data/index.php +++ b/install-dev/langs/de/data/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/de/img/index.php b/install-dev/langs/de/img/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/langs/de/img/index.php +++ b/install-dev/langs/de/img/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/de/index.php b/install-dev/langs/de/index.php index d4b603ff4..8c890bb60 100644 --- a/install-dev/langs/de/index.php +++ b/install-dev/langs/de/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/en/data/index.php b/install-dev/langs/en/data/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/langs/en/data/index.php +++ b/install-dev/langs/en/data/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/en/img/index.php b/install-dev/langs/en/img/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/langs/en/img/index.php +++ b/install-dev/langs/en/img/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/en/index.php b/install-dev/langs/en/index.php index d4b603ff4..8c890bb60 100644 --- a/install-dev/langs/en/index.php +++ b/install-dev/langs/en/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/es/data/index.php b/install-dev/langs/es/data/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/langs/es/data/index.php +++ b/install-dev/langs/es/data/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/es/img/index.php b/install-dev/langs/es/img/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/langs/es/img/index.php +++ b/install-dev/langs/es/img/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/es/index.php b/install-dev/langs/es/index.php index d4b603ff4..8c890bb60 100644 --- a/install-dev/langs/es/index.php +++ b/install-dev/langs/es/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/fr/data/index.php b/install-dev/langs/fr/data/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/langs/fr/data/index.php +++ b/install-dev/langs/fr/data/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/fr/img/index.php b/install-dev/langs/fr/img/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/langs/fr/img/index.php +++ b/install-dev/langs/fr/img/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/fr/index.php b/install-dev/langs/fr/index.php index d4b603ff4..8c890bb60 100644 --- a/install-dev/langs/fr/index.php +++ b/install-dev/langs/fr/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/index.php b/install-dev/langs/index.php index d11b574fe..cadb1ea6e 100644 --- a/install-dev/langs/index.php +++ b/install-dev/langs/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/it/data/index.php b/install-dev/langs/it/data/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/langs/it/data/index.php +++ b/install-dev/langs/it/data/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/it/img/index.php b/install-dev/langs/it/img/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/langs/it/img/index.php +++ b/install-dev/langs/it/img/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/langs/it/index.php b/install-dev/langs/it/index.php index d4b603ff4..8c890bb60 100644 --- a/install-dev/langs/it/index.php +++ b/install-dev/langs/it/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/models/database.php b/install-dev/models/database.php index 4cfb8ac74..824695e23 100644 --- a/install-dev/models/database.php +++ b/install-dev/models/database.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/models/index.php b/install-dev/models/index.php index d11b574fe..cadb1ea6e 100644 --- a/install-dev/models/index.php +++ b/install-dev/models/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/models/install.php b/install-dev/models/install.php index a1fb674b3..e20ea6e71 100644 --- a/install-dev/models/install.php +++ b/install-dev/models/install.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/models/mail.php b/install-dev/models/mail.php index 3cbd53671..11177f158 100644 --- a/install-dev/models/mail.php +++ b/install-dev/models/mail.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/models/system.php b/install-dev/models/system.php index 1c361956b..312652ca0 100644 --- a/install-dev/models/system.php +++ b/install-dev/models/system.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/theme/img/index.php b/install-dev/theme/img/index.php index c0c4a31bb..ec45b2dfe 100644 --- a/install-dev/theme/img/index.php +++ b/install-dev/theme/img/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/theme/index.php b/install-dev/theme/index.php index d11b574fe..cadb1ea6e 100644 --- a/install-dev/theme/index.php +++ b/install-dev/theme/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/theme/js/index.php b/install-dev/theme/js/index.php index d4b603ff4..8c890bb60 100644 --- a/install-dev/theme/js/index.php +++ b/install-dev/theme/js/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/theme/js/jquery.chosen/index.php b/install-dev/theme/js/jquery.chosen/index.php index d9272e54f..4a1165be5 100644 --- a/install-dev/theme/js/jquery.chosen/index.php +++ b/install-dev/theme/js/jquery.chosen/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/install-dev/theme/views/index.php b/install-dev/theme/views/index.php index d4b603ff4..8c890bb60 100644 --- a/install-dev/theme/views/index.php +++ b/install-dev/theme/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/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..af8e1d37c 100644 --- a/install-dev/upgrade/classes/FileLogger.php +++ b/install-dev/upgrade/classes/FileLogger.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license 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/ToolsInstall.php b/install-dev/upgrade/classes/ToolsInstall.php index ca50e7ce9..32692589e 100644 --- a/install-dev/upgrade/classes/ToolsInstall.php +++ b/install-dev/upgrade/classes/ToolsInstall.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/index.php b/install-dev/upgrade/classes/index.php index d4b603ff4..8c890bb60 100644 --- a/install-dev/upgrade/classes/index.php +++ b/install-dev/upgrade/classes/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/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..cadb1ea6e 100644 --- a/install-dev/upgrade/index.php +++ b/install-dev/upgrade/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/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_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_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/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..9289012f9 100644 --- a/install-dev/upgrade/php/blocknewsletter1530.php +++ b/install-dev/upgrade/php/blocknewsletter1530.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/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/cms_block.php b/install-dev/upgrade/php/cms_block.php index 08946ace2..ed1aa9666 100644 --- a/install-dev/upgrade/php/cms_block.php +++ b/install-dev/upgrade/php/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/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/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..89e8d4dd5 100755 --- a/install-dev/upgrade/php/fix_cms_shop_1520.php +++ b/install-dev/upgrade/php/fix_cms_shop_1520.php @@ -21,7 +21,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/fix_unique_specific_price.php b/install-dev/upgrade/php/fix_unique_specific_price.php index 0e794fa4e..1dc87da12 100644 --- a/install-dev/upgrade/php/fix_unique_specific_price.php +++ b/install-dev/upgrade/php/fix_unique_specific_price.php @@ -21,7 +21,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/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_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/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/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/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/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/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/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_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_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..5dbb6c1c7 100644 --- a/install-dev/upgrade/php/update_module_loyalty.php +++ b/install-dev/upgrade/php/update_module_loyalty.php @@ -20,7 +20,6 @@ * * @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 */ 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_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_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..c948b46d7 100644 --- a/install-dev/upgrade/php/updatetabicon_from_11version.php +++ b/install-dev/upgrade/php/updatetabicon_from_11version.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/upgrade_cms_15.php b/install-dev/upgrade/php/upgrade_cms_15.php index 0f7519efb..8cdd068da 100644 --- a/install-dev/upgrade/php/upgrade_cms_15.php +++ b/install-dev/upgrade/php/upgrade_cms_15.php @@ -21,7 +21,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/upgrade_cms_15_rename.php b/install-dev/upgrade/php/upgrade_cms_15_rename.php index ce9f03c6d..414a9258c 100644 --- a/install-dev/upgrade/php/upgrade_cms_15_rename.php +++ b/install-dev/upgrade/php/upgrade_cms_15_rename.php @@ -21,7 +21,6 @@ * * @author PrestaShop SA * @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 */ 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..5701cc586 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 */ 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..e6f85de01 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 */ 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..8229689b5 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 */ 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/blockbestsellers/blockbestsellers-home.tpl b/modules/blockbestsellers/blockbestsellers-home.tpl index a09fda924..d1b6ada44 100644 --- a/modules/blockbestsellers/blockbestsellers-home.tpl +++ b/modules/blockbestsellers/blockbestsellers-home.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/modules/blockbestsellers/blockbestsellers.php b/modules/blockbestsellers/blockbestsellers.php index a99f1ccc5..ea8eb2bb2 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 */ diff --git a/modules/blockbestsellers/blockbestsellers.tpl b/modules/blockbestsellers/blockbestsellers.tpl index c5c5cd942..59a4df44a 100644 --- a/modules/blockbestsellers/blockbestsellers.tpl +++ b/modules/blockbestsellers/blockbestsellers.tpl @@ -18,8 +18,7 @@ * 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 *} 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/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/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js index c37e999e1..70ac4bf75 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 */ diff --git a/modules/blockcart/blockcart-ajax.php b/modules/blockcart/blockcart-ajax.php index fbd76e67e..8805215ec 100644 --- a/modules/blockcart/blockcart-ajax.php +++ b/modules/blockcart/blockcart-ajax.php @@ -20,7 +20,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/blockcart/blockcart-json.tpl b/modules/blockcart/blockcart-json.tpl index d70724d4c..55f930121 100644 --- a/modules/blockcart/blockcart-json.tpl +++ b/modules/blockcart/blockcart-json.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/blockcart/blockcart-set-collapse.php b/modules/blockcart/blockcart-set-collapse.php index 6fd88b87e..cb273e4ae 100644 --- a/modules/blockcart/blockcart-set-collapse.php +++ b/modules/blockcart/blockcart-set-collapse.php @@ -20,7 +20,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/blockcart/blockcart.php b/modules/blockcart/blockcart.php index 90d2d3c1e..5c1677ea6 100644 --- a/modules/blockcart/blockcart.php +++ b/modules/blockcart/blockcart.php @@ -20,7 +20,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/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl index 82ad7ebf6..97248c8db 100644 --- a/modules/blockcart/blockcart.tpl +++ b/modules/blockcart/blockcart.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blockcart/img/icon/index.php b/modules/blockcart/img/icon/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/blockcart/img/icon/index.php +++ b/modules/blockcart/img/icon/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/blockcart/img/index.php b/modules/blockcart/img/index.php index 191ab597f..e163a4459 100644 --- a/modules/blockcart/img/index.php +++ b/modules/blockcart/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/blockcart/index.php b/modules/blockcart/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/blockcart/index.php +++ b/modules/blockcart/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/blockcart/translations/index.php b/modules/blockcart/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcart/translations/index.php +++ b/modules/blockcart/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/blockcategories/blockcategories.php b/modules/blockcategories/blockcategories.php index 4a434aae8..d03b40d29 100644 --- a/modules/blockcategories/blockcategories.php +++ b/modules/blockcategories/blockcategories.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7414 $ * @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/blockcategories/blockcategories.tpl b/modules/blockcategories/blockcategories.tpl index 9c1a6ffcc..11f574448 100644 --- a/modules/blockcategories/blockcategories.tpl +++ b/modules/blockcategories/blockcategories.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/blockcategories/blockcategories_footer.tpl b/modules/blockcategories/blockcategories_footer.tpl index 5c226306b..439b1e49e 100644 --- a/modules/blockcategories/blockcategories_footer.tpl +++ b/modules/blockcategories/blockcategories_footer.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/blockcategories/category-tree-branch.tpl b/modules/blockcategories/category-tree-branch.tpl index 4537115d4..1f5790a5d 100644 --- a/modules/blockcategories/category-tree-branch.tpl +++ b/modules/blockcategories/category-tree-branch.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/blockcategories/img/icon/index.php b/modules/blockcategories/img/icon/index.php index 298435bc6..b37b3d3c4 100644 --- a/modules/blockcategories/img/icon/index.php +++ b/modules/blockcategories/img/icon/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/blockcategories/img/index.php b/modules/blockcategories/img/index.php index 0aebcd154..f642dd55e 100644 --- a/modules/blockcategories/img/index.php +++ b/modules/blockcategories/img/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/blockcategories/index.php b/modules/blockcategories/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockcategories/index.php +++ b/modules/blockcategories/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/blockcategories/translations/index.php b/modules/blockcategories/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcategories/translations/index.php +++ b/modules/blockcategories/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/blockcms/BlockCMSModel.php b/modules/blockcms/BlockCMSModel.php index cd5b5c07d..676e8a7f3 100644 --- a/modules/blockcms/BlockCMSModel.php +++ b/modules/blockcms/BlockCMSModel.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 12476 $ * @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/blockcms/blockcms.tpl b/modules/blockcms/blockcms.tpl index 278610a01..829f027a0 100755 --- a/modules/blockcms/blockcms.tpl +++ b/modules/blockcms/blockcms.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blockcms/img/index.php b/modules/blockcms/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcms/img/index.php +++ b/modules/blockcms/img/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/blockcms/index.php b/modules/blockcms/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockcms/index.php +++ b/modules/blockcms/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/blockcms/translations/index.php b/modules/blockcms/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcms/translations/index.php +++ b/modules/blockcms/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/blockcms/views/index.php b/modules/blockcms/views/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcms/views/index.php +++ b/modules/blockcms/views/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/blockcms/views/templates/admin/_configure/helpers/form/form.tpl b/modules/blockcms/views/templates/admin/_configure/helpers/form/form.tpl index 1d628f14c..dc394b8ea 100644 --- a/modules/blockcms/views/templates/admin/_configure/helpers/form/form.tpl +++ b/modules/blockcms/views/templates/admin/_configure/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/modules/blockcms/views/templates/admin/_configure/helpers/form/index.php b/modules/blockcms/views/templates/admin/_configure/helpers/form/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcms/views/templates/admin/_configure/helpers/form/index.php +++ b/modules/blockcms/views/templates/admin/_configure/helpers/form/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/blockcms/views/templates/admin/_configure/helpers/index.php b/modules/blockcms/views/templates/admin/_configure/helpers/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcms/views/templates/admin/_configure/helpers/index.php +++ b/modules/blockcms/views/templates/admin/_configure/helpers/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/blockcms/views/templates/admin/_configure/index.php b/modules/blockcms/views/templates/admin/_configure/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcms/views/templates/admin/_configure/index.php +++ b/modules/blockcms/views/templates/admin/_configure/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/blockcms/views/templates/admin/index.php b/modules/blockcms/views/templates/admin/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcms/views/templates/admin/index.php +++ b/modules/blockcms/views/templates/admin/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/blockcms/views/templates/index.php b/modules/blockcms/views/templates/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcms/views/templates/index.php +++ b/modules/blockcms/views/templates/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/blockcontact/blockcontact.php b/modules/blockcontact/blockcontact.php index 429e0da8a..ac8f6418f 100644 --- a/modules/blockcontact/blockcontact.php +++ b/modules/blockcontact/blockcontact.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/blockcontact/blockcontact.tpl b/modules/blockcontact/blockcontact.tpl index 93003150a..88ada8b36 100644 --- a/modules/blockcontact/blockcontact.tpl +++ b/modules/blockcontact/blockcontact.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blockcontact/images/index.php b/modules/blockcontact/images/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcontact/images/index.php +++ b/modules/blockcontact/images/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/blockcontact/img/index.php b/modules/blockcontact/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcontact/img/index.php +++ b/modules/blockcontact/img/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/blockcontact/index.php b/modules/blockcontact/index.php index d73d26921..d26a2c6bc 100644 --- a/modules/blockcontact/index.php +++ b/modules/blockcontact/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/blockcontact/translations/index.php b/modules/blockcontact/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcontact/translations/index.php +++ b/modules/blockcontact/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/blockcontactinfos/blockcontactinfos.php b/modules/blockcontactinfos/blockcontactinfos.php index e7bc3b202..c190ed355 100644 --- a/modules/blockcontactinfos/blockcontactinfos.php +++ b/modules/blockcontactinfos/blockcontactinfos.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/blockcontactinfos/blockcontactinfos.tpl b/modules/blockcontactinfos/blockcontactinfos.tpl index d81ba3bc1..8d8935693 100644 --- a/modules/blockcontactinfos/blockcontactinfos.tpl +++ b/modules/blockcontactinfos/blockcontactinfos.tpl @@ -18,8 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ +* @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/blockcontactinfos/index.php b/modules/blockcontactinfos/index.php index d73d26921..d26a2c6bc 100644 --- a/modules/blockcontactinfos/index.php +++ b/modules/blockcontactinfos/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/blockcontactinfos/translations/index.php b/modules/blockcontactinfos/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcontactinfos/translations/index.php +++ b/modules/blockcontactinfos/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/blockcurrencies/blockcurrencies.php b/modules/blockcurrencies/blockcurrencies.php index a46747c5c..29ff139cd 100644 --- a/modules/blockcurrencies/blockcurrencies.php +++ b/modules/blockcurrencies/blockcurrencies.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7048 $ * @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/blockcurrencies/blockcurrencies.tpl b/modules/blockcurrencies/blockcurrencies.tpl index ffb9ee424..7e4652f04 100644 --- a/modules/blockcurrencies/blockcurrencies.tpl +++ b/modules/blockcurrencies/blockcurrencies.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blockcurrencies/img/index.php b/modules/blockcurrencies/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcurrencies/img/index.php +++ b/modules/blockcurrencies/img/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/blockcurrencies/index.php b/modules/blockcurrencies/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockcurrencies/index.php +++ b/modules/blockcurrencies/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/blockcurrencies/translations/index.php b/modules/blockcurrencies/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcurrencies/translations/index.php +++ b/modules/blockcurrencies/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/blockcustomerprivacy/blockcustomerprivacy.php b/modules/blockcustomerprivacy/blockcustomerprivacy.php index a8e0a109f..e416407be 100644 --- a/modules/blockcustomerprivacy/blockcustomerprivacy.php +++ b/modules/blockcustomerprivacy/blockcustomerprivacy.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/blockcustomerprivacy/blockcustomerprivacy.tpl b/modules/blockcustomerprivacy/blockcustomerprivacy.tpl index 96486101d..9ffeef5c8 100644 --- a/modules/blockcustomerprivacy/blockcustomerprivacy.tpl +++ b/modules/blockcustomerprivacy/blockcustomerprivacy.tpl @@ -18,7 +18,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blockcustomerprivacy/index.php b/modules/blockcustomerprivacy/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockcustomerprivacy/index.php +++ b/modules/blockcustomerprivacy/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/blockcustomerprivacy/translations/index.php b/modules/blockcustomerprivacy/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockcustomerprivacy/translations/index.php +++ b/modules/blockcustomerprivacy/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/blocklanguages/blocklanguages.php b/modules/blocklanguages/blocklanguages.php index d7a4bef15..6f394ce9a 100644 --- a/modules/blocklanguages/blocklanguages.php +++ b/modules/blocklanguages/blocklanguages.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7048 $ * @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/blocklanguages/blocklanguages.tpl b/modules/blocklanguages/blocklanguages.tpl index b50d2427d..f555a71d3 100644 --- a/modules/blocklanguages/blocklanguages.tpl +++ b/modules/blocklanguages/blocklanguages.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blocklanguages/img/index.php b/modules/blocklanguages/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocklanguages/img/index.php +++ b/modules/blocklanguages/img/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/blocklanguages/index.php b/modules/blocklanguages/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blocklanguages/index.php +++ b/modules/blocklanguages/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/blocklanguages/translations/index.php b/modules/blocklanguages/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocklanguages/translations/index.php +++ b/modules/blocklanguages/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/blocklayered/blocklayered-ajax-back.php b/modules/blocklayered/blocklayered-ajax-back.php index eb2cabe05..566a636c1 100644 --- a/modules/blocklayered/blocklayered-ajax-back.php +++ b/modules/blocklayered/blocklayered-ajax-back.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$ +* @copyright 2007-2012 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registred Trademark & Property of PrestaShop SA */ diff --git a/modules/blocklayered/blocklayered-ajax.php b/modules/blocklayered/blocklayered-ajax.php index 6198bfcf2..b4cfea788 100644 --- a/modules/blocklayered/blocklayered-ajax.php +++ b/modules/blocklayered/blocklayered-ajax.php @@ -20,7 +20,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 Registred Trademark & Property of PrestaShop SA */ diff --git a/modules/blocklayered/blocklayered-no-products.tpl b/modules/blocklayered/blocklayered-no-products.tpl index 7fd9880ec..05dab2c90 100644 --- a/modules/blocklayered/blocklayered-no-products.tpl +++ b/modules/blocklayered/blocklayered-no-products.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 Registred Trademark & Property of PrestaShop SA *} diff --git a/modules/blocklayered/blocklayered.js b/modules/blocklayered/blocklayered.js index e2612fdd0..42778ee5e 100644 --- a/modules/blocklayered/blocklayered.js +++ b/modules/blocklayered/blocklayered.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 13512 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registred Trademark & Property of PrestaShop SA */ diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php index 606330e6d..5e8ba9bc8 100644 --- a/modules/blocklayered/blocklayered.php +++ b/modules/blocklayered/blocklayered.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14437 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registred Trademark & Property of PrestaShop SA */ diff --git a/modules/blocklayered/blocklayered.tpl b/modules/blocklayered/blocklayered.tpl index 7d65852e3..a22e5ccdf 100644 --- a/modules/blocklayered/blocklayered.tpl +++ b/modules/blocklayered/blocklayered.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 12542 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registred Trademark & Property of PrestaShop SA *} diff --git a/modules/blocklayered/img/icon/index.php b/modules/blocklayered/img/icon/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocklayered/img/icon/index.php +++ b/modules/blocklayered/img/icon/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/blocklayered/img/index.php b/modules/blocklayered/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocklayered/img/index.php +++ b/modules/blocklayered/img/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/blocklayered/index.php b/modules/blocklayered/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blocklayered/index.php +++ b/modules/blocklayered/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/blocklink/blocklink.php b/modules/blocklink/blocklink.php index cb2b32858..545bfd35d 100644 --- a/modules/blocklink/blocklink.php +++ b/modules/blocklink/blocklink.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7077 $ * @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/blocklink/blocklink.tpl b/modules/blocklink/blocklink.tpl index e55ee670e..3cb13a30a 100644 --- a/modules/blocklink/blocklink.tpl +++ b/modules/blocklink/blocklink.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/blocklink/img/index.php b/modules/blocklink/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocklink/img/index.php +++ b/modules/blocklink/img/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/blocklink/index.php b/modules/blocklink/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blocklink/index.php +++ b/modules/blocklink/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/blocklink/translations/index.php b/modules/blocklink/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocklink/translations/index.php +++ b/modules/blocklink/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/blockmanufacturer/blockmanufacturer.php b/modules/blockmanufacturer/blockmanufacturer.php index d8b531669..cc7c91ced 100644 --- a/modules/blockmanufacturer/blockmanufacturer.php +++ b/modules/blockmanufacturer/blockmanufacturer.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7048 $ * @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/blockmanufacturer/blockmanufacturer.tpl b/modules/blockmanufacturer/blockmanufacturer.tpl index 2b91b70f8..972ad1a91 100644 --- a/modules/blockmanufacturer/blockmanufacturer.tpl +++ b/modules/blockmanufacturer/blockmanufacturer.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7077 $ * @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/blockmanufacturer/img/index.php b/modules/blockmanufacturer/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockmanufacturer/img/index.php +++ b/modules/blockmanufacturer/img/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/blockmanufacturer/index.php b/modules/blockmanufacturer/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockmanufacturer/index.php +++ b/modules/blockmanufacturer/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/blockmanufacturer/translations/index.php b/modules/blockmanufacturer/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockmanufacturer/translations/index.php +++ b/modules/blockmanufacturer/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/blockmyaccount/blockmyaccount.php b/modules/blockmyaccount/blockmyaccount.php index 082ae9f0a..fe9caa3eb 100644 --- a/modules/blockmyaccount/blockmyaccount.php +++ b/modules/blockmyaccount/blockmyaccount.php @@ -20,7 +20,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/blockmyaccount/blockmyaccount.tpl b/modules/blockmyaccount/blockmyaccount.tpl index 30f56f23a..97cedccf8 100644 --- a/modules/blockmyaccount/blockmyaccount.tpl +++ b/modules/blockmyaccount/blockmyaccount.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/blockmyaccount/index.php b/modules/blockmyaccount/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockmyaccount/index.php +++ b/modules/blockmyaccount/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/blockmyaccount/translations/index.php b/modules/blockmyaccount/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockmyaccount/translations/index.php +++ b/modules/blockmyaccount/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/blockmyaccountfooter/blockmyaccountfooter.php b/modules/blockmyaccountfooter/blockmyaccountfooter.php index 8cc74b5e4..6547ccd26 100644 --- a/modules/blockmyaccountfooter/blockmyaccountfooter.php +++ b/modules/blockmyaccountfooter/blockmyaccountfooter.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/blockmyaccountfooter/blockmyaccountfooter.tpl b/modules/blockmyaccountfooter/blockmyaccountfooter.tpl index 67ccc086c..fb3dee22c 100644 --- a/modules/blockmyaccountfooter/blockmyaccountfooter.tpl +++ b/modules/blockmyaccountfooter/blockmyaccountfooter.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/modules/blockmyaccountfooter/translations/index.php b/modules/blockmyaccountfooter/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockmyaccountfooter/translations/index.php +++ b/modules/blockmyaccountfooter/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/blocknewproducts/blocknewproducts.php b/modules/blocknewproducts/blocknewproducts.php index 28bb548e7..3a327844c 100644 --- a/modules/blocknewproducts/blocknewproducts.php +++ b/modules/blocknewproducts/blocknewproducts.php @@ -20,7 +20,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/blocknewproducts/blocknewproducts.tpl b/modules/blocknewproducts/blocknewproducts.tpl index 407e7ee62..a781c1306 100644 --- a/modules/blocknewproducts/blocknewproducts.tpl +++ b/modules/blocknewproducts/blocknewproducts.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blocknewproducts/img/index.php b/modules/blocknewproducts/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocknewproducts/img/index.php +++ b/modules/blocknewproducts/img/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/blocknewproducts/index.php b/modules/blocknewproducts/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blocknewproducts/index.php +++ b/modules/blocknewproducts/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/blocknewproducts/translations/index.php b/modules/blocknewproducts/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocknewproducts/translations/index.php +++ b/modules/blocknewproducts/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/blocknewsletter/blocknewsletter.php b/modules/blocknewsletter/blocknewsletter.php index 0b109bd62..caff0fb69 100644 --- a/modules/blocknewsletter/blocknewsletter.php +++ b/modules/blocknewsletter/blocknewsletter.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7048 $ * @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/blocknewsletter/controllers/front/index.php b/modules/blocknewsletter/controllers/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocknewsletter/controllers/front/index.php +++ b/modules/blocknewsletter/controllers/front/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/blocknewsletter/controllers/front/verification.php b/modules/blocknewsletter/controllers/front/verification.php index d7fba256b..c17245ad1 100644 --- a/modules/blocknewsletter/controllers/front/verification.php +++ b/modules/blocknewsletter/controllers/front/verification.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/blocknewsletter/controllers/index.php b/modules/blocknewsletter/controllers/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocknewsletter/controllers/index.php +++ b/modules/blocknewsletter/controllers/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/blocknewsletter/img/icon/index.php b/modules/blocknewsletter/img/icon/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocknewsletter/img/icon/index.php +++ b/modules/blocknewsletter/img/icon/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/blocknewsletter/img/index.php b/modules/blocknewsletter/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocknewsletter/img/index.php +++ b/modules/blocknewsletter/img/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/blocknewsletter/index.php b/modules/blocknewsletter/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blocknewsletter/index.php +++ b/modules/blocknewsletter/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/blocknewsletter/mails/de/index.php b/modules/blocknewsletter/mails/de/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blocknewsletter/mails/de/index.php +++ b/modules/blocknewsletter/mails/de/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/blocknewsletter/mails/en/index.php b/modules/blocknewsletter/mails/en/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blocknewsletter/mails/en/index.php +++ b/modules/blocknewsletter/mails/en/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/blocknewsletter/mails/es/index.php b/modules/blocknewsletter/mails/es/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blocknewsletter/mails/es/index.php +++ b/modules/blocknewsletter/mails/es/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/blocknewsletter/mails/fr/index.php b/modules/blocknewsletter/mails/fr/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blocknewsletter/mails/fr/index.php +++ b/modules/blocknewsletter/mails/fr/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/blocknewsletter/mails/index.php b/modules/blocknewsletter/mails/index.php index a08560cf5..edf4668a8 100644 --- a/modules/blocknewsletter/mails/index.php +++ b/modules/blocknewsletter/mails/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/blocknewsletter/mails/it/index.php b/modules/blocknewsletter/mails/it/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blocknewsletter/mails/it/index.php +++ b/modules/blocknewsletter/mails/it/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/blocknewsletter/translations/index.php b/modules/blocknewsletter/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocknewsletter/translations/index.php +++ b/modules/blocknewsletter/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/blocknewsletter/views/index.php b/modules/blocknewsletter/views/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocknewsletter/views/index.php +++ b/modules/blocknewsletter/views/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/blocknewsletter/views/templates/front/index.php b/modules/blocknewsletter/views/templates/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocknewsletter/views/templates/front/index.php +++ b/modules/blocknewsletter/views/templates/front/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/blocknewsletter/views/templates/front/verification_execution.tpl b/modules/blocknewsletter/views/templates/front/verification_execution.tpl index 1ff296cdf..7d73452e1 100644 --- a/modules/blocknewsletter/views/templates/front/verification_execution.tpl +++ b/modules/blocknewsletter/views/templates/front/verification_execution.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/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl b/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl index 86d6118f3..4757fd004 100644 --- a/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl +++ b/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blocknewsletter/views/templates/hook/index.php b/modules/blocknewsletter/views/templates/hook/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocknewsletter/views/templates/hook/index.php +++ b/modules/blocknewsletter/views/templates/hook/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/blocknewsletter/views/templates/index.php b/modules/blocknewsletter/views/templates/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocknewsletter/views/templates/index.php +++ b/modules/blocknewsletter/views/templates/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/blockpaymentlogo/blockpaymentlogo.php b/modules/blockpaymentlogo/blockpaymentlogo.php index f4bcce4a7..5b753f987 100644 --- a/modules/blockpaymentlogo/blockpaymentlogo.php +++ b/modules/blockpaymentlogo/blockpaymentlogo.php @@ -20,7 +20,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/blockpaymentlogo/blockpaymentlogo.tpl b/modules/blockpaymentlogo/blockpaymentlogo.tpl index 0c6588a00..7603fc5e0 100644 --- a/modules/blockpaymentlogo/blockpaymentlogo.tpl +++ b/modules/blockpaymentlogo/blockpaymentlogo.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/blockpaymentlogo/index.php b/modules/blockpaymentlogo/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockpaymentlogo/index.php +++ b/modules/blockpaymentlogo/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/blockpaymentlogo/translations/index.php b/modules/blockpaymentlogo/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockpaymentlogo/translations/index.php +++ b/modules/blockpaymentlogo/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/blockpermanentlinks/blockpermanentlinks-footer.tpl b/modules/blockpermanentlinks/blockpermanentlinks-footer.tpl index 3ad7f12a1..45976539c 100755 --- a/modules/blockpermanentlinks/blockpermanentlinks-footer.tpl +++ b/modules/blockpermanentlinks/blockpermanentlinks-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/modules/blockpermanentlinks/blockpermanentlinks-header.tpl b/modules/blockpermanentlinks/blockpermanentlinks-header.tpl index 617a4451f..f102dbd0b 100644 --- a/modules/blockpermanentlinks/blockpermanentlinks-header.tpl +++ b/modules/blockpermanentlinks/blockpermanentlinks-header.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/blockpermanentlinks/blockpermanentlinks.php b/modules/blockpermanentlinks/blockpermanentlinks.php index dd329913b..2d6992828 100644 --- a/modules/blockpermanentlinks/blockpermanentlinks.php +++ b/modules/blockpermanentlinks/blockpermanentlinks.php @@ -20,7 +20,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/blockpermanentlinks/blockpermanentlinks.tpl b/modules/blockpermanentlinks/blockpermanentlinks.tpl index 963878c12..8ef7e8b6f 100644 --- a/modules/blockpermanentlinks/blockpermanentlinks.tpl +++ b/modules/blockpermanentlinks/blockpermanentlinks.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/blockpermanentlinks/img/index.php b/modules/blockpermanentlinks/img/index.php index 0aebcd154..f642dd55e 100644 --- a/modules/blockpermanentlinks/img/index.php +++ b/modules/blockpermanentlinks/img/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/blockpermanentlinks/index.php b/modules/blockpermanentlinks/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/blockpermanentlinks/index.php +++ b/modules/blockpermanentlinks/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/blockpermanentlinks/translations/index.php b/modules/blockpermanentlinks/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockpermanentlinks/translations/index.php +++ b/modules/blockpermanentlinks/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/blockreinsurance/blockreinsurance.php b/modules/blockreinsurance/blockreinsurance.php index f040f59c0..86fdd05e3 100644 --- a/modules/blockreinsurance/blockreinsurance.php +++ b/modules/blockreinsurance/blockreinsurance.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/blockreinsurance/blockreinsurance.tpl b/modules/blockreinsurance/blockreinsurance.tpl index 7ce289954..ecc80a6fc 100644 --- a/modules/blockreinsurance/blockreinsurance.tpl +++ b/modules/blockreinsurance/blockreinsurance.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blockreinsurance/img/index.php b/modules/blockreinsurance/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockreinsurance/img/index.php +++ b/modules/blockreinsurance/img/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/blockreinsurance/index.php b/modules/blockreinsurance/index.php index d73d26921..d26a2c6bc 100644 --- a/modules/blockreinsurance/index.php +++ b/modules/blockreinsurance/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/blockreinsurance/reinsuranceClass.php b/modules/blockreinsurance/reinsuranceClass.php index 12018da34..845ebe6ba 100755 --- a/modules/blockreinsurance/reinsuranceClass.php +++ b/modules/blockreinsurance/reinsuranceClass.php @@ -20,7 +20,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/blockreinsurance/translations/index.php b/modules/blockreinsurance/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockreinsurance/translations/index.php +++ b/modules/blockreinsurance/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/blockrss/blockrss.php b/modules/blockrss/blockrss.php index 51f1ae735..626eb220f 100644 --- a/modules/blockrss/blockrss.php +++ b/modules/blockrss/blockrss.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/blockrss/blockrss.tpl b/modules/blockrss/blockrss.tpl index 982af0f05..bf9ef1394 100644 --- a/modules/blockrss/blockrss.tpl +++ b/modules/blockrss/blockrss.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blockrss/img/index.php b/modules/blockrss/img/index.php index 0aebcd154..f642dd55e 100644 --- a/modules/blockrss/img/index.php +++ b/modules/blockrss/img/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/blockrss/index.php b/modules/blockrss/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockrss/index.php +++ b/modules/blockrss/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/blockrss/translations/index.php b/modules/blockrss/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockrss/translations/index.php +++ b/modules/blockrss/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/blocksearch/blocksearch-top.tpl b/modules/blocksearch/blocksearch-top.tpl index 92cf9511e..9e686727f 100644 --- a/modules/blocksearch/blocksearch-top.tpl +++ b/modules/blocksearch/blocksearch-top.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7331 $ * @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/blocksearch/blocksearch.php b/modules/blocksearch/blocksearch.php index e922d3782..3fa43df75 100644 --- a/modules/blocksearch/blocksearch.php +++ b/modules/blocksearch/blocksearch.php @@ -20,7 +20,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/blocksearch/blocksearch.tpl b/modules/blocksearch/blocksearch.tpl index 4221c2ad1..c332b11ae 100644 --- a/modules/blocksearch/blocksearch.tpl +++ b/modules/blocksearch/blocksearch.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7331 $ * @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/blocksearch/img/index.php b/modules/blocksearch/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocksearch/img/index.php +++ b/modules/blocksearch/img/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/blocksearch/index.php b/modules/blocksearch/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blocksearch/index.php +++ b/modules/blocksearch/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/blocksearch/translations/index.php b/modules/blocksearch/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocksearch/translations/index.php +++ b/modules/blocksearch/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/blocksharefb/blocksharefb.php b/modules/blocksharefb/blocksharefb.php index a7516690c..729347011 100644 --- a/modules/blocksharefb/blocksharefb.php +++ b/modules/blocksharefb/blocksharefb.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/blocksharefb/blocksharefb.tpl b/modules/blocksharefb/blocksharefb.tpl index 93b4276ab..cd968569e 100644 --- a/modules/blocksharefb/blocksharefb.tpl +++ b/modules/blocksharefb/blocksharefb.tpl @@ -18,8 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ +* @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/blocksharefb/index.php b/modules/blocksharefb/index.php index d73d26921..d26a2c6bc 100644 --- a/modules/blocksharefb/index.php +++ b/modules/blocksharefb/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/blocksharefb/translations/index.php b/modules/blocksharefb/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocksharefb/translations/index.php +++ b/modules/blocksharefb/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/blocksocial/blocksocial.php b/modules/blocksocial/blocksocial.php index 15ae763ab..f1551f71b 100644 --- a/modules/blocksocial/blocksocial.php +++ b/modules/blocksocial/blocksocial.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/blocksocial/blocksocial.tpl b/modules/blocksocial/blocksocial.tpl index 031064b85..c38c84433 100644 --- a/modules/blocksocial/blocksocial.tpl +++ b/modules/blocksocial/blocksocial.tpl @@ -18,8 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ +* @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/blocksocial/img/index.php b/modules/blocksocial/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocksocial/img/index.php +++ b/modules/blocksocial/img/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/blocksocial/index.php b/modules/blocksocial/index.php index d73d26921..d26a2c6bc 100644 --- a/modules/blocksocial/index.php +++ b/modules/blocksocial/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/blocksocial/translations/index.php b/modules/blocksocial/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocksocial/translations/index.php +++ b/modules/blocksocial/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/blockspecials/blockspecials.php b/modules/blockspecials/blockspecials.php index 55e8e2829..4352b3dc4 100644 --- a/modules/blockspecials/blockspecials.php +++ b/modules/blockspecials/blockspecials.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7048 $ * @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/blockspecials/blockspecials.tpl b/modules/blockspecials/blockspecials.tpl index 16413c6bb..1ce169b56 100644 --- a/modules/blockspecials/blockspecials.tpl +++ b/modules/blockspecials/blockspecials.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blockspecials/img/index.php b/modules/blockspecials/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockspecials/img/index.php +++ b/modules/blockspecials/img/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/blockspecials/index.php b/modules/blockspecials/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockspecials/index.php +++ b/modules/blockspecials/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/blockspecials/translations/index.php b/modules/blockspecials/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockspecials/translations/index.php +++ b/modules/blockspecials/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/blockstore/blockstore.php b/modules/blockstore/blockstore.php index 8bee87b1c..25e1a39d2 100644 --- a/modules/blockstore/blockstore.php +++ b/modules/blockstore/blockstore.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/blockstore/blockstore.tpl b/modules/blockstore/blockstore.tpl index ec1947aa5..d6501d836 100644 --- a/modules/blockstore/blockstore.tpl +++ b/modules/blockstore/blockstore.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blockstore/index.php b/modules/blockstore/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/blockstore/index.php +++ b/modules/blockstore/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/blockstore/translations/index.php b/modules/blockstore/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockstore/translations/index.php +++ b/modules/blockstore/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/blocksupplier/blocksupplier.php b/modules/blocksupplier/blocksupplier.php index b7754da41..9f2a5560a 100644 --- a/modules/blocksupplier/blocksupplier.php +++ b/modules/blocksupplier/blocksupplier.php @@ -20,7 +20,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/blocksupplier/blocksupplier.tpl b/modules/blocksupplier/blocksupplier.tpl index df306b7ef..7978e5432 100644 --- a/modules/blocksupplier/blocksupplier.tpl +++ b/modules/blocksupplier/blocksupplier.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7077 $ * @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/blocksupplier/img/index.php b/modules/blocksupplier/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocksupplier/img/index.php +++ b/modules/blocksupplier/img/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/blocksupplier/index.php b/modules/blocksupplier/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blocksupplier/index.php +++ b/modules/blocksupplier/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/blocksupplier/translations/index.php b/modules/blocksupplier/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocksupplier/translations/index.php +++ b/modules/blocksupplier/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/blocktags/blocktags.php b/modules/blocktags/blocktags.php index bf76d05d4..0dfb6cc59 100644 --- a/modules/blocktags/blocktags.php +++ b/modules/blocktags/blocktags.php @@ -20,7 +20,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/blocktags/blocktags.tpl b/modules/blocktags/blocktags.tpl index b4ff3c685..887751d9c 100644 --- a/modules/blocktags/blocktags.tpl +++ b/modules/blocktags/blocktags.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/blocktags/index.php b/modules/blocktags/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blocktags/index.php +++ b/modules/blocktags/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/blocktags/translations/index.php b/modules/blocktags/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocktags/translations/index.php +++ b/modules/blocktags/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/blocktopmenu/blocktopmenu.php b/modules/blocktopmenu/blocktopmenu.php index e92d7af52..6bb749419 100644 --- a/modules/blocktopmenu/blocktopmenu.php +++ b/modules/blocktopmenu/blocktopmenu.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/blocktopmenu/index.php b/modules/blocktopmenu/index.php index 3f5d0801e..5c0cd8f5f 100644 --- a/modules/blocktopmenu/index.php +++ b/modules/blocktopmenu/index.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/blocktopmenu/menutoplinks.class.php b/modules/blocktopmenu/menutoplinks.class.php index b646ca63c..ad6a03006 100644 --- a/modules/blocktopmenu/menutoplinks.class.php +++ b/modules/blocktopmenu/menutoplinks.class.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/blocktopmenu/translations/index.php b/modules/blocktopmenu/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blocktopmenu/translations/index.php +++ b/modules/blocktopmenu/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/blockuserinfo/blockuserinfo.php b/modules/blockuserinfo/blockuserinfo.php index 36d2292e9..9fef3808e 100644 --- a/modules/blockuserinfo/blockuserinfo.php +++ b/modules/blockuserinfo/blockuserinfo.php @@ -20,7 +20,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/blockuserinfo/blockuserinfo.tpl b/modules/blockuserinfo/blockuserinfo.tpl index c421a699c..47c61dee6 100644 --- a/modules/blockuserinfo/blockuserinfo.tpl +++ b/modules/blockuserinfo/blockuserinfo.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blockuserinfo/img/icon/index.php b/modules/blockuserinfo/img/icon/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockuserinfo/img/icon/index.php +++ b/modules/blockuserinfo/img/icon/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/blockuserinfo/img/index.php b/modules/blockuserinfo/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockuserinfo/img/index.php +++ b/modules/blockuserinfo/img/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/blockuserinfo/index.php b/modules/blockuserinfo/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockuserinfo/index.php +++ b/modules/blockuserinfo/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/blockuserinfo/translations/index.php b/modules/blockuserinfo/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockuserinfo/translations/index.php +++ b/modules/blockuserinfo/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/blockviewed/blockviewed.php b/modules/blockviewed/blockviewed.php index baeee8321..1b723e1c4 100644 --- a/modules/blockviewed/blockviewed.php +++ b/modules/blockviewed/blockviewed.php @@ -20,7 +20,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/blockviewed/blockviewed.tpl b/modules/blockviewed/blockviewed.tpl index 10921bac8..57f6c6bd3 100644 --- a/modules/blockviewed/blockviewed.tpl +++ b/modules/blockviewed/blockviewed.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/blockviewed/index.php b/modules/blockviewed/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockviewed/index.php +++ b/modules/blockviewed/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/blockviewed/translations/index.php b/modules/blockviewed/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockviewed/translations/index.php +++ b/modules/blockviewed/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/blockwishlist/WishList.php b/modules/blockwishlist/WishList.php index 2b7ffb2e2..24f6e6bd3 100644 --- a/modules/blockwishlist/WishList.php +++ b/modules/blockwishlist/WishList.php @@ -20,7 +20,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/blockwishlist/blockwishlist-ajax.tpl b/modules/blockwishlist/blockwishlist-ajax.tpl index 1bb76471a..a0cf23795 100644 --- a/modules/blockwishlist/blockwishlist-ajax.tpl +++ b/modules/blockwishlist/blockwishlist-ajax.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/blockwishlist/blockwishlist-extra.tpl b/modules/blockwishlist/blockwishlist-extra.tpl index f7b9a3f87..d4f506d77 100644 --- a/modules/blockwishlist/blockwishlist-extra.tpl +++ b/modules/blockwishlist/blockwishlist-extra.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/blockwishlist/blockwishlist-header.tpl b/modules/blockwishlist/blockwishlist-header.tpl index 23ae1c051..3d91ced08 100644 --- a/modules/blockwishlist/blockwishlist-header.tpl +++ b/modules/blockwishlist/blockwishlist-header.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/blockwishlist/blockwishlist.php b/modules/blockwishlist/blockwishlist.php index 9298353c5..c01827e02 100644 --- a/modules/blockwishlist/blockwishlist.php +++ b/modules/blockwishlist/blockwishlist.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7310 $ * @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/blockwishlist/blockwishlist.tpl b/modules/blockwishlist/blockwishlist.tpl index 817a8c1da..f85d1a0fe 100644 --- a/modules/blockwishlist/blockwishlist.tpl +++ b/modules/blockwishlist/blockwishlist.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/blockwishlist/buywishlistproduct.php b/modules/blockwishlist/buywishlistproduct.php index a411f8d8f..d89e179aa 100644 --- a/modules/blockwishlist/buywishlistproduct.php +++ b/modules/blockwishlist/buywishlistproduct.php @@ -20,7 +20,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/blockwishlist/cart.php b/modules/blockwishlist/cart.php index 2fb7d6d97..869175cbe 100644 --- a/modules/blockwishlist/cart.php +++ b/modules/blockwishlist/cart.php @@ -20,7 +20,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/blockwishlist/controllers/front/index.php b/modules/blockwishlist/controllers/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockwishlist/controllers/front/index.php +++ b/modules/blockwishlist/controllers/front/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/blockwishlist/controllers/front/mywishlist.php b/modules/blockwishlist/controllers/front/mywishlist.php index 66bc0e74a..1b6ef4330 100644 --- a/modules/blockwishlist/controllers/front/mywishlist.php +++ b/modules/blockwishlist/controllers/front/mywishlist.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/blockwishlist/controllers/index.php b/modules/blockwishlist/controllers/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockwishlist/controllers/index.php +++ b/modules/blockwishlist/controllers/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/blockwishlist/img/icon/index.php b/modules/blockwishlist/img/icon/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockwishlist/img/icon/index.php +++ b/modules/blockwishlist/img/icon/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/blockwishlist/img/index.php b/modules/blockwishlist/img/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockwishlist/img/index.php +++ b/modules/blockwishlist/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/blockwishlist/index.php b/modules/blockwishlist/index.php index 565db58b0..dac3eca51 100644 --- a/modules/blockwishlist/index.php +++ b/modules/blockwishlist/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/blockwishlist/js/ajax-wishlist.js b/modules/blockwishlist/js/ajax-wishlist.js index 723f260e3..e99d2ef00 100644 --- a/modules/blockwishlist/js/ajax-wishlist.js +++ b/modules/blockwishlist/js/ajax-wishlist.js @@ -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/blockwishlist/js/index.php b/modules/blockwishlist/js/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockwishlist/js/index.php +++ b/modules/blockwishlist/js/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/blockwishlist/mails/de/index.php b/modules/blockwishlist/mails/de/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockwishlist/mails/de/index.php +++ b/modules/blockwishlist/mails/de/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/blockwishlist/mails/en/index.php b/modules/blockwishlist/mails/en/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockwishlist/mails/en/index.php +++ b/modules/blockwishlist/mails/en/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/blockwishlist/mails/es/index.php b/modules/blockwishlist/mails/es/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockwishlist/mails/es/index.php +++ b/modules/blockwishlist/mails/es/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/blockwishlist/mails/fr/index.php b/modules/blockwishlist/mails/fr/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockwishlist/mails/fr/index.php +++ b/modules/blockwishlist/mails/fr/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/blockwishlist/mails/index.php b/modules/blockwishlist/mails/index.php index a08560cf5..edf4668a8 100644 --- a/modules/blockwishlist/mails/index.php +++ b/modules/blockwishlist/mails/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/blockwishlist/mails/it/index.php b/modules/blockwishlist/mails/it/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/blockwishlist/mails/it/index.php +++ b/modules/blockwishlist/mails/it/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/blockwishlist/managewishlist.php b/modules/blockwishlist/managewishlist.php index 756939e7b..ec56eaf68 100644 --- a/modules/blockwishlist/managewishlist.php +++ b/modules/blockwishlist/managewishlist.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/blockwishlist/managewishlist.tpl b/modules/blockwishlist/managewishlist.tpl index 30f98d26b..3a2468bb0 100644 --- a/modules/blockwishlist/managewishlist.tpl +++ b/modules/blockwishlist/managewishlist.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7310 $ * @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/blockwishlist/my-account.tpl b/modules/blockwishlist/my-account.tpl index 8b6c49367..21f7c6cca 100644 --- a/modules/blockwishlist/my-account.tpl +++ b/modules/blockwishlist/my-account.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/blockwishlist/mywishlist.php b/modules/blockwishlist/mywishlist.php index ce203cd3b..de1b7d081 100644 --- a/modules/blockwishlist/mywishlist.php +++ b/modules/blockwishlist/mywishlist.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/blockwishlist/sendwishlist.php b/modules/blockwishlist/sendwishlist.php index e5eac1add..092ae9d3f 100644 --- a/modules/blockwishlist/sendwishlist.php +++ b/modules/blockwishlist/sendwishlist.php @@ -20,7 +20,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/blockwishlist/translations/index.php b/modules/blockwishlist/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockwishlist/translations/index.php +++ b/modules/blockwishlist/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/blockwishlist/view.php b/modules/blockwishlist/view.php index 393b3cc00..7be327e49 100644 --- a/modules/blockwishlist/view.php +++ b/modules/blockwishlist/view.php @@ -20,7 +20,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/blockwishlist/view.tpl b/modules/blockwishlist/view.tpl index 4a0a374eb..d5c2a6d96 100644 --- a/modules/blockwishlist/view.tpl +++ b/modules/blockwishlist/view.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7310 $ * @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/blockwishlist/views/index.php b/modules/blockwishlist/views/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockwishlist/views/index.php +++ b/modules/blockwishlist/views/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/blockwishlist/views/templates/front/index.php b/modules/blockwishlist/views/templates/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockwishlist/views/templates/front/index.php +++ b/modules/blockwishlist/views/templates/front/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/blockwishlist/views/templates/front/mywishlist.tpl b/modules/blockwishlist/views/templates/front/mywishlist.tpl index df48fe408..ba33562cb 100644 --- a/modules/blockwishlist/views/templates/front/mywishlist.tpl +++ b/modules/blockwishlist/views/templates/front/mywishlist.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7077 $ * @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/blockwishlist/views/templates/index.php b/modules/blockwishlist/views/templates/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/blockwishlist/views/templates/index.php +++ b/modules/blockwishlist/views/templates/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/carriercompare/ajax.php b/modules/carriercompare/ajax.php index 5e2088968..094090380 100644 --- a/modules/carriercompare/ajax.php +++ b/modules/carriercompare/ajax.php @@ -20,7 +20,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/carriercompare/carriercompare.js b/modules/carriercompare/carriercompare.js index 912cbc283..a3bd296f1 100644 --- a/modules/carriercompare/carriercompare.js +++ b/modules/carriercompare/carriercompare.js @@ -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/carriercompare/carriercompare.php b/modules/carriercompare/carriercompare.php index e7a0d4b67..e28a0e3d4 100755 --- a/modules/carriercompare/carriercompare.php +++ b/modules/carriercompare/carriercompare.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/carriercompare/carriercompare.tpl b/modules/carriercompare/carriercompare.tpl index 0c6adb2b2..3d1e7c5b9 100644 --- a/modules/carriercompare/carriercompare.tpl +++ b/modules/carriercompare/carriercompare.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/carriercompare/index.php b/modules/carriercompare/index.php index 565db58b0..dac3eca51 100644 --- a/modules/carriercompare/index.php +++ b/modules/carriercompare/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/carriercompare/template/carriercompare.tpl b/modules/carriercompare/template/carriercompare.tpl index 0be239dcc..620a232bc 100755 --- a/modules/carriercompare/template/carriercompare.tpl +++ b/modules/carriercompare/template/carriercompare.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9095 $ * @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/carriercompare/template/index.php b/modules/carriercompare/template/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/carriercompare/template/index.php +++ b/modules/carriercompare/template/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/carriercompare/translations/index.php b/modules/carriercompare/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/carriercompare/translations/index.php +++ b/modules/carriercompare/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/cashondelivery/cashondelivery.php b/modules/cashondelivery/cashondelivery.php index 5afdf36ee..0c5601514 100755 --- a/modules/cashondelivery/cashondelivery.php +++ b/modules/cashondelivery/cashondelivery.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14265 $ * @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/cashondelivery/controllers/front/index.php b/modules/cashondelivery/controllers/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/cashondelivery/controllers/front/index.php +++ b/modules/cashondelivery/controllers/front/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/cashondelivery/controllers/front/validation.php b/modules/cashondelivery/controllers/front/validation.php index 050d3d411..41005b0e0 100644 --- a/modules/cashondelivery/controllers/front/validation.php +++ b/modules/cashondelivery/controllers/front/validation.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 15094 $ * @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/cashondelivery/controllers/index.php b/modules/cashondelivery/controllers/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/cashondelivery/controllers/index.php +++ b/modules/cashondelivery/controllers/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/cashondelivery/index.php b/modules/cashondelivery/index.php index 4dcd8f89d..3d9fb1394 100755 --- a/modules/cashondelivery/index.php +++ b/modules/cashondelivery/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14011 $ * @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/cashondelivery/translations/index.php b/modules/cashondelivery/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/cashondelivery/translations/index.php +++ b/modules/cashondelivery/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/cashondelivery/views/index.php b/modules/cashondelivery/views/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/cashondelivery/views/index.php +++ b/modules/cashondelivery/views/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/cashondelivery/views/templates/front/index.php b/modules/cashondelivery/views/templates/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/cashondelivery/views/templates/front/index.php +++ b/modules/cashondelivery/views/templates/front/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/cashondelivery/views/templates/front/validation.tpl b/modules/cashondelivery/views/templates/front/validation.tpl index e52b00d3c..43b90b501 100755 --- a/modules/cashondelivery/views/templates/front/validation.tpl +++ b/modules/cashondelivery/views/templates/front/validation.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14011 $ * @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/cashondelivery/views/templates/hook/confirmation.tpl b/modules/cashondelivery/views/templates/hook/confirmation.tpl index a81c57558..a46ff68f9 100755 --- a/modules/cashondelivery/views/templates/hook/confirmation.tpl +++ b/modules/cashondelivery/views/templates/hook/confirmation.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14011 $ * @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/cashondelivery/views/templates/hook/index.php b/modules/cashondelivery/views/templates/hook/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/cashondelivery/views/templates/hook/index.php +++ b/modules/cashondelivery/views/templates/hook/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/cashondelivery/views/templates/hook/payment.tpl b/modules/cashondelivery/views/templates/hook/payment.tpl index b087bfd90..34f8518d7 100755 --- a/modules/cashondelivery/views/templates/hook/payment.tpl +++ b/modules/cashondelivery/views/templates/hook/payment.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14011 $ * @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/cashondelivery/views/templates/index.php b/modules/cashondelivery/views/templates/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/cashondelivery/views/templates/index.php +++ b/modules/cashondelivery/views/templates/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/cheque/cheque.php b/modules/cheque/cheque.php index 0dfe1f410..d06cfeb89 100644 --- a/modules/cheque/cheque.php +++ b/modules/cheque/cheque.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/cheque/controllers/front/index.php b/modules/cheque/controllers/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/cheque/controllers/front/index.php +++ b/modules/cheque/controllers/front/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/cheque/controllers/front/payment.php b/modules/cheque/controllers/front/payment.php index 00b80af5d..d16a2a212 100644 --- a/modules/cheque/controllers/front/payment.php +++ b/modules/cheque/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/cheque/controllers/front/validation.php b/modules/cheque/controllers/front/validation.php index 949b04837..e9e590f6d 100644 --- a/modules/cheque/controllers/front/validation.php +++ b/modules/cheque/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/cheque/controllers/index.php b/modules/cheque/controllers/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/cheque/controllers/index.php +++ b/modules/cheque/controllers/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/cheque/index.php b/modules/cheque/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/cheque/index.php +++ b/modules/cheque/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/cheque/payment.php b/modules/cheque/payment.php index 0d586dcfa..1602e2c61 100644 --- a/modules/cheque/payment.php +++ b/modules/cheque/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/cheque/translations/index.php b/modules/cheque/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/cheque/translations/index.php +++ b/modules/cheque/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/cheque/validation.php b/modules/cheque/validation.php index 8033bb5de..6be7c08f1 100644 --- a/modules/cheque/validation.php +++ b/modules/cheque/validation.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7148 $ * @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/cheque/views/index.php b/modules/cheque/views/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/cheque/views/index.php +++ b/modules/cheque/views/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/cheque/views/templates/front/index.php b/modules/cheque/views/templates/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/cheque/views/templates/front/index.php +++ b/modules/cheque/views/templates/front/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/cheque/views/templates/front/payment_execution.tpl b/modules/cheque/views/templates/front/payment_execution.tpl index 9dfcf2ccc..b10ba6f6d 100644 --- a/modules/cheque/views/templates/front/payment_execution.tpl +++ b/modules/cheque/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/cheque/views/templates/hook/index.php b/modules/cheque/views/templates/hook/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/cheque/views/templates/hook/index.php +++ b/modules/cheque/views/templates/hook/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/cheque/views/templates/hook/payment.tpl b/modules/cheque/views/templates/hook/payment.tpl index 177aa2557..660c5162a 100644 --- a/modules/cheque/views/templates/hook/payment.tpl +++ b/modules/cheque/views/templates/hook/payment.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7134 $ * @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/cheque/views/templates/hook/payment_return.tpl b/modules/cheque/views/templates/hook/payment_return.tpl index 2eaad26de..379167810 100644 --- a/modules/cheque/views/templates/hook/payment_return.tpl +++ b/modules/cheque/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/cheque/views/templates/index.php b/modules/cheque/views/templates/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/cheque/views/templates/index.php +++ b/modules/cheque/views/templates/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/crossselling/crossselling.php b/modules/crossselling/crossselling.php index 7e801338e..ebb0434a1 100755 --- a/modules/crossselling/crossselling.php +++ b/modules/crossselling/crossselling.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/crossselling/crossselling.tpl b/modules/crossselling/crossselling.tpl index b65a23277..80ce798f5 100755 --- a/modules/crossselling/crossselling.tpl +++ b/modules/crossselling/crossselling.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/crossselling/index.php b/modules/crossselling/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/crossselling/index.php +++ b/modules/crossselling/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/crossselling/js/crossselling.js b/modules/crossselling/js/crossselling.js index 80c82e1dc..73db212a5 100755 --- a/modules/crossselling/js/crossselling.js +++ b/modules/crossselling/js/crossselling.js @@ -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/crossselling/js/index.php b/modules/crossselling/js/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/crossselling/js/index.php +++ b/modules/crossselling/js/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/crossselling/translations/index.php b/modules/crossselling/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/crossselling/translations/index.php +++ b/modules/crossselling/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/dateofdelivery/beforeCarrier.tpl b/modules/dateofdelivery/beforeCarrier.tpl index 58c9bd49e..7ea66d6ec 100644 --- a/modules/dateofdelivery/beforeCarrier.tpl +++ b/modules/dateofdelivery/beforeCarrier.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/dateofdelivery/dateofdelivery.php b/modules/dateofdelivery/dateofdelivery.php index 1db0935a2..985846109 100644 --- a/modules/dateofdelivery/dateofdelivery.php +++ b/modules/dateofdelivery/dateofdelivery.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/dateofdelivery/img/index.php b/modules/dateofdelivery/img/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/dateofdelivery/img/index.php +++ b/modules/dateofdelivery/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/dateofdelivery/index.php b/modules/dateofdelivery/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/dateofdelivery/index.php +++ b/modules/dateofdelivery/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/dateofdelivery/orderDetail.tpl b/modules/dateofdelivery/orderDetail.tpl index efe411c19..8c23263f3 100644 --- a/modules/dateofdelivery/orderDetail.tpl +++ b/modules/dateofdelivery/orderDetail.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/dateofdelivery/translations/index.php b/modules/dateofdelivery/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/dateofdelivery/translations/index.php +++ b/modules/dateofdelivery/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/editorial/EditorialClass.php b/modules/editorial/EditorialClass.php index ce7887b0c..22c7b4ad9 100755 --- a/modules/editorial/EditorialClass.php +++ b/modules/editorial/EditorialClass.php @@ -20,7 +20,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/editorial/editorial.php b/modules/editorial/editorial.php index 19de78e36..a739abe41 100644 --- a/modules/editorial/editorial.php +++ b/modules/editorial/editorial.php @@ -20,7 +20,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/editorial/editorial.tpl b/modules/editorial/editorial.tpl index 6161e9a56..a2d25160e 100644 --- a/modules/editorial/editorial.tpl +++ b/modules/editorial/editorial.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/editorial/index.php b/modules/editorial/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/editorial/index.php +++ b/modules/editorial/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/editorial/translations/index.php b/modules/editorial/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/editorial/translations/index.php +++ b/modules/editorial/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/favoriteproducts/FavoriteProduct.php b/modules/favoriteproducts/FavoriteProduct.php index b54ba9d30..bfdf1367f 100644 --- a/modules/favoriteproducts/FavoriteProduct.php +++ b/modules/favoriteproducts/FavoriteProduct.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/favoriteproducts/controllers/front/account.php b/modules/favoriteproducts/controllers/front/account.php index 72ea9faa0..64f43f47a 100644 --- a/modules/favoriteproducts/controllers/front/account.php +++ b/modules/favoriteproducts/controllers/front/account.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/favoriteproducts/controllers/front/actions.php b/modules/favoriteproducts/controllers/front/actions.php index 2846ddfdf..db81c0c10 100644 --- a/modules/favoriteproducts/controllers/front/actions.php +++ b/modules/favoriteproducts/controllers/front/actions.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/favoriteproducts/controllers/front/index.php b/modules/favoriteproducts/controllers/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/favoriteproducts/controllers/front/index.php +++ b/modules/favoriteproducts/controllers/front/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/favoriteproducts/controllers/index.php b/modules/favoriteproducts/controllers/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/favoriteproducts/controllers/index.php +++ b/modules/favoriteproducts/controllers/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/favoriteproducts/favoriteproducts-account.php b/modules/favoriteproducts/favoriteproducts-account.php index 9143da536..54fd3a961 100644 --- a/modules/favoriteproducts/favoriteproducts-account.php +++ b/modules/favoriteproducts/favoriteproducts-account.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/favoriteproducts/favoriteproducts-ajax.php b/modules/favoriteproducts/favoriteproducts-ajax.php index 89fb6a7db..34983917a 100644 --- a/modules/favoriteproducts/favoriteproducts-ajax.php +++ b/modules/favoriteproducts/favoriteproducts-ajax.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/favoriteproducts/favoriteproducts.php b/modules/favoriteproducts/favoriteproducts.php index 3bfcacc47..093541a6a 100644 --- a/modules/favoriteproducts/favoriteproducts.php +++ b/modules/favoriteproducts/favoriteproducts.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/favoriteproducts/img/index.php b/modules/favoriteproducts/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/favoriteproducts/img/index.php +++ b/modules/favoriteproducts/img/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/favoriteproducts/index.php b/modules/favoriteproducts/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/favoriteproducts/index.php +++ b/modules/favoriteproducts/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/favoriteproducts/translations/index.php b/modules/favoriteproducts/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/favoriteproducts/translations/index.php +++ b/modules/favoriteproducts/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/favoriteproducts/views/index.php b/modules/favoriteproducts/views/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/favoriteproducts/views/index.php +++ b/modules/favoriteproducts/views/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/favoriteproducts/views/templates/front/favoriteproducts-account.tpl b/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl index b69a638a2..52f838594 100644 --- a/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl +++ b/modules/favoriteproducts/views/templates/front/favoriteproducts-account.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/modules/favoriteproducts/views/templates/front/index.php b/modules/favoriteproducts/views/templates/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/favoriteproducts/views/templates/front/index.php +++ b/modules/favoriteproducts/views/templates/front/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/favoriteproducts/views/templates/hook/favoriteproducts-extra.tpl b/modules/favoriteproducts/views/templates/hook/favoriteproducts-extra.tpl index 1853069eb..fe602096f 100644 --- a/modules/favoriteproducts/views/templates/hook/favoriteproducts-extra.tpl +++ b/modules/favoriteproducts/views/templates/hook/favoriteproducts-extra.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/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl b/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl index cfa7c2485..9f043a4cf 100755 --- a/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl +++ b/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14978 $ * @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/favoriteproducts/views/templates/hook/index.php b/modules/favoriteproducts/views/templates/hook/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/favoriteproducts/views/templates/hook/index.php +++ b/modules/favoriteproducts/views/templates/hook/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/favoriteproducts/views/templates/hook/my-account.tpl b/modules/favoriteproducts/views/templates/hook/my-account.tpl index 490082af0..34d0a6274 100644 --- a/modules/favoriteproducts/views/templates/hook/my-account.tpl +++ b/modules/favoriteproducts/views/templates/hook/my-account.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/modules/favoriteproducts/views/templates/index.php b/modules/favoriteproducts/views/templates/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/favoriteproducts/views/templates/index.php +++ b/modules/favoriteproducts/views/templates/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/feeder/feeder.php b/modules/feeder/feeder.php index 15bfb7d98..bdcdd4523 100644 --- a/modules/feeder/feeder.php +++ b/modules/feeder/feeder.php @@ -20,7 +20,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/feeder/feederHeader.tpl b/modules/feeder/feederHeader.tpl index 9715e8592..0e36c17ca 100644 --- a/modules/feeder/feederHeader.tpl +++ b/modules/feeder/feederHeader.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/feeder/index.php b/modules/feeder/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/feeder/index.php +++ b/modules/feeder/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/feeder/rss.php b/modules/feeder/rss.php index adcd88d4b..11e94dd97 100644 --- a/modules/feeder/rss.php +++ b/modules/feeder/rss.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7310 $ * @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/feeder/translations/index.php b/modules/feeder/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/feeder/translations/index.php +++ b/modules/feeder/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/followup/cron.php b/modules/followup/cron.php index de6e741ce..791101830 100644 --- a/modules/followup/cron.php +++ b/modules/followup/cron.php @@ -20,7 +20,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/followup/followup.php b/modules/followup/followup.php index 8011b8bf7..178e227bf 100644 --- a/modules/followup/followup.php +++ b/modules/followup/followup.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7310 $ * @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/followup/index.php b/modules/followup/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/followup/index.php +++ b/modules/followup/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/followup/mails/de/index.php b/modules/followup/mails/de/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/followup/mails/de/index.php +++ b/modules/followup/mails/de/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/followup/mails/en/index.php b/modules/followup/mails/en/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/followup/mails/en/index.php +++ b/modules/followup/mails/en/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/followup/mails/es/index.php b/modules/followup/mails/es/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/followup/mails/es/index.php +++ b/modules/followup/mails/es/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/followup/mails/fr/index.php b/modules/followup/mails/fr/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/followup/mails/fr/index.php +++ b/modules/followup/mails/fr/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/followup/mails/index.php b/modules/followup/mails/index.php index 191ab597f..e163a4459 100644 --- a/modules/followup/mails/index.php +++ b/modules/followup/mails/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/followup/mails/it/index.php b/modules/followup/mails/it/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/followup/mails/it/index.php +++ b/modules/followup/mails/it/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/followup/translations/index.php b/modules/followup/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/followup/translations/index.php +++ b/modules/followup/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/graphartichow/artichow/cache/index.php b/modules/graphartichow/artichow/cache/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/graphartichow/artichow/cache/index.php +++ b/modules/graphartichow/artichow/cache/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/graphartichow/artichow/font/index.php b/modules/graphartichow/artichow/font/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/graphartichow/artichow/font/index.php +++ b/modules/graphartichow/artichow/font/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/graphartichow/artichow/images/errors/index.php b/modules/graphartichow/artichow/images/errors/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/graphartichow/artichow/images/errors/index.php +++ b/modules/graphartichow/artichow/images/errors/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/graphartichow/artichow/images/index.php b/modules/graphartichow/artichow/images/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/graphartichow/artichow/images/index.php +++ b/modules/graphartichow/artichow/images/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/graphartichow/artichow/inc/drivers/index.php b/modules/graphartichow/artichow/inc/drivers/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/graphartichow/artichow/inc/drivers/index.php +++ b/modules/graphartichow/artichow/inc/drivers/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/graphartichow/artichow/inc/index.php b/modules/graphartichow/artichow/inc/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/graphartichow/artichow/inc/index.php +++ b/modules/graphartichow/artichow/inc/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/graphartichow/artichow/index.php b/modules/graphartichow/artichow/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/graphartichow/artichow/index.php +++ b/modules/graphartichow/artichow/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/graphartichow/artichow/patterns/index.php b/modules/graphartichow/artichow/patterns/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/graphartichow/artichow/patterns/index.php +++ b/modules/graphartichow/artichow/patterns/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/graphartichow/graphartichow.php b/modules/graphartichow/graphartichow.php index 5220ea81d..1895365a9 100644 --- a/modules/graphartichow/graphartichow.php +++ b/modules/graphartichow/graphartichow.php @@ -20,7 +20,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/graphartichow/index.php b/modules/graphartichow/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/graphartichow/index.php +++ b/modules/graphartichow/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/graphartichow/translations/index.php b/modules/graphartichow/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/graphartichow/translations/index.php +++ b/modules/graphartichow/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/graphgooglechart/graphgooglechart.php b/modules/graphgooglechart/graphgooglechart.php index f2b50dd00..daa4f75b7 100644 --- a/modules/graphgooglechart/graphgooglechart.php +++ b/modules/graphgooglechart/graphgooglechart.php @@ -20,7 +20,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/graphgooglechart/index.php b/modules/graphgooglechart/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/graphgooglechart/index.php +++ b/modules/graphgooglechart/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/graphgooglechart/translations/index.php b/modules/graphgooglechart/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/graphgooglechart/translations/index.php +++ b/modules/graphgooglechart/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/graphvisifire/graphvisifire.php b/modules/graphvisifire/graphvisifire.php index f8c9a85f2..a69dc0bd1 100644 --- a/modules/graphvisifire/graphvisifire.php +++ b/modules/graphvisifire/graphvisifire.php @@ -20,7 +20,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/graphvisifire/index.php b/modules/graphvisifire/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/graphvisifire/index.php +++ b/modules/graphvisifire/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/graphvisifire/translations/index.php b/modules/graphvisifire/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/graphvisifire/translations/index.php +++ b/modules/graphvisifire/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/graphvisifire/visifire/index.php b/modules/graphvisifire/visifire/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/graphvisifire/visifire/index.php +++ b/modules/graphvisifire/visifire/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/graphxmlswfcharts/graphxmlswfcharts.php b/modules/graphxmlswfcharts/graphxmlswfcharts.php index 8b0bd2072..5e22eee04 100644 --- a/modules/graphxmlswfcharts/graphxmlswfcharts.php +++ b/modules/graphxmlswfcharts/graphxmlswfcharts.php @@ -20,7 +20,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/graphxmlswfcharts/index.php b/modules/graphxmlswfcharts/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/graphxmlswfcharts/index.php +++ b/modules/graphxmlswfcharts/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/graphxmlswfcharts/translations/index.php b/modules/graphxmlswfcharts/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/graphxmlswfcharts/translations/index.php +++ b/modules/graphxmlswfcharts/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/graphxmlswfcharts/xml_swf_charts/charts_library/index.php b/modules/graphxmlswfcharts/xml_swf_charts/charts_library/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/graphxmlswfcharts/xml_swf_charts/charts_library/index.php +++ b/modules/graphxmlswfcharts/xml_swf_charts/charts_library/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/graphxmlswfcharts/xml_swf_charts/index.php b/modules/graphxmlswfcharts/xml_swf_charts/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/graphxmlswfcharts/xml_swf_charts/index.php +++ b/modules/graphxmlswfcharts/xml_swf_charts/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/gridhtml/gridhtml.php b/modules/gridhtml/gridhtml.php index f2a0a16af..4a9d40efd 100644 --- a/modules/gridhtml/gridhtml.php +++ b/modules/gridhtml/gridhtml.php @@ -20,7 +20,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/gridhtml/index.php b/modules/gridhtml/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/gridhtml/index.php +++ b/modules/gridhtml/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/gridhtml/translations/index.php b/modules/gridhtml/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/gridhtml/translations/index.php +++ b/modules/gridhtml/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/gsitemap/gsitemap.php b/modules/gsitemap/gsitemap.php index def70622d..720ea3017 100644 --- a/modules/gsitemap/gsitemap.php +++ b/modules/gsitemap/gsitemap.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7515 $ * @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/gsitemap/index.php b/modules/gsitemap/index.php index 2b3eac46d..3d9fb1394 100644 --- a/modules/gsitemap/index.php +++ b/modules/gsitemap/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/gsitemap/translations/index.php b/modules/gsitemap/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/gsitemap/translations/index.php +++ b/modules/gsitemap/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/homefeatured/homefeatured.php b/modules/homefeatured/homefeatured.php index d5649e7cd..9b37346a1 100644 --- a/modules/homefeatured/homefeatured.php +++ b/modules/homefeatured/homefeatured.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7048 $ * @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/homefeatured/homefeatured.tpl b/modules/homefeatured/homefeatured.tpl index 74a5c067d..47beac625 100644 --- a/modules/homefeatured/homefeatured.tpl +++ b/modules/homefeatured/homefeatured.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/homefeatured/img/index.php b/modules/homefeatured/img/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/homefeatured/img/index.php +++ b/modules/homefeatured/img/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/homefeatured/index.php b/modules/homefeatured/index.php index a5c66d8aa..26dc64ad8 100644 --- a/modules/homefeatured/index.php +++ b/modules/homefeatured/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/homefeatured/translations/index.php b/modules/homefeatured/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/homefeatured/translations/index.php +++ b/modules/homefeatured/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/homeslider/ajax_homeslider.php b/modules/homeslider/ajax_homeslider.php index 50fa26e08..56374891b 100644 --- a/modules/homeslider/ajax_homeslider.php +++ b/modules/homeslider/ajax_homeslider.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/homeslider/images/index.php b/modules/homeslider/images/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/homeslider/images/index.php +++ b/modules/homeslider/images/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/homeslider/js/index.php b/modules/homeslider/js/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/homeslider/js/index.php +++ b/modules/homeslider/js/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/homeslider/translations/index.php b/modules/homeslider/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/homeslider/translations/index.php +++ b/modules/homeslider/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/importerosc/translations/index.php b/modules/importerosc/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/importerosc/translations/index.php +++ b/modules/importerosc/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/index.php b/modules/index.php index c239727f7..af0ec9eab 100644 --- a/modules/index.php +++ b/modules/index.php @@ -20,7 +20,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/loyalty/LoyaltyModule.php b/modules/loyalty/LoyaltyModule.php index 6033642de..bc4eb49b1 100644 --- a/modules/loyalty/LoyaltyModule.php +++ b/modules/loyalty/LoyaltyModule.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7310 $ * @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/loyalty/LoyaltyStateModule.php b/modules/loyalty/LoyaltyStateModule.php index 094e48f41..ae7a581d9 100644 --- a/modules/loyalty/LoyaltyStateModule.php +++ b/modules/loyalty/LoyaltyStateModule.php @@ -20,7 +20,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/loyalty/controllers/front/index.php b/modules/loyalty/controllers/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/loyalty/controllers/front/index.php +++ b/modules/loyalty/controllers/front/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/loyalty/controllers/index.php b/modules/loyalty/controllers/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/loyalty/controllers/index.php +++ b/modules/loyalty/controllers/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/loyalty/images/index.php b/modules/loyalty/images/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/loyalty/images/index.php +++ b/modules/loyalty/images/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/loyalty/loyalty-program.php b/modules/loyalty/loyalty-program.php index 4c0f8ad70..f24cc8c8c 100644 --- a/modules/loyalty/loyalty-program.php +++ b/modules/loyalty/loyalty-program.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/loyalty/loyalty.php b/modules/loyalty/loyalty.php index 137d79d5f..289975ad1 100644 --- a/modules/loyalty/loyalty.php +++ b/modules/loyalty/loyalty.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/loyalty/translations/index.php b/modules/loyalty/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/loyalty/translations/index.php +++ b/modules/loyalty/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/loyalty/views/index.php b/modules/loyalty/views/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/loyalty/views/index.php +++ b/modules/loyalty/views/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/loyalty/views/templates/front/index.php b/modules/loyalty/views/templates/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/loyalty/views/templates/front/index.php +++ b/modules/loyalty/views/templates/front/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/loyalty/views/templates/front/loyalty.tpl b/modules/loyalty/views/templates/front/loyalty.tpl index 7a55b0274..49ce67f5e 100644 --- a/modules/loyalty/views/templates/front/loyalty.tpl +++ b/modules/loyalty/views/templates/front/loyalty.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8084 $ * @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/loyalty/views/templates/hook/index.php b/modules/loyalty/views/templates/hook/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/loyalty/views/templates/hook/index.php +++ b/modules/loyalty/views/templates/hook/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/loyalty/views/templates/hook/my-account.tpl b/modules/loyalty/views/templates/hook/my-account.tpl index 47f70c81b..2a7b95446 100644 --- a/modules/loyalty/views/templates/hook/my-account.tpl +++ b/modules/loyalty/views/templates/hook/my-account.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/loyalty/views/templates/hook/product.tpl b/modules/loyalty/views/templates/hook/product.tpl index 810d5beb0..959bec233 100644 --- a/modules/loyalty/views/templates/hook/product.tpl +++ b/modules/loyalty/views/templates/hook/product.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/loyalty/views/templates/hook/shopping-cart.tpl b/modules/loyalty/views/templates/hook/shopping-cart.tpl index a5f2134ad..02c9e28d9 100644 --- a/modules/loyalty/views/templates/hook/shopping-cart.tpl +++ b/modules/loyalty/views/templates/hook/shopping-cart.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7208 $ * @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/loyalty/views/templates/index.php b/modules/loyalty/views/templates/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/loyalty/views/templates/index.php +++ b/modules/loyalty/views/templates/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/mailalerts/MailAlert.php b/modules/mailalerts/MailAlert.php index 56cc00404..1d81fb4f9 100644 --- a/modules/mailalerts/MailAlert.php +++ b/modules/mailalerts/MailAlert.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 12476 $ * @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/mailalerts/controllers/front/index.php b/modules/mailalerts/controllers/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/mailalerts/controllers/front/index.php +++ b/modules/mailalerts/controllers/front/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/mailalerts/controllers/index.php b/modules/mailalerts/controllers/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/mailalerts/controllers/index.php +++ b/modules/mailalerts/controllers/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/mailalerts/mailalerts-account.php b/modules/mailalerts/mailalerts-account.php index 501c523af..b6c361fd1 100644 --- a/modules/mailalerts/mailalerts-account.php +++ b/modules/mailalerts/mailalerts-account.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 12432 $ * @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/mailalerts/mailalerts-ajax.php b/modules/mailalerts/mailalerts-ajax.php index 3ffd85af4..60a9ab487 100644 --- a/modules/mailalerts/mailalerts-ajax.php +++ b/modules/mailalerts/mailalerts-ajax.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 12437 $ * @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/mailalerts/mailalerts-extra.php b/modules/mailalerts/mailalerts-extra.php index edbf3cc25..f284f389c 100644 --- a/modules/mailalerts/mailalerts-extra.php +++ b/modules/mailalerts/mailalerts-extra.php @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 11894 $ * @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/mailalerts/mailalerts.php b/modules/mailalerts/mailalerts.php index fc49fd9e8..5d7260499 100644 --- a/modules/mailalerts/mailalerts.php +++ b/modules/mailalerts/mailalerts.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 12460 $ * @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/mailalerts/translations/index.php b/modules/mailalerts/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/mailalerts/translations/index.php +++ b/modules/mailalerts/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/mailalerts/views/index.php b/modules/mailalerts/views/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/mailalerts/views/index.php +++ b/modules/mailalerts/views/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/mailalerts/views/templates/front/index.php b/modules/mailalerts/views/templates/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/mailalerts/views/templates/front/index.php +++ b/modules/mailalerts/views/templates/front/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/mailalerts/views/templates/front/mailalerts-account.tpl b/modules/mailalerts/views/templates/front/mailalerts-account.tpl index 43cb2f9f2..92c562628 100644 --- a/modules/mailalerts/views/templates/front/mailalerts-account.tpl +++ b/modules/mailalerts/views/templates/front/mailalerts-account.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8084 $ * @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/mailalerts/views/templates/hook/index.php b/modules/mailalerts/views/templates/hook/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/mailalerts/views/templates/hook/index.php +++ b/modules/mailalerts/views/templates/hook/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/mailalerts/views/templates/hook/my-account.tpl b/modules/mailalerts/views/templates/hook/my-account.tpl index b057959c0..7468600f1 100644 --- a/modules/mailalerts/views/templates/hook/my-account.tpl +++ b/modules/mailalerts/views/templates/hook/my-account.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 11894 $ * @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/mailalerts/views/templates/index.php b/modules/mailalerts/views/templates/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/mailalerts/views/templates/index.php +++ b/modules/mailalerts/views/templates/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/newsletter/newsletter.php b/modules/newsletter/newsletter.php index ac98291d7..8e8b40bbb 100644 --- a/modules/newsletter/newsletter.php +++ b/modules/newsletter/newsletter.php @@ -20,7 +20,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/newsletter/translations/index.php b/modules/newsletter/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/newsletter/translations/index.php +++ b/modules/newsletter/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/pagesnotfound/pagesnotfound.php b/modules/pagesnotfound/pagesnotfound.php index c81756297..b8a0e40ec 100644 --- a/modules/pagesnotfound/pagesnotfound.php +++ b/modules/pagesnotfound/pagesnotfound.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/pagesnotfound/translations/index.php b/modules/pagesnotfound/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/pagesnotfound/translations/index.php +++ b/modules/pagesnotfound/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/productcomments/ProductComment.php b/modules/productcomments/ProductComment.php index 12d2c7da4..10e7658d8 100644 --- a/modules/productcomments/ProductComment.php +++ b/modules/productcomments/ProductComment.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/productcomments/ProductCommentCriterion.php b/modules/productcomments/ProductCommentCriterion.php index 10275bf04..51d607171 100644 --- a/modules/productcomments/ProductCommentCriterion.php +++ b/modules/productcomments/ProductCommentCriterion.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/productcomments/ProductCriterion.php b/modules/productcomments/ProductCriterion.php index e843d6b08..df10e5546 100644 --- a/modules/productcomments/ProductCriterion.php +++ b/modules/productcomments/ProductCriterion.php @@ -20,7 +20,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/productcomments/controllers/front/default.php b/modules/productcomments/controllers/front/default.php index f542d020a..dd8403ea6 100644 --- a/modules/productcomments/controllers/front/default.php +++ b/modules/productcomments/controllers/front/default.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 15094 $ * @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/productcomments/controllers/front/index.php b/modules/productcomments/controllers/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/productcomments/controllers/front/index.php +++ b/modules/productcomments/controllers/front/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/productcomments/controllers/index.php b/modules/productcomments/controllers/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/productcomments/controllers/index.php +++ b/modules/productcomments/controllers/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/productcomments/js/moderate.js b/modules/productcomments/js/moderate.js index 9aa4dc347..862104a13 100644 --- a/modules/productcomments/js/moderate.js +++ b/modules/productcomments/js/moderate.js @@ -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/productcomments/js/productCriterion.js b/modules/productcomments/js/productCriterion.js index de6aee9ba..1f1f77f31 100644 --- a/modules/productcomments/js/productCriterion.js +++ b/modules/productcomments/js/productCriterion.js @@ -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/productcomments/js/products-comparison.js b/modules/productcomments/js/products-comparison.js index 6a684b14c..355d8c8a7 100755 --- a/modules/productcomments/js/products-comparison.js +++ b/modules/productcomments/js/products-comparison.js @@ -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/productcomments/productcomments.php b/modules/productcomments/productcomments.php index 5240409e9..3164ee73d 100644 --- a/modules/productcomments/productcomments.php +++ b/modules/productcomments/productcomments.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/productcomments/productcomments.tpl b/modules/productcomments/productcomments.tpl index 7e8534f37..9b0bb9826 100644 --- a/modules/productcomments/productcomments.tpl +++ b/modules/productcomments/productcomments.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/productcomments/productcommentscriterion.php b/modules/productcomments/productcommentscriterion.php index ab7df0ebc..95e775835 100644 --- a/modules/productcomments/productcommentscriterion.php +++ b/modules/productcomments/productcommentscriterion.php @@ -20,7 +20,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/productcomments/products-comparison.tpl b/modules/productcomments/products-comparison.tpl index a679f5978..19ced0435 100755 --- a/modules/productcomments/products-comparison.tpl +++ b/modules/productcomments/products-comparison.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/productcomments/tab.tpl b/modules/productcomments/tab.tpl index 8f516f8a4..8630a5e5b 100644 --- a/modules/productcomments/tab.tpl +++ b/modules/productcomments/tab.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/productcomments/translations/index.php b/modules/productcomments/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/productcomments/translations/index.php +++ b/modules/productcomments/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/productscategory/productscategory.js b/modules/productscategory/productscategory.js index dbcd07017..4ece40da5 100644 --- a/modules/productscategory/productscategory.js +++ b/modules/productscategory/productscategory.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7310 $ * @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/productscategory/productscategory.php b/modules/productscategory/productscategory.php index 6c6b37f2d..5d00a9a95 100644 --- a/modules/productscategory/productscategory.php +++ b/modules/productscategory/productscategory.php @@ -20,7 +20,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/productscategory/productscategory.tpl b/modules/productscategory/productscategory.tpl index b392de8e2..498fdf398 100644 --- a/modules/productscategory/productscategory.tpl +++ b/modules/productscategory/productscategory.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8337 $ * @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/productscategory/translations/index.php b/modules/productscategory/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/productscategory/translations/index.php +++ b/modules/productscategory/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/producttooltip/producttooltip.php b/modules/producttooltip/producttooltip.php index 526ea197c..5765262e1 100644 --- a/modules/producttooltip/producttooltip.php +++ b/modules/producttooltip/producttooltip.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/producttooltip/producttooltip.tpl b/modules/producttooltip/producttooltip.tpl index 2a73c8d54..1fa4b2dda 100644 --- a/modules/producttooltip/producttooltip.tpl +++ b/modules/producttooltip/producttooltip.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/producttooltip/translations/index.php b/modules/producttooltip/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/producttooltip/translations/index.php +++ b/modules/producttooltip/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/referralprogram/ReferralProgramModule.php b/modules/referralprogram/ReferralProgramModule.php index 2e1a9ed9e..4185fd6fc 100644 --- a/modules/referralprogram/ReferralProgramModule.php +++ b/modules/referralprogram/ReferralProgramModule.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7310 $ * @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/referralprogram/controllers/front/email.php b/modules/referralprogram/controllers/front/email.php index 77c6d1cd2..86640a778 100755 --- a/modules/referralprogram/controllers/front/email.php +++ b/modules/referralprogram/controllers/front/email.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/referralprogram/controllers/front/index.php b/modules/referralprogram/controllers/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/referralprogram/controllers/front/index.php +++ b/modules/referralprogram/controllers/front/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/referralprogram/controllers/front/program.php b/modules/referralprogram/controllers/front/program.php index d6787eb2f..49857b669 100755 --- a/modules/referralprogram/controllers/front/program.php +++ b/modules/referralprogram/controllers/front/program.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/referralprogram/controllers/front/rules.php b/modules/referralprogram/controllers/front/rules.php index acbc8e5e8..27b790385 100755 --- a/modules/referralprogram/controllers/front/rules.php +++ b/modules/referralprogram/controllers/front/rules.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/referralprogram/controllers/index.php b/modules/referralprogram/controllers/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/referralprogram/controllers/index.php +++ b/modules/referralprogram/controllers/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/referralprogram/referralprogram.php b/modules/referralprogram/referralprogram.php index 3e2119333..d539cdfc6 100644 --- a/modules/referralprogram/referralprogram.php +++ b/modules/referralprogram/referralprogram.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7048 $ * @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/referralprogram/translations/index.php b/modules/referralprogram/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/referralprogram/translations/index.php +++ b/modules/referralprogram/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/referralprogram/views/index.php b/modules/referralprogram/views/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/referralprogram/views/index.php +++ b/modules/referralprogram/views/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/referralprogram/views/templates/front/email.tpl b/modules/referralprogram/views/templates/front/email.tpl index 8dc4d213d..485d19d30 100755 --- a/modules/referralprogram/views/templates/front/email.tpl +++ b/modules/referralprogram/views/templates/front/email.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/referralprogram/views/templates/front/index.php b/modules/referralprogram/views/templates/front/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/referralprogram/views/templates/front/index.php +++ b/modules/referralprogram/views/templates/front/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/referralprogram/views/templates/front/program.tpl b/modules/referralprogram/views/templates/front/program.tpl index d4ecc4ffa..8af76a540 100644 --- a/modules/referralprogram/views/templates/front/program.tpl +++ b/modules/referralprogram/views/templates/front/program.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8084 $ * @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/referralprogram/views/templates/front/rules.tpl b/modules/referralprogram/views/templates/front/rules.tpl index 392b20180..16154f73f 100755 --- a/modules/referralprogram/views/templates/front/rules.tpl +++ b/modules/referralprogram/views/templates/front/rules.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/referralprogram/views/templates/hook/authentication.tpl b/modules/referralprogram/views/templates/hook/authentication.tpl index 0fb056d84..ce83c8257 100755 --- a/modules/referralprogram/views/templates/hook/authentication.tpl +++ b/modules/referralprogram/views/templates/hook/authentication.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/referralprogram/views/templates/hook/index.php b/modules/referralprogram/views/templates/hook/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/referralprogram/views/templates/hook/index.php +++ b/modules/referralprogram/views/templates/hook/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/referralprogram/views/templates/hook/my-account.tpl b/modules/referralprogram/views/templates/hook/my-account.tpl index 36b16facc..1bf23209d 100755 --- a/modules/referralprogram/views/templates/hook/my-account.tpl +++ b/modules/referralprogram/views/templates/hook/my-account.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/referralprogram/views/templates/hook/order-confirmation.tpl b/modules/referralprogram/views/templates/hook/order-confirmation.tpl index 1191218c5..d1f42add0 100755 --- a/modules/referralprogram/views/templates/hook/order-confirmation.tpl +++ b/modules/referralprogram/views/templates/hook/order-confirmation.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/referralprogram/views/templates/hook/shopping-cart.tpl b/modules/referralprogram/views/templates/hook/shopping-cart.tpl index 264436b7a..99a25f602 100755 --- a/modules/referralprogram/views/templates/hook/shopping-cart.tpl +++ b/modules/referralprogram/views/templates/hook/shopping-cart.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/modules/referralprogram/views/templates/index.php b/modules/referralprogram/views/templates/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/referralprogram/views/templates/index.php +++ b/modules/referralprogram/views/templates/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/sekeywords/sekeywords.php b/modules/sekeywords/sekeywords.php index b3e91b71c..fc63d9c55 100644 --- a/modules/sekeywords/sekeywords.php +++ b/modules/sekeywords/sekeywords.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/sekeywords/translations/index.php b/modules/sekeywords/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/sekeywords/translations/index.php +++ b/modules/sekeywords/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/sendtoafriend/sendtoafriend.php b/modules/sendtoafriend/sendtoafriend.php index 1043cd145..376b8f5b2 100644 --- a/modules/sendtoafriend/sendtoafriend.php +++ b/modules/sendtoafriend/sendtoafriend.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/sendtoafriend/translations/index.php b/modules/sendtoafriend/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/sendtoafriend/translations/index.php +++ b/modules/sendtoafriend/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/shopimporter/translations/index.php b/modules/shopimporter/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/shopimporter/translations/index.php +++ b/modules/shopimporter/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/statsbestcategories/statsbestcategories.php b/modules/statsbestcategories/statsbestcategories.php index fdb285817..3bc0eaa51 100644 --- a/modules/statsbestcategories/statsbestcategories.php +++ b/modules/statsbestcategories/statsbestcategories.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6957 $ * @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/statsbestcategories/translations/index.php b/modules/statsbestcategories/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsbestcategories/translations/index.php +++ b/modules/statsbestcategories/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/statsbestcustomers/statsbestcustomers.php b/modules/statsbestcustomers/statsbestcustomers.php index 7e871effa..52ddcc730 100644 --- a/modules/statsbestcustomers/statsbestcustomers.php +++ b/modules/statsbestcustomers/statsbestcustomers.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7329 $ * @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/statsbestcustomers/translations/index.php b/modules/statsbestcustomers/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsbestcustomers/translations/index.php +++ b/modules/statsbestcustomers/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/statsbestmanufacturers/statsbestmanufacturers.php b/modules/statsbestmanufacturers/statsbestmanufacturers.php index 5b39baabc..d6af292ea 100755 --- a/modules/statsbestmanufacturers/statsbestmanufacturers.php +++ b/modules/statsbestmanufacturers/statsbestmanufacturers.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/statsbestmanufacturers/translations/index.php b/modules/statsbestmanufacturers/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsbestmanufacturers/translations/index.php +++ b/modules/statsbestmanufacturers/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/statsbestproducts/statsbestproducts.php b/modules/statsbestproducts/statsbestproducts.php index df50e5744..c1cd43709 100644 --- a/modules/statsbestproducts/statsbestproducts.php +++ b/modules/statsbestproducts/statsbestproducts.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6946 $ * @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/statsbestproducts/translations/index.php b/modules/statsbestproducts/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsbestproducts/translations/index.php +++ b/modules/statsbestproducts/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/statsbestsuppliers/statsbestsuppliers.php b/modules/statsbestsuppliers/statsbestsuppliers.php index c720ef489..3f8fcac79 100644 --- a/modules/statsbestsuppliers/statsbestsuppliers.php +++ b/modules/statsbestsuppliers/statsbestsuppliers.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/statsbestsuppliers/translations/index.php b/modules/statsbestsuppliers/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsbestsuppliers/translations/index.php +++ b/modules/statsbestsuppliers/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/statsbestvouchers/statsbestvouchers.php b/modules/statsbestvouchers/statsbestvouchers.php index 88e078a76..8c7f6ef60 100644 --- a/modules/statsbestvouchers/statsbestvouchers.php +++ b/modules/statsbestvouchers/statsbestvouchers.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/statsbestvouchers/translations/index.php b/modules/statsbestvouchers/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsbestvouchers/translations/index.php +++ b/modules/statsbestvouchers/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/statscarrier/statscarrier.php b/modules/statscarrier/statscarrier.php index 22514a9e6..519669ea1 100644 --- a/modules/statscarrier/statscarrier.php +++ b/modules/statscarrier/statscarrier.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/statscarrier/translations/index.php b/modules/statscarrier/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statscarrier/translations/index.php +++ b/modules/statscarrier/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/statscatalog/statscatalog.php b/modules/statscatalog/statscatalog.php index 1a851138d..dd78cc4d5 100644 --- a/modules/statscatalog/statscatalog.php +++ b/modules/statscatalog/statscatalog.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7060 $ * @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/statscatalog/translations/index.php b/modules/statscatalog/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statscatalog/translations/index.php +++ b/modules/statscatalog/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/statscheckup/statscheckup.php b/modules/statscheckup/statscheckup.php index d21dffed3..d70148206 100644 --- a/modules/statscheckup/statscheckup.php +++ b/modules/statscheckup/statscheckup.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7060 $ * @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/statscheckup/translations/index.php b/modules/statscheckup/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statscheckup/translations/index.php +++ b/modules/statscheckup/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/statsdata/statsdata.php b/modules/statsdata/statsdata.php index 83b2e8351..87226abd7 100644 --- a/modules/statsdata/statsdata.php +++ b/modules/statsdata/statsdata.php @@ -20,7 +20,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/statsdata/translations/index.php b/modules/statsdata/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsdata/translations/index.php +++ b/modules/statsdata/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/statsequipment/statsequipment.php b/modules/statsequipment/statsequipment.php index 57f6d49a3..afcbbccb1 100644 --- a/modules/statsequipment/statsequipment.php +++ b/modules/statsequipment/statsequipment.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/statsequipment/translations/index.php b/modules/statsequipment/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsequipment/translations/index.php +++ b/modules/statsequipment/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/statsforecast/statsforecast.php b/modules/statsforecast/statsforecast.php index b7ac43619..e61ec9fd4 100644 --- a/modules/statsforecast/statsforecast.php +++ b/modules/statsforecast/statsforecast.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7104 $ * @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/statsforecast/translations/index.php b/modules/statsforecast/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsforecast/translations/index.php +++ b/modules/statsforecast/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/statsgeolocation/config.php b/modules/statsgeolocation/config.php index 7fd8709a9..f123e2f03 100644 --- a/modules/statsgeolocation/config.php +++ b/modules/statsgeolocation/config.php @@ -20,7 +20,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/statsgeolocation/drawer.php b/modules/statsgeolocation/drawer.php index fc340eb01..9e8770fa3 100644 --- a/modules/statsgeolocation/drawer.php +++ b/modules/statsgeolocation/drawer.php @@ -20,7 +20,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/statsgeolocation/statsgeolocation.js b/modules/statsgeolocation/statsgeolocation.js index e1b6adcf6..062b158ad 100644 --- a/modules/statsgeolocation/statsgeolocation.js +++ b/modules/statsgeolocation/statsgeolocation.js @@ -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/statsgeolocation/statsgeolocation.php b/modules/statsgeolocation/statsgeolocation.php index 5133ed5e1..aedf1cd8e 100644 --- a/modules/statsgeolocation/statsgeolocation.php +++ b/modules/statsgeolocation/statsgeolocation.php @@ -20,7 +20,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/statsgeolocation/translations/index.php b/modules/statsgeolocation/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsgeolocation/translations/index.php +++ b/modules/statsgeolocation/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/statslive/statslive.php b/modules/statslive/statslive.php index ffefab803..6c60f3c8b 100644 --- a/modules/statslive/statslive.php +++ b/modules/statslive/statslive.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/statslive/translations/index.php b/modules/statslive/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statslive/translations/index.php +++ b/modules/statslive/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/statsnewsletter/statsnewsletter.php b/modules/statsnewsletter/statsnewsletter.php index 38b536109..344e268ab 100644 --- a/modules/statsnewsletter/statsnewsletter.php +++ b/modules/statsnewsletter/statsnewsletter.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/statsnewsletter/translations/index.php b/modules/statsnewsletter/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsnewsletter/translations/index.php +++ b/modules/statsnewsletter/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/statsorigin/statsorigin.php b/modules/statsorigin/statsorigin.php index 1df4fc0b0..b5c3e0d3c 100644 --- a/modules/statsorigin/statsorigin.php +++ b/modules/statsorigin/statsorigin.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/statsorigin/translations/index.php b/modules/statsorigin/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsorigin/translations/index.php +++ b/modules/statsorigin/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/statspersonalinfos/statspersonalinfos.php b/modules/statspersonalinfos/statspersonalinfos.php index c523e0ce4..a8d13e61d 100644 --- a/modules/statspersonalinfos/statspersonalinfos.php +++ b/modules/statspersonalinfos/statspersonalinfos.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/statspersonalinfos/translations/index.php b/modules/statspersonalinfos/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statspersonalinfos/translations/index.php +++ b/modules/statspersonalinfos/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/statsproduct/statsproduct.php b/modules/statsproduct/statsproduct.php index d54089255..5ad9ae1b7 100644 --- a/modules/statsproduct/statsproduct.php +++ b/modules/statsproduct/statsproduct.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/statsproduct/translations/index.php b/modules/statsproduct/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsproduct/translations/index.php +++ b/modules/statsproduct/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/statsregistrations/statsregistrations.php b/modules/statsregistrations/statsregistrations.php index 30e7d3072..96a15ce97 100644 --- a/modules/statsregistrations/statsregistrations.php +++ b/modules/statsregistrations/statsregistrations.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/statsregistrations/translations/index.php b/modules/statsregistrations/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsregistrations/translations/index.php +++ b/modules/statsregistrations/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/statssales/statssales.php b/modules/statssales/statssales.php index 29876190f..2ac5c0d98 100644 --- a/modules/statssales/statssales.php +++ b/modules/statssales/statssales.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/statssales/translations/index.php b/modules/statssales/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statssales/translations/index.php +++ b/modules/statssales/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/statssearch/statssearch.php b/modules/statssearch/statssearch.php index 2f7b3920f..deeba40de 100644 --- a/modules/statssearch/statssearch.php +++ b/modules/statssearch/statssearch.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/statssearch/translations/index.php b/modules/statssearch/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statssearch/translations/index.php +++ b/modules/statssearch/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/statsstock/statsstock.php b/modules/statsstock/statsstock.php index 266132620..ec11f6ea8 100644 --- a/modules/statsstock/statsstock.php +++ b/modules/statsstock/statsstock.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7048 $ * @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/statsstock/translations/index.php b/modules/statsstock/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsstock/translations/index.php +++ b/modules/statsstock/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/statsvisits/statsvisits.php b/modules/statsvisits/statsvisits.php index 260d042d4..a2e940cab 100644 --- a/modules/statsvisits/statsvisits.php +++ b/modules/statsvisits/statsvisits.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7307 $ * @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/statsvisits/translations/index.php b/modules/statsvisits/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/statsvisits/translations/index.php +++ b/modules/statsvisits/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/trackingfront/account.tpl b/modules/trackingfront/account.tpl index eeb4fa713..36242ab8c 100644 --- a/modules/trackingfront/account.tpl +++ b/modules/trackingfront/account.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/trackingfront/footer.tpl b/modules/trackingfront/footer.tpl index 32147846c..80489891a 100644 --- a/modules/trackingfront/footer.tpl +++ b/modules/trackingfront/footer.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/trackingfront/header.tpl b/modules/trackingfront/header.tpl index f0b711c41..c7f412a71 100644 --- a/modules/trackingfront/header.tpl +++ b/modules/trackingfront/header.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/trackingfront/login.tpl b/modules/trackingfront/login.tpl index 224a35769..2cd0bcc46 100644 --- a/modules/trackingfront/login.tpl +++ b/modules/trackingfront/login.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/trackingfront/stats.php b/modules/trackingfront/stats.php index e27cecf14..7ae14d749 100644 --- a/modules/trackingfront/stats.php +++ b/modules/trackingfront/stats.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/trackingfront/trackingfront.php b/modules/trackingfront/trackingfront.php index 1182bf4da..17d172991 100644 --- a/modules/trackingfront/trackingfront.php +++ b/modules/trackingfront/trackingfront.php @@ -20,7 +20,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/trackingfront/translations/index.php b/modules/trackingfront/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/trackingfront/translations/index.php +++ b/modules/trackingfront/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/vatnumber/ajax.php b/modules/vatnumber/ajax.php index dbec85cbc..da937ce86 100644 --- a/modules/vatnumber/ajax.php +++ b/modules/vatnumber/ajax.php @@ -20,7 +20,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/vatnumber/translations/index.php b/modules/vatnumber/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/vatnumber/translations/index.php +++ b/modules/vatnumber/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/vatnumber/vatnumber.php b/modules/vatnumber/vatnumber.php index a66f4963d..14dac40a2 100755 --- a/modules/vatnumber/vatnumber.php +++ b/modules/vatnumber/vatnumber.php @@ -20,7 +20,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/watermark/translations/index.php b/modules/watermark/translations/index.php index 08a7f8048..3d9fb1394 100644 --- a/modules/watermark/translations/index.php +++ b/modules/watermark/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/watermark/watermark.php b/modules/watermark/watermark.php index 8284808f2..87dc37c14 100644 --- a/modules/watermark/watermark.php +++ b/modules/watermark/watermark.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7310 $ * @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/my-account.php b/my-account.php index 0206b23c8..7a990d0aa 100644 --- a/my-account.php +++ b/my-account.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/new-products.php b/new-products.php index 7c2254d46..775d31c91 100644 --- a/new-products.php +++ b/new-products.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/order-confirmation.php b/order-confirmation.php index bea1faa78..659be0d4f 100644 --- a/order-confirmation.php +++ b/order-confirmation.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/order-detail.php b/order-detail.php index c53b2ef81..73f3c82bd 100644 --- a/order-detail.php +++ b/order-detail.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/order-follow.php b/order-follow.php index 604f1f555..ad145129f 100644 --- a/order-follow.php +++ b/order-follow.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/order-opc.php b/order-opc.php index 2016eb259..ae00b767d 100755 --- a/order-opc.php +++ b/order-opc.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/order-return.php b/order-return.php index 04c5dd52e..701149109 100644 --- a/order-return.php +++ b/order-return.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/order-slip.php b/order-slip.php index a528d294f..eba573154 100644 --- a/order-slip.php +++ b/order-slip.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/order.php b/order.php index 0fcbfef20..78d302586 100644 --- a/order.php +++ b/order.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/override/classes/_Tools.php b/override/classes/_Tools.php index b73a5537b..3d124d735 100755 --- a/override/classes/_Tools.php +++ b/override/classes/_Tools.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/override/classes/cache/index.php b/override/classes/cache/index.php index d4b603ff4..8c890bb60 100644 --- a/override/classes/cache/index.php +++ b/override/classes/cache/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/override/classes/controller/index.php b/override/classes/controller/index.php index d4b603ff4..8c890bb60 100644 --- a/override/classes/controller/index.php +++ b/override/classes/controller/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/override/classes/db/index.php b/override/classes/db/index.php index d4b603ff4..8c890bb60 100644 --- a/override/classes/db/index.php +++ b/override/classes/db/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/override/classes/helper/index.php b/override/classes/helper/index.php index d4b603ff4..8c890bb60 100644 --- a/override/classes/helper/index.php +++ b/override/classes/helper/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/override/classes/log/index.php b/override/classes/log/index.php index d4b603ff4..8c890bb60 100644 --- a/override/classes/log/index.php +++ b/override/classes/log/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/override/classes/module/index.php b/override/classes/module/index.php index d4b603ff4..8c890bb60 100644 --- a/override/classes/module/index.php +++ b/override/classes/module/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/override/classes/order/index.php b/override/classes/order/index.php index d4b603ff4..8c890bb60 100644 --- a/override/classes/order/index.php +++ b/override/classes/order/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/override/classes/pdf/index.php b/override/classes/pdf/index.php index d4b603ff4..8c890bb60 100644 --- a/override/classes/pdf/index.php +++ b/override/classes/pdf/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/override/classes/range/index.php b/override/classes/range/index.php index d4b603ff4..8c890bb60 100644 --- a/override/classes/range/index.php +++ b/override/classes/range/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/override/classes/shop/index.php b/override/classes/shop/index.php index d4b603ff4..8c890bb60 100644 --- a/override/classes/shop/index.php +++ b/override/classes/shop/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/override/classes/stock/index.php b/override/classes/stock/index.php index d4b603ff4..8c890bb60 100644 --- a/override/classes/stock/index.php +++ b/override/classes/stock/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/override/classes/tax/index.php b/override/classes/tax/index.php index d4b603ff4..8c890bb60 100644 --- a/override/classes/tax/index.php +++ b/override/classes/tax/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/override/controllers/admin/index.php b/override/controllers/admin/index.php index d4b603ff4..8c890bb60 100644 --- a/override/controllers/admin/index.php +++ b/override/controllers/admin/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/override/controllers/admin/templates/index.php b/override/controllers/admin/templates/index.php index d9272e54f..4a1165be5 100644 --- a/override/controllers/admin/templates/index.php +++ b/override/controllers/admin/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/password.php b/password.php index 028a2731c..7269f5b8a 100644 --- a/password.php +++ b/password.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/pdf-invoice.php b/pdf-invoice.php index fba2d0817..31e53f5a4 100644 --- a/pdf-invoice.php +++ b/pdf-invoice.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/pdf-order-return.php b/pdf-order-return.php index 3cb7daa8b..549fbe247 100644 --- a/pdf-order-return.php +++ b/pdf-order-return.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/pdf-order-slip.php b/pdf-order-slip.php index 20e4da9a5..eea9f9d53 100644 --- a/pdf-order-slip.php +++ b/pdf-order-slip.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/pdf/delivery-slip.tpl b/pdf/delivery-slip.tpl index 0d9b4abed..f39ca573f 100755 --- a/pdf/delivery-slip.tpl +++ b/pdf/delivery-slip.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6753 $ * @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/pdf/footer.tpl b/pdf/footer.tpl index 222f69493..074fa1b6a 100755 --- a/pdf/footer.tpl +++ b/pdf/footer.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6753 $ * @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/pdf/header.tpl b/pdf/header.tpl index e32e57714..b2f550458 100755 --- a/pdf/header.tpl +++ b/pdf/header.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6753 $ * @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/pdf/invoice-b2b.tpl b/pdf/invoice-b2b.tpl index d6dfb9e89..df11462bf 100755 --- a/pdf/invoice-b2b.tpl +++ b/pdf/invoice-b2b.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6753 $ * @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/pdf/invoice.tax-tab.tpl b/pdf/invoice.tax-tab.tpl index 74da3b8d7..dcee34ffc 100755 --- a/pdf/invoice.tax-tab.tpl +++ b/pdf/invoice.tax-tab.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6753 $ * @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/pdf/invoice.tpl b/pdf/invoice.tpl index d3f0743c0..5a6956b85 100755 --- a/pdf/invoice.tpl +++ b/pdf/invoice.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6753 $ * @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/pdf/order-return.tpl b/pdf/order-return.tpl index 4a4019daa..d9aa31967 100755 --- a/pdf/order-return.tpl +++ b/pdf/order-return.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6753 $ * @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/pdf/order-slip.tpl b/pdf/order-slip.tpl index fc6779931..a6aa186d6 100755 --- a/pdf/order-slip.tpl +++ b/pdf/order-slip.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6753 $ * @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/prices-drop.php b/prices-drop.php index cc076176e..26536c11d 100644 --- a/prices-drop.php +++ b/prices-drop.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/product-sort.php b/product-sort.php index 063ac819d..c4cc66865 100644 --- a/product-sort.php +++ b/product-sort.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/product.php b/product.php index 73b4e26d2..599a34471 100644 --- a/product.php +++ b/product.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/products-comparison.php b/products-comparison.php index e7fae68c5..c8463ea02 100644 --- a/products-comparison.php +++ b/products-comparison.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/search.php b/search.php index 2edc93b9f..172db0cfd 100644 --- a/search.php +++ b/search.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/sitemap.php b/sitemap.php index 41ccfbbc7..58165d2b6 100644 --- a/sitemap.php +++ b/sitemap.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/statistics.php b/statistics.php index 337fcb9be..5beeea7ea 100644 --- a/statistics.php +++ b/statistics.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/stores.php b/stores.php index 83d5c300d..79b0aa0a2 100644 --- a/stores.php +++ b/stores.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/supplier.php b/supplier.php index a8de797c0..f5f0ecd12 100644 --- a/supplier.php +++ b/supplier.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/themes/debug.tpl b/themes/debug.tpl index 81a8743d7..f4397c07a 100644 --- a/themes/debug.tpl +++ b/themes/debug.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/themes/default/404.tpl b/themes/default/404.tpl index 02c949c31..86fe9c596 100644 --- a/themes/default/404.tpl +++ b/themes/default/404.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/address.tpl b/themes/default/address.tpl index b881fd72d..122518bbd 100644 --- a/themes/default/address.tpl +++ b/themes/default/address.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6753 $ * @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/themes/default/addresses.tpl b/themes/default/addresses.tpl index f67a981c9..816012b19 100644 --- a/themes/default/addresses.tpl +++ b/themes/default/addresses.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6664 $ * @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/themes/default/authentication.tpl b/themes/default/authentication.tpl index 85da8a72b..92b1270b6 100644 --- a/themes/default/authentication.tpl +++ b/themes/default/authentication.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/best-sales.tpl b/themes/default/best-sales.tpl index 3d55c5985..c732ad25e 100644 --- a/themes/default/best-sales.tpl +++ b/themes/default/best-sales.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/breadcrumb.tpl b/themes/default/breadcrumb.tpl index 8d7d18358..d854e937b 100644 --- a/themes/default/breadcrumb.tpl +++ b/themes/default/breadcrumb.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/category-cms-tree-branch.tpl b/themes/default/category-cms-tree-branch.tpl index 7f6418a26..faada4f77 100644 --- a/themes/default/category-cms-tree-branch.tpl +++ b/themes/default/category-cms-tree-branch.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/category-tree-branch.tpl b/themes/default/category-tree-branch.tpl index 0f5f60ced..f18865a9a 100644 --- a/themes/default/category-tree-branch.tpl +++ b/themes/default/category-tree-branch.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/category.tpl b/themes/default/category.tpl index 85b11d2a0..ca3332e80 100644 --- a/themes/default/category.tpl +++ b/themes/default/category.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/themes/default/cms.tpl b/themes/default/cms.tpl index 8d53eba36..d4c04e2bb 100644 --- a/themes/default/cms.tpl +++ b/themes/default/cms.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/contact-form.tpl b/themes/default/contact-form.tpl index 29428d92d..ec7d7dd0e 100644 --- a/themes/default/contact-form.tpl +++ b/themes/default/contact-form.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/css/index.php b/themes/default/css/index.php index c239727f7..af0ec9eab 100644 --- a/themes/default/css/index.php +++ b/themes/default/css/index.php @@ -20,7 +20,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/themes/default/discount.tpl b/themes/default/discount.tpl index 0402f25b4..58fba8f50 100644 --- a/themes/default/discount.tpl +++ b/themes/default/discount.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6599 $ * @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/themes/default/errors.tpl b/themes/default/errors.tpl index 495130c5c..432c8ade3 100644 --- a/themes/default/errors.tpl +++ b/themes/default/errors.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/footer.tpl b/themes/default/footer.tpl index 5e3a75968..3453c7c99 100644 --- a/themes/default/footer.tpl +++ b/themes/default/footer.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/guest-tracking.tpl b/themes/default/guest-tracking.tpl index dfad9c182..b6d24c54f 100644 --- a/themes/default/guest-tracking.tpl +++ b/themes/default/guest-tracking.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/header.tpl b/themes/default/header.tpl index 1d8baa1a7..b4bbc3d31 100644 --- a/themes/default/header.tpl +++ b/themes/default/header.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/history.tpl b/themes/default/history.tpl index 0224b88b6..03a30a55f 100644 --- a/themes/default/history.tpl +++ b/themes/default/history.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6599 $ * @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/themes/default/identity.tpl b/themes/default/identity.tpl index 26a43ed34..af5835bae 100644 --- a/themes/default/identity.tpl +++ b/themes/default/identity.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6599 $ * @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/themes/default/index.php b/themes/default/index.php index af505b65c..3da15be20 100644 --- a/themes/default/index.php +++ b/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/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/themes/default/index.tpl b/themes/default/index.tpl index 2689ca2e4..25a62b676 100644 --- a/themes/default/index.tpl +++ b/themes/default/index.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/js/cart-summary.js b/themes/default/js/cart-summary.js index 0df7d1356..82616b455 100644 --- a/themes/default/js/cart-summary.js +++ b/themes/default/js/cart-summary.js @@ -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/themes/default/js/cms.js b/themes/default/js/cms.js index 23f365678..2c0d873fe 100644 --- a/themes/default/js/cms.js +++ b/themes/default/js/cms.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/themes/default/js/contact-form.js b/themes/default/js/contact-form.js index c6bb80625..8d005d06d 100755 --- a/themes/default/js/contact-form.js +++ b/themes/default/js/contact-form.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/themes/default/js/history.js b/themes/default/js/history.js index 6c8f88cbc..d48880d9f 100644 --- a/themes/default/js/history.js +++ b/themes/default/js/history.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/themes/default/js/index.php b/themes/default/js/index.php index c239727f7..af0ec9eab 100644 --- a/themes/default/js/index.php +++ b/themes/default/js/index.php @@ -20,7 +20,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/themes/default/js/modules/index.php b/themes/default/js/modules/index.php index c239727f7..af0ec9eab 100644 --- a/themes/default/js/modules/index.php +++ b/themes/default/js/modules/index.php @@ -20,7 +20,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/themes/default/js/order-address.js b/themes/default/js/order-address.js index 1b98da07d..d293724d5 100644 --- a/themes/default/js/order-address.js +++ b/themes/default/js/order-address.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/themes/default/js/order-opc.js b/themes/default/js/order-opc.js index f52ab702a..48430364f 100644 --- a/themes/default/js/order-opc.js +++ b/themes/default/js/order-opc.js @@ -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/themes/default/js/product.js b/themes/default/js/product.js index f54f9aec5..b4fff13c5 100644 --- a/themes/default/js/product.js +++ b/themes/default/js/product.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7310 $ * @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/themes/default/js/products-comparison.js b/themes/default/js/products-comparison.js index 4aadcf5df..567080d03 100644 --- a/themes/default/js/products-comparison.js +++ b/themes/default/js/products-comparison.js @@ -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/themes/default/js/scenes.js b/themes/default/js/scenes.js index 5c00d7d0a..83623ab95 100644 --- a/themes/default/js/scenes.js +++ b/themes/default/js/scenes.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/themes/default/js/stores.js b/themes/default/js/stores.js index c657d53fd..7fdccd8c7 100644 --- a/themes/default/js/stores.js +++ b/themes/default/js/stores.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6752 $ * @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/themes/default/js/tools.js b/themes/default/js/tools.js index fadd18a81..807de2b52 100644 --- a/themes/default/js/tools.js +++ b/themes/default/js/tools.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/themes/default/js/tools/index.php b/themes/default/js/tools/index.php index c239727f7..af0ec9eab 100644 --- a/themes/default/js/tools/index.php +++ b/themes/default/js/tools/index.php @@ -20,7 +20,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/themes/default/maintenance.tpl b/themes/default/maintenance.tpl index d80e06e77..1b5f5dd1b 100644 --- a/themes/default/maintenance.tpl +++ b/themes/default/maintenance.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/manufacturer-list.tpl b/themes/default/manufacturer-list.tpl index 8fd6d7b42..9c41fa85d 100644 --- a/themes/default/manufacturer-list.tpl +++ b/themes/default/manufacturer-list.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/manufacturer.tpl b/themes/default/manufacturer.tpl index 203d65bd0..a47871ad2 100644 --- a/themes/default/manufacturer.tpl +++ b/themes/default/manufacturer.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/404.tpl b/themes/default/mobile/404.tpl index ffd785bae..9404605ce 100644 --- a/themes/default/mobile/404.tpl +++ b/themes/default/mobile/404.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/address.tpl b/themes/default/mobile/address.tpl index 622e30bc5..76d3deb32 100644 --- a/themes/default/mobile/address.tpl +++ b/themes/default/mobile/address.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6753 $ * @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/themes/default/mobile/addresses.tpl b/themes/default/mobile/addresses.tpl index 2ada29ff2..33085891d 100644 --- a/themes/default/mobile/addresses.tpl +++ b/themes/default/mobile/addresses.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6664 $ * @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/themes/default/mobile/authentication.tpl b/themes/default/mobile/authentication.tpl index 9b5325708..5b798f650 100644 --- a/themes/default/mobile/authentication.tpl +++ b/themes/default/mobile/authentication.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/best-sales.tpl b/themes/default/mobile/best-sales.tpl index 070ccb997..09b14752c 100644 --- a/themes/default/mobile/best-sales.tpl +++ b/themes/default/mobile/best-sales.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/category-cms-tree-branch.tpl b/themes/default/mobile/category-cms-tree-branch.tpl index e23bbc72e..d4447cff9 100644 --- a/themes/default/mobile/category-cms-tree-branch.tpl +++ b/themes/default/mobile/category-cms-tree-branch.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/category-product-list.tpl b/themes/default/mobile/category-product-list.tpl index e2cadc055..f0eaddb33 100644 --- a/themes/default/mobile/category-product-list.tpl +++ b/themes/default/mobile/category-product-list.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7457 $ * @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/themes/default/mobile/category-product-sort.tpl b/themes/default/mobile/category-product-sort.tpl index cb86327ff..8d4e11390 100644 --- a/themes/default/mobile/category-product-sort.tpl +++ b/themes/default/mobile/category-product-sort.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/category-tree-branch.tpl b/themes/default/mobile/category-tree-branch.tpl index 4533f66cd..a9f6aa71d 100644 --- a/themes/default/mobile/category-tree-branch.tpl +++ b/themes/default/mobile/category-tree-branch.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/category.tpl b/themes/default/mobile/category.tpl index b3cd47c5b..2494f0571 100644 --- a/themes/default/mobile/category.tpl +++ b/themes/default/mobile/category.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/themes/default/mobile/cms.tpl b/themes/default/mobile/cms.tpl index ef5c0536c..337d31331 100644 --- a/themes/default/mobile/cms.tpl +++ b/themes/default/mobile/cms.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/contact-form.tpl b/themes/default/mobile/contact-form.tpl index c5b8b89ab..68fd2feba 100644 --- a/themes/default/mobile/contact-form.tpl +++ b/themes/default/mobile/contact-form.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/css/index.php b/themes/default/mobile/css/index.php index c239727f7..af0ec9eab 100644 --- a/themes/default/mobile/css/index.php +++ b/themes/default/mobile/css/index.php @@ -20,7 +20,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/themes/default/mobile/discount.tpl b/themes/default/mobile/discount.tpl index de7254f79..06695b157 100644 --- a/themes/default/mobile/discount.tpl +++ b/themes/default/mobile/discount.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6599 $ * @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/themes/default/mobile/errors.tpl b/themes/default/mobile/errors.tpl index fd2a60ed1..08f2a8609 100644 --- a/themes/default/mobile/errors.tpl +++ b/themes/default/mobile/errors.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/footer.tpl b/themes/default/mobile/footer.tpl index 6a00bb770..1b8771f8f 100644 --- a/themes/default/mobile/footer.tpl +++ b/themes/default/mobile/footer.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/header.tpl b/themes/default/mobile/header.tpl index 3d36a7da6..973b3582c 100644 --- a/themes/default/mobile/header.tpl +++ b/themes/default/mobile/header.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/history.tpl b/themes/default/mobile/history.tpl index def47bcee..dd0511bc7 100644 --- a/themes/default/mobile/history.tpl +++ b/themes/default/mobile/history.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6599 $ * @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/themes/default/mobile/identity.tpl b/themes/default/mobile/identity.tpl index 524d408d4..ef9936723 100644 --- a/themes/default/mobile/identity.tpl +++ b/themes/default/mobile/identity.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6599 $ * @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/themes/default/mobile/img/icon/index.php b/themes/default/mobile/img/icon/index.php index c239727f7..af0ec9eab 100644 --- a/themes/default/mobile/img/icon/index.php +++ b/themes/default/mobile/img/icon/index.php @@ -20,7 +20,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/themes/default/mobile/img/index.php b/themes/default/mobile/img/index.php index c239727f7..af0ec9eab 100644 --- a/themes/default/mobile/img/index.php +++ b/themes/default/mobile/img/index.php @@ -20,7 +20,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/themes/default/mobile/index.php b/themes/default/mobile/index.php index 0aebcd154..f642dd55e 100644 --- a/themes/default/mobile/index.php +++ b/themes/default/mobile/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/themes/default/mobile/index.tpl b/themes/default/mobile/index.tpl index 8694db631..77f5d3bea 100644 --- a/themes/default/mobile/index.tpl +++ b/themes/default/mobile/index.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/js/history.js b/themes/default/mobile/js/history.js index cfcdd7602..33c42a92b 100644 --- a/themes/default/mobile/js/history.js +++ b/themes/default/mobile/js/history.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/themes/default/mobile/js/index.php b/themes/default/mobile/js/index.php index c239727f7..af0ec9eab 100644 --- a/themes/default/mobile/js/index.php +++ b/themes/default/mobile/js/index.php @@ -20,7 +20,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/themes/default/mobile/js/product.js b/themes/default/mobile/js/product.js index 74e69c6f7..4e6627370 100644 --- a/themes/default/mobile/js/product.js +++ b/themes/default/mobile/js/product.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7310 $ * @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/themes/default/mobile/js/stores.js b/themes/default/mobile/js/stores.js index 1e33734cf..bc8984d15 100644 --- a/themes/default/mobile/js/stores.js +++ b/themes/default/mobile/js/stores.js @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14118 $ * @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/themes/default/mobile/layout.tpl b/themes/default/mobile/layout.tpl index da6ccd4ff..492d47e64 100644 --- a/themes/default/mobile/layout.tpl +++ b/themes/default/mobile/layout.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 13866 $ * @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/themes/default/mobile/maintenance.tpl b/themes/default/mobile/maintenance.tpl index c2d862a7e..c6c6ef0ed 100644 --- a/themes/default/mobile/maintenance.tpl +++ b/themes/default/mobile/maintenance.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14105 $ * @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/themes/default/mobile/manufacturer-list.tpl b/themes/default/mobile/manufacturer-list.tpl index 8be636990..dde87679c 100644 --- a/themes/default/mobile/manufacturer-list.tpl +++ b/themes/default/mobile/manufacturer-list.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/manufacturer.tpl b/themes/default/mobile/manufacturer.tpl index ffe3b3b1b..a43543669 100644 --- a/themes/default/mobile/manufacturer.tpl +++ b/themes/default/mobile/manufacturer.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/my-account.tpl b/themes/default/mobile/my-account.tpl index b0cd8d12c..d977762ce 100644 --- a/themes/default/mobile/my-account.tpl +++ b/themes/default/mobile/my-account.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 6599 $ * @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/themes/default/mobile/new-products.tpl b/themes/default/mobile/new-products.tpl index ae0e3e0fc..1f4602cd3 100644 --- a/themes/default/mobile/new-products.tpl +++ b/themes/default/mobile/new-products.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/order-detail-product-li.tpl b/themes/default/mobile/order-detail-product-li.tpl index 8eaa4ca73..d7cd7f99c 100644 --- a/themes/default/mobile/order-detail-product-li.tpl +++ b/themes/default/mobile/order-detail-product-li.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/order-detail.tpl b/themes/default/mobile/order-detail.tpl index 4e17a0db0..b5eaefe37 100644 --- a/themes/default/mobile/order-detail.tpl +++ b/themes/default/mobile/order-detail.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/order-follow.tpl b/themes/default/mobile/order-follow.tpl index 130c2724d..c549df132 100644 --- a/themes/default/mobile/order-follow.tpl +++ b/themes/default/mobile/order-follow.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/themes/default/mobile/order-opc-address.tpl b/themes/default/mobile/order-opc-address.tpl index 3e0987d1e..f34939983 100644 --- a/themes/default/mobile/order-opc-address.tpl +++ b/themes/default/mobile/order-opc-address.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 16764 $ * @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/themes/default/mobile/order-opc-carrier.tpl b/themes/default/mobile/order-opc-carrier.tpl index 6010b7316..57c79d2d8 100644 --- a/themes/default/mobile/order-opc-carrier.tpl +++ b/themes/default/mobile/order-opc-carrier.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 17056 $ * @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/themes/default/mobile/order-opc-payment.tpl b/themes/default/mobile/order-opc-payment.tpl index d0320ec71..fe01a6bfc 100644 --- a/themes/default/mobile/order-opc-payment.tpl +++ b/themes/default/mobile/order-opc-payment.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 17056 $ * @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/themes/default/mobile/order-opc.tpl b/themes/default/mobile/order-opc.tpl index 72fcc8eb5..e402f314c 100644 --- a/themes/default/mobile/order-opc.tpl +++ b/themes/default/mobile/order-opc.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 16965 $ * @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/themes/default/mobile/order-slip.tpl b/themes/default/mobile/order-slip.tpl index 5153e9ab8..f9856ff50 100644 --- a/themes/default/mobile/order-slip.tpl +++ b/themes/default/mobile/order-slip.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6599 $ * @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/themes/default/mobile/pages-list.tpl b/themes/default/mobile/pages-list.tpl index c74242a3f..3f6148c5a 100644 --- a/themes/default/mobile/pages-list.tpl +++ b/themes/default/mobile/pages-list.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/pagination.tpl b/themes/default/mobile/pagination.tpl index b28484064..aaffeffbf 100644 --- a/themes/default/mobile/pagination.tpl +++ b/themes/default/mobile/pagination.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/themes/default/mobile/password.tpl b/themes/default/mobile/password.tpl index 623cbb0fe..2f5fe0bfe 100644 --- a/themes/default/mobile/password.tpl +++ b/themes/default/mobile/password.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/prices-drop.tpl b/themes/default/mobile/prices-drop.tpl index a224bea6d..bb99414cc 100644 --- a/themes/default/mobile/prices-drop.tpl +++ b/themes/default/mobile/prices-drop.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/product-attributes.tpl b/themes/default/mobile/product-attributes.tpl index bfc823004..f9cd7d9cf 100644 --- a/themes/default/mobile/product-attributes.tpl +++ b/themes/default/mobile/product-attributes.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6625 $ * @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/themes/default/mobile/product-images.tpl b/themes/default/mobile/product-images.tpl index 790ee847b..3c110d7b8 100644 --- a/themes/default/mobile/product-images.tpl +++ b/themes/default/mobile/product-images.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6625 $ * @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/themes/default/mobile/product-js.tpl b/themes/default/mobile/product-js.tpl index f5755f180..2a3b44179 100644 --- a/themes/default/mobile/product-js.tpl +++ b/themes/default/mobile/product-js.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6625 $ * @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/themes/default/mobile/product-prices.tpl b/themes/default/mobile/product-prices.tpl index 25c908e86..e4b33a0e1 100644 --- a/themes/default/mobile/product-prices.tpl +++ b/themes/default/mobile/product-prices.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6625 $ * @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/themes/default/mobile/product-quantity-discount.tpl b/themes/default/mobile/product-quantity-discount.tpl index e76161a23..d77a45ac6 100644 --- a/themes/default/mobile/product-quantity-discount.tpl +++ b/themes/default/mobile/product-quantity-discount.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6625 $ * @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/themes/default/mobile/product.tpl b/themes/default/mobile/product.tpl index c22671a15..47fd5f021 100644 --- a/themes/default/mobile/product.tpl +++ b/themes/default/mobile/product.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6625 $ * @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/themes/default/mobile/search.tpl b/themes/default/mobile/search.tpl index 142315e83..00bfe83dd 100644 --- a/themes/default/mobile/search.tpl +++ b/themes/default/mobile/search.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/sitemap.tpl b/themes/default/mobile/sitemap.tpl index c4a0bcf58..265282267 100644 --- a/themes/default/mobile/sitemap.tpl +++ b/themes/default/mobile/sitemap.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/stores.tpl b/themes/default/mobile/stores.tpl index 81a577516..9ac3531a8 100644 --- a/themes/default/mobile/stores.tpl +++ b/themes/default/mobile/stores.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14218 $ * @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/themes/default/mobile/supplier-list.tpl b/themes/default/mobile/supplier-list.tpl index 6ea9d0110..691dfd48e 100644 --- a/themes/default/mobile/supplier-list.tpl +++ b/themes/default/mobile/supplier-list.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/supplier.tpl b/themes/default/mobile/supplier.tpl index 2905ab26e..f11039ec4 100644 --- a/themes/default/mobile/supplier.tpl +++ b/themes/default/mobile/supplier.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/mobile/test.tpl b/themes/default/mobile/test.tpl index cbd016abf..69ab4a485 100644 --- a/themes/default/mobile/test.tpl +++ b/themes/default/mobile/test.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/my-account.tpl b/themes/default/my-account.tpl index 280accfe9..9577959be 100644 --- a/themes/default/my-account.tpl +++ b/themes/default/my-account.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6599 $ * @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/themes/default/new-products.tpl b/themes/default/new-products.tpl index dad7f7d63..0802317f4 100644 --- a/themes/default/new-products.tpl +++ b/themes/default/new-products.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/order-address.tpl b/themes/default/order-address.tpl index 841c2eccd..9a6c88b4e 100644 --- a/themes/default/order-address.tpl +++ b/themes/default/order-address.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/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl index 6ad17c751..ee951a798 100644 --- a/themes/default/order-carrier.tpl +++ b/themes/default/order-carrier.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6758 $ * @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/themes/default/order-confirmation.tpl b/themes/default/order-confirmation.tpl index 0514549dc..4d588c60b 100644 --- a/themes/default/order-confirmation.tpl +++ b/themes/default/order-confirmation.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6599 $ * @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/themes/default/order-detail.tpl b/themes/default/order-detail.tpl index 5ed0bb5fa..a729364c0 100644 --- a/themes/default/order-detail.tpl +++ b/themes/default/order-detail.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/order-follow.tpl b/themes/default/order-follow.tpl index cc461b1d8..7441ff9b1 100644 --- a/themes/default/order-follow.tpl +++ b/themes/default/order-follow.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/themes/default/order-opc.tpl b/themes/default/order-opc.tpl index 6d6dce1b3..0fe763de4 100755 --- a/themes/default/order-opc.tpl +++ b/themes/default/order-opc.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/order-payment.tpl b/themes/default/order-payment.tpl index b89c35fbb..bbeb72ccc 100644 --- a/themes/default/order-payment.tpl +++ b/themes/default/order-payment.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/order-return.tpl b/themes/default/order-return.tpl index be16b496e..1fb746efd 100644 --- a/themes/default/order-return.tpl +++ b/themes/default/order-return.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/order-slip.tpl b/themes/default/order-slip.tpl index 01fe371a4..2a157c0c8 100644 --- a/themes/default/order-slip.tpl +++ b/themes/default/order-slip.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6599 $ * @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/themes/default/order-steps.tpl b/themes/default/order-steps.tpl index 7ac43652b..24418b464 100644 --- a/themes/default/order-steps.tpl +++ b/themes/default/order-steps.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/pagination.tpl b/themes/default/pagination.tpl index e5e2695d4..9f5e3257b 100644 --- a/themes/default/pagination.tpl +++ b/themes/default/pagination.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/themes/default/password.tpl b/themes/default/password.tpl index 1f0b24864..dc83a2d76 100644 --- a/themes/default/password.tpl +++ b/themes/default/password.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/pdf/index.php b/themes/default/pdf/index.php index 60bc2ce27..88e934d59 100755 --- a/themes/default/pdf/index.php +++ b/themes/default/pdf/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/themes/default/prices-drop.tpl b/themes/default/prices-drop.tpl index 3205657c8..1fe7359b1 100644 --- a/themes/default/prices-drop.tpl +++ b/themes/default/prices-drop.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/product-compare.tpl b/themes/default/product-compare.tpl index 72230d7f8..2caa909d0 100644 --- a/themes/default/product-compare.tpl +++ b/themes/default/product-compare.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/product-list.tpl b/themes/default/product-list.tpl index cd69727d6..819ea18dd 100644 --- a/themes/default/product-list.tpl +++ b/themes/default/product-list.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7457 $ * @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/themes/default/product-sort.tpl b/themes/default/product-sort.tpl index 95d61c9df..246ba8c4e 100644 --- a/themes/default/product-sort.tpl +++ b/themes/default/product-sort.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/product.tpl b/themes/default/product.tpl index 547f26cec..f0ef96146 100644 --- a/themes/default/product.tpl +++ b/themes/default/product.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6625 $ * @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/themes/default/products-comparison.tpl b/themes/default/products-comparison.tpl index 97813c493..fd5467a61 100644 --- a/themes/default/products-comparison.tpl +++ b/themes/default/products-comparison.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/restricted-country.tpl b/themes/default/restricted-country.tpl index f23bb0896..ecc2c05d5 100644 --- a/themes/default/restricted-country.tpl +++ b/themes/default/restricted-country.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/themes/default/scenes.tpl b/themes/default/scenes.tpl index 499754a58..c4b4ac830 100644 --- a/themes/default/scenes.tpl +++ b/themes/default/scenes.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/search.tpl b/themes/default/search.tpl index a820be587..2236e2537 100644 --- a/themes/default/search.tpl +++ b/themes/default/search.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/shopping-cart-product-line.tpl b/themes/default/shopping-cart-product-line.tpl index 7275cdb9e..a71e0714b 100644 --- a/themes/default/shopping-cart-product-line.tpl +++ b/themes/default/shopping-cart-product-line.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/shopping-cart.tpl b/themes/default/shopping-cart.tpl index 8621332c9..0a141ad7a 100644 --- a/themes/default/shopping-cart.tpl +++ b/themes/default/shopping-cart.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7476 $ * @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/themes/default/sitemap.tpl b/themes/default/sitemap.tpl index fe97c5f0b..c83cffd26 100644 --- a/themes/default/sitemap.tpl +++ b/themes/default/sitemap.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/store_infos.tpl b/themes/default/store_infos.tpl index e1dd1f4cd..3e09027c4 100644 --- a/themes/default/store_infos.tpl +++ b/themes/default/store_infos.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6752 $ * @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/themes/default/stores.tpl b/themes/default/stores.tpl index 0ba9082ac..e015f41a2 100644 --- a/themes/default/stores.tpl +++ b/themes/default/stores.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/supplier-list.tpl b/themes/default/supplier-list.tpl index 30e369592..f06e8ab3d 100644 --- a/themes/default/supplier-list.tpl +++ b/themes/default/supplier-list.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/supplier.tpl b/themes/default/supplier.tpl index a84ff132b..560f5e2bc 100644 --- a/themes/default/supplier.tpl +++ b/themes/default/supplier.tpl @@ -19,7 +19,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/index.php b/themes/index.php index c239727f7..af0ec9eab 100644 --- a/themes/index.php +++ b/themes/index.php @@ -20,7 +20,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/themes/live_edit.tpl b/themes/live_edit.tpl index 9805c856f..4443ecb17 100644 --- a/themes/live_edit.tpl +++ b/themes/live_edit.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/tools/mobile_Detect/index.php b/tools/mobile_Detect/index.php index d11b574fe..cadb1ea6e 100644 --- a/tools/mobile_Detect/index.php +++ b/tools/mobile_Detect/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/tools/parser_sql/index.php b/tools/parser_sql/index.php index f703175cc..810a333c3 100644 --- a/tools/parser_sql/index.php +++ b/tools/parser_sql/index.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 7776 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/tools/profiling/Controller.php b/tools/profiling/Controller.php index 9dd524e00..ec2d42cbf 100644 --- a/tools/profiling/Controller.php +++ b/tools/profiling/Controller.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 10840 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/tools/profiling/Hook.php b/tools/profiling/Hook.php index 757d6f618..9572e0fbe 100644 --- a/tools/profiling/Hook.php +++ b/tools/profiling/Hook.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/tools/smarty/index.php b/tools/smarty/index.php index d11b574fe..cadb1ea6e 100644 --- a/tools/smarty/index.php +++ b/tools/smarty/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/tools/smarty/plugins/index.php b/tools/smarty/plugins/index.php index d4b603ff4..8c890bb60 100644 --- a/tools/smarty/plugins/index.php +++ b/tools/smarty/plugins/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/tools/smarty/sysplugins/index.php b/tools/smarty/sysplugins/index.php index d4b603ff4..8c890bb60 100644 --- a/tools/smarty/sysplugins/index.php +++ b/tools/smarty/sysplugins/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/tools/tcpdf/cache/index.php b/tools/tcpdf/cache/index.php index d4b603ff4..8c890bb60 100644 --- a/tools/tcpdf/cache/index.php +++ b/tools/tcpdf/cache/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/tools/tcpdf/config/index.php b/tools/tcpdf/config/index.php index d4b603ff4..8c890bb60 100644 --- a/tools/tcpdf/config/index.php +++ b/tools/tcpdf/config/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/tools/tcpdf/config/lang/index.php b/tools/tcpdf/config/lang/index.php index d9272e54f..4a1165be5 100644 --- a/tools/tcpdf/config/lang/index.php +++ b/tools/tcpdf/config/lang/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/tools/tcpdf/fonts/index.php b/tools/tcpdf/fonts/index.php index d4b603ff4..8c890bb60 100644 --- a/tools/tcpdf/fonts/index.php +++ b/tools/tcpdf/fonts/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/tools/tcpdf/index.php b/tools/tcpdf/index.php index d11b574fe..cadb1ea6e 100644 --- a/tools/tcpdf/index.php +++ b/tools/tcpdf/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/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/upload/index.php b/upload/index.php index 60bc2ce27..88e934d59 100644 --- a/upload/index.php +++ b/upload/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/webservice/dispatcher.php b/webservice/dispatcher.php index 5bff671a6..03b421049 100644 --- a/webservice/dispatcher.php +++ b/webservice/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 */ diff --git a/webservice/index.php b/webservice/index.php index 7ad2d85e5..c93d89c49 100644 --- a/webservice/index.php +++ b/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 */ From a2c4e92c1d22d9db247de6ac46ef9bb7799efc00 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 22 Nov 2012 11:59:43 +0100 Subject: [PATCH 024/316] //remove svn keyword @version Release: $ part 2 --- init.php | 1 - 1 file changed, 1 deletion(-) diff --git a/init.php b/init.php index 059e47c98..da51e4c1d 100644 --- a/init.php +++ b/init.php @@ -20,7 +20,6 @@ * * @author PrestaShop SA * @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ From 7e9c38612dd34fa75a867c7b614d0ff8f456384c Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Thu, 22 Nov 2012 12:05:43 +0100 Subject: [PATCH 025/316] [-] FO : fixed error in price cache (multishop not taken into account) #PSCFV-5612 --- classes/Product.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/Product.php b/classes/Product.php index efdbd36d6..ff4e1f8a1 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -2527,19 +2527,19 @@ class ProductCore extends ObjectModel return self::$_prices[$cache_id]; // fetch price & attribute price - $cache_id_2 = $id_product; + $cache_id_2 = $id_product.'-'.$id_shop; if (!isset(self::$_pricesLevel2[$cache_id_2])) { $sql = new DbQuery(); $sql->select('product_shop.`price`, product_shop.`ecotax`'); $sql->from('product', 'p'); - $sql->innerJoin('product_shop', 'product_shop', '(product_shop.id_product=p.id_product AND product_shop.id_shop='.(int)$id_shop.')'); + $sql->innerJoin('product_shop', 'product_shop', '(product_shop.id_product=p.id_product AND product_shop.id_shop = '.(int)$id_shop.')'); $sql->where('p.`id_product` = '.(int)$id_product); if (Combination::isFeatureActive()) { $sql->select('product_attribute_shop.id_product_attribute, product_attribute_shop.`price` AS attribute_price, product_attribute_shop.default_on'); $sql->leftJoin('product_attribute', 'pa', 'pa.`id_product` = p.`id_product`'); - $sql->leftJoin('product_attribute_shop', 'product_attribute_shop', '(product_attribute_shop.id_product_attribute=pa.id_product_attribute AND product_attribute_shop.id_shop='.(int)$id_shop.')'); + $sql->leftJoin('product_attribute_shop', 'product_attribute_shop', '(product_attribute_shop.id_product_attribute = pa.id_product_attribute AND product_attribute_shop.id_shop = '.(int)$id_shop.')'); } else $sql->select('0 as id_product_attribute'); From 57388850a3a7f2d54e2f1ff5b05a44cc5460ca98 Mon Sep 17 00:00:00 2001 From: Xavier POITAU Date: Thu, 22 Nov 2012 14:14:02 +0100 Subject: [PATCH 026/316] When you set the "Fees by carrier, geographical zone, and ranges" (in the "Shipping" tab), the prices are tax excluded and displayed with 2 decimals, but the price is saved with 6 decimals in the database. So when you define a shipping fee with 6 decimals it is saved without problem, but when you come back to edit the values, they are rounded (2 decimals) so you are forced to edit the values again, or else saving will replace the previous 6-decimals values with the displayed 2-decimals values. Having 6 decimals displayed in the BO (not rounded, raw value from the database) is necessary because these values are tax excluded and are displayed tax included on the FO. --- .../themes/default/template/controllers/shipping/content.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin-dev/themes/default/template/controllers/shipping/content.tpl b/admin-dev/themes/default/template/controllers/shipping/content.tpl index 9f987c54d..30ffaa88d 100644 --- a/admin-dev/themes/default/template/controllers/shipping/content.tpl +++ b/admin-dev/themes/default/template/controllers/shipping/content.tpl @@ -78,7 +78,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.)'} From da1ae4906ef33dfaa81742b5ffc72e3993838cc1 Mon Sep 17 00:00:00 2001 From: cmouleyre Date: Thu, 22 Nov 2012 14:58:52 +0100 Subject: [PATCH 027/316] Remove color for email in *.php --- classes/PaymentModule.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 670ce46c7..cd4abd97c 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -481,7 +481,7 @@ abstract class PaymentModuleCore extends Module } $cart_rules_list .= ' - + '.Tools::displayError('Voucher name:').' '.$cart_rule['obj']->name.' '.($values['tax_incl'] != 0.00 ? '-' : '').Tools::displayPrice($values['tax_incl'], $this->context->currency, false).' '; @@ -565,12 +565,12 @@ abstract class PaymentModuleCore extends Module '{delivery_block_txt}' => $this->_getFormatedAddress($delivery, "\n"), '{invoice_block_txt}' => $this->_getFormatedAddress($invoice, "\n"), '{delivery_block_html}' => $this->_getFormatedAddress($delivery, '
', array( - 'firstname' => '%s', - 'lastname' => '%s' + 'firstname' => '%s', + 'lastname' => '%s' )), '{invoice_block_html}' => $this->_getFormatedAddress($invoice, '
', array( - 'firstname' => '%s', - 'lastname' => '%s' + 'firstname' => '%s', + 'lastname' => '%s' )), '{delivery_company}' => $delivery->company, '{delivery_firstname}' => $delivery->firstname, From 87a397b5cad6cd73cbcc65eccdcbe94b6808021f Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Thu, 22 Nov 2012 15:15:43 +0100 Subject: [PATCH 028/316] [-] BO : image regeneration now gives a better reporting and crash less #PSCFV-5519 --- classes/ImageManager.php | 2 +- controllers/admin/AdminImagesController.php | 63 +++++++++++---------- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/classes/ImageManager.php b/classes/ImageManager.php index 468e8231a..8ddb8e811 100644 --- a/classes/ImageManager.php +++ b/classes/ImageManager.php @@ -119,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); diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index 03db6a6d4..e5851926d 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.php @@ -343,16 +343,18 @@ class AdminImagesControllerCore extends AdminController } else $this->errors[] = Tools::displayError('You do not have permission to edit here.'); - }elseif (Tools::getValue('submitMoveImages'.$this->table)) + } + elseif (Tools::getValue('submitMoveImages'.$this->table)) { if ($this->tabAccess['edit'] === '1') { if ($this->_moveImagesToNewFileSystem()) Tools::redirectAdmin(self::$currentIndex.'&conf=25'.'&token='.$this->token); } - else + else $this->errors[] = Tools::displayError('You do not have permission to edit here.'); - }elseif (Tools::getValue('submitImagePreferences')) + } + elseif (Tools::getValue('submitImagePreferences')) { if ($this->tabAccess['edit'] === '1') { @@ -459,11 +461,11 @@ class AdminImagesControllerCore extends AdminController { if (!is_dir($dir)) return false; + $errors = false; - $toRegen = scandir($dir); if (!$productsImages) { - foreach ($toRegen as $image) + foreach (scandir($dir) as $image) if (preg_match('/^[0-9]*\.jpg$/', $image)) foreach ($type as $k => $imageType) { @@ -474,41 +476,39 @@ class AdminImagesControllerCore extends AdminController if (!file_exists($newDir)) continue; if (!file_exists($newDir.substr($image, 0, -4).'-'.stripslashes($imageType['name']).'.jpg')) - if (!ImageManager::resize($dir.$image, $newDir.substr($image, 0, -4).'-'.stripslashes($imageType['name']).'.jpg', (int)($imageType['width']), (int)($imageType['height']))) + { + if (!file_exists($dir.$image) || !filesize($dir.$image)) + { $errors = true; + $this->errors[] = sprintf(Tools::displayError('Source file does not exist or is empty (%s)', $dir.$image)); + } + elseif (!ImageManager::resize($dir.$image, $newDir.substr($image, 0, -4).'-'.stripslashes($imageType['name']).'.jpg', (int)$imageType['width'], (int)$imageType['height'])) + $errors = true; + } if (time() - $this->start_time > $this->max_execution_time - 4) // stop 4 seconds before the tiemout, just enough time to process the end of the page on a slow server return 'timeout'; } } else { - $productsImages = Image::getAllImages(); - foreach ($productsImages as $image) + foreach (Image::getAllImages() as $image) { $imageObj = new Image($image['id_image']); - if (file_exists($dir.$imageObj->getExistingImgPath().'.jpg')) + $existing_img = $dir.$imageObj->getExistingImgPath().'.jpg'; + if (file_exists($existing_img) && filesize($existing_img)) { - foreach ($type as $imageType) - { - $existing_img = $dir.$imageObj->getExistingImgPath().'.jpg'; - - if (!file_exists($existing_img)) //test if original file exist - { - $errors = true; - $this->errors[] = Tools::displayError('Can\'t find original image '.$dir.$imageObj->getExistingImgPath().'.jpg'); - } - else - { - if (!file_exists($dir.$imageObj->getExistingImgPath().'-'.stripslashes($imageType['name']).'.jpg')) + foreach ($type as $imageType) + if (!file_exists($dir.$imageObj->getExistingImgPath().'-'.stripslashes($imageType['name']).'.jpg')) + if (!ImageManager::resize($existing_img, $dir.$imageObj->getExistingImgPath().'-'.stripslashes($imageType['name']).'.jpg', (int)($imageType['width']), (int)($imageType['height']))) { - if (!ImageManager::resize($existing_img, $dir.$imageObj->getExistingImgPath().'-'.stripslashes($imageType['name']).'.jpg', (int)($imageType['width']), (int)($imageType['height']))) - { - $errors = true; - $this->errors[] = Tools::displayError(sprintf('Original image is corrupt (%s) or bad permission on folder'), $existing_img); - } - } - } - } + $errors = true; + $this->errors[] = Tools::displayError(sprintf('Original image is corrupt (%s) or bad permission on folder', $existing_img)); + } + } + else + { + $errors = true; + $this->errors[] = Tools::displayError(sprintf('Original image is missing or empty (%s)', $existing_img)); } } } @@ -608,7 +608,10 @@ class AdminImagesControllerCore extends AdminController if ($deleteOldImages) $this->_deleteOldImages($proc['dir'], $formats, ($proc['type'] == 'products' ? true : false)); if (($return = $this->_regenerateNewImages($proc['dir'], $formats, ($proc['type'] == 'products' ? true : false))) === true) - $this->errors[] = sprintf(Tools::displayError('Cannot write %s images. Please check the folder\'s writing permissions %s.'), $proc['type'], $proc['dir']); + { + if (!count($this->errors)) + $this->errors[] = sprintf(Tools::displayError('Cannot write %s images. Please check the folder\'s writing permissions %s.'), $proc['type'], $proc['dir']); + } elseif ($return == 'timeout') $this->errors[] = Tools::displayError('Only part of the images have been regenerated, server timed out before finishing.'); else From 3a5a7cbeb93271fc45f68915612cdeaa542bc06e Mon Sep 17 00:00:00 2001 From: Caleydon Media Date: Thu, 22 Nov 2012 15:23:33 +0100 Subject: [PATCH 029/316] Update modules/blockmyaccountfooter/blockmyaccountfooter.tpl SEO and accessibility improvement - added rel="nofollow" link parameter - added emty title parameter --- .../blockmyaccountfooter.tpl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/blockmyaccountfooter/blockmyaccountfooter.tpl b/modules/blockmyaccountfooter/blockmyaccountfooter.tpl index fb3dee22c..4ed19e077 100644 --- a/modules/blockmyaccountfooter/blockmyaccountfooter.tpl +++ b/modules/blockmyaccountfooter/blockmyaccountfooter.tpl @@ -25,18 +25,18 @@ From 521945706cf0b61541502c444a4f0a73375bd9a8 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Thu, 22 Nov 2012 15:28:00 +0100 Subject: [PATCH 030/316] [-] Installer : name of the supplier page fixed #PSCFV-5571 --- install-dev/data/xml/meta.xml | 4 ++-- install-dev/langs/br/data/meta.xml | 2 +- install-dev/langs/de/data/meta.xml | 2 +- install-dev/langs/en/data/meta.xml | 2 +- install-dev/langs/es/data/meta.xml | 2 +- install-dev/langs/fr/data/meta.xml | 2 +- install-dev/langs/it/data/meta.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/install-dev/data/xml/meta.xml b/install-dev/data/xml/meta.xml index 096493a8b..8c8170bc1 100644 --- a/install-dev/data/xml/meta.xml +++ b/install-dev/data/xml/meta.xml @@ -31,8 +31,8 @@ sitemap - - supply + + supplier address diff --git a/install-dev/langs/br/data/meta.xml b/install-dev/langs/br/data/meta.xml index 43241df49..5b79ab310 100644 --- a/install-dev/langs/br/data/meta.xml +++ b/install-dev/langs/br/data/meta.xml @@ -54,7 +54,7 @@ sitemap sitemap - + Fornecedores Lista de Fornecedores supplier diff --git a/install-dev/langs/de/data/meta.xml b/install-dev/langs/de/data/meta.xml index 59c10b7a5..646d0afa4 100644 --- a/install-dev/langs/de/data/meta.xml +++ b/install-dev/langs/de/data/meta.xml @@ -54,7 +54,7 @@ sitemap sitemap - + Zulieferer Zuliefererliste Zulieferer diff --git a/install-dev/langs/en/data/meta.xml b/install-dev/langs/en/data/meta.xml index 381a4433a..d79f9b68f 100644 --- a/install-dev/langs/en/data/meta.xml +++ b/install-dev/langs/en/data/meta.xml @@ -54,7 +54,7 @@ sitemap sitemap - + Suppliers Suppliers list supplier diff --git a/install-dev/langs/es/data/meta.xml b/install-dev/langs/es/data/meta.xml index bdc283447..c4b690e0d 100644 --- a/install-dev/langs/es/data/meta.xml +++ b/install-dev/langs/es/data/meta.xml @@ -54,7 +54,7 @@ plan, sitio mapa-del-sitio - + Proveedores Lista de Proveedores proveedores diff --git a/install-dev/langs/fr/data/meta.xml b/install-dev/langs/fr/data/meta.xml index c59098fbe..10b28076b 100644 --- a/install-dev/langs/fr/data/meta.xml +++ b/install-dev/langs/fr/data/meta.xml @@ -54,7 +54,7 @@ plan, site plan-du-site - + Fournisseurs Liste de nos fournisseurs fournisseurs diff --git a/install-dev/langs/it/data/meta.xml b/install-dev/langs/it/data/meta.xml index 137e07b20..58ba6ee42 100644 --- a/install-dev/langs/it/data/meta.xml +++ b/install-dev/langs/it/data/meta.xml @@ -54,7 +54,7 @@ sitemap sitemap - + Fornitori Elenco fornitori fornitori From d8c129f11341afccd046981c91a980164f3b1e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 22 Nov 2012 15:35:29 +0100 Subject: [PATCH 031/316] [-] BO: Fix the product indexation only on the default shop #PSCFV-5227 --- admin-dev/searchcron.php | 2 ++ classes/ObjectModel.php | 2 +- classes/shop/Shop.php | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/admin-dev/searchcron.php b/admin-dev/searchcron.php index 022bcf676..ce922f1e3 100644 --- a/admin-dev/searchcron.php +++ b/admin-dev/searchcron.php @@ -24,7 +24,9 @@ * 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/classes/ObjectModel.php b/classes/ObjectModel.php index 16e24d106..4946ae6b8 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -1255,7 +1255,7 @@ abstract class ObjectModelCore } $sql = 'UPDATE '._DB_PREFIX_.$def['table'].' a - '.Shop::addSqlAssociation($def['table'], 'a').' + '.Shop::addSqlAssociation($def['table'], 'a', true, null, true).' SET '.implode(', ', $update_data).' WHERE '.$where; return Db::getInstance()->execute($sql); diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php index e01abf3ee..0f436a028 100644 --- a/classes/shop/Shop.php +++ b/classes/shop/Shop.php @@ -916,7 +916,7 @@ class ShopCore extends ObjectModel * @param string $on * @return string */ - public static function addSqlAssociation($table, $alias, $inner_join = true, $on = null) + public static function addSqlAssociation($table, $alias, $inner_join = true, $on = null, $force_not_default = false) { $table_alias = $table.'_shop'; if (strpos($table, '.') !== false) @@ -929,7 +929,7 @@ class ShopCore extends ObjectModel ON ('.$table_alias.'.id_'.$table.' = '.$alias.'.id_'.$table; if ((int)self::$context_id_shop) $sql .= ' AND '.$table_alias.'.id_shop = '.(int)self::$context_id_shop; - elseif (Shop::checkIdShopDefault($table)) + elseif (Shop::checkIdShopDefault($table) && !$force_not_default) $sql .= ' AND '.$table_alias.'.id_shop = '.$alias.'.id_shop_default'; else $sql .= ' AND '.$table_alias.'.id_shop IN ('.implode(', ', Shop::getContextListShopID()).')'; From f5d57ba6df8a5e0d3f730b2db6e6ccce4897b175 Mon Sep 17 00:00:00 2001 From: Caleydon Media Date: Thu, 22 Nov 2012 15:36:46 +0100 Subject: [PATCH 032/316] Update modules/blockcart/blockcart.tpl SEO and accessibility improvement - added missing link title parameter - added rel="nofollow" into links going to shopping cart --- modules/blockcart/blockcart.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl index 97248c8db..32574a6f1 100644 --- a/modules/blockcart/blockcart.tpl +++ b/modules/blockcart/blockcart.tpl @@ -44,7 +44,7 @@ var delete_txt = '{l s='Delete' mod='blockcart'}';

- {l s='Cart' mod='blockcart'} + {l s='Cart' mod='blockcart'} {if $ajax_allowed}     @@ -98,7 +98,7 @@ var delete_txt = '{l s='Delete' mod='blockcart'}';
    {foreach from=$customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] key='id_customization' item='customization' name='customizations'}
  • - + {$customization.quantity}x{if isset($customization.datas.$CUSTOMIZE_TEXTFIELD.0)} {$customization.datas.$CUSTOMIZE_TEXTFIELD.0.value|escape:html:'UTF-8'|replace:"
    ":" "|truncate:28} {else} @@ -127,7 +127,7 @@ var delete_txt = '{l s='Delete' mod='blockcart'}'; -{if $priceDisplay == 1}{convertPrice price=$discount.value_tax_exc}{else}{convertPrice price=$discount.value_real}{/if} {if strlen($discount.code)} - {l s='Delete' mod='blockcart'} + {l s='Delete' mod='blockcart'} {/if} @@ -168,8 +168,8 @@ var delete_txt = '{l s='Delete' mod='blockcart'}'; {/if} {/if}

    - {if $order_process == 'order'}{l s='Cart' mod='blockcart'}{/if} - {l s='Check out' mod='blockcart'} + {if $order_process == 'order'}{l s='Cart' mod='blockcart'}{/if} + {l s='Check out' mod='blockcart'}

From c374380a925fcb86a67ae0ee102449506b8a8ea4 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Thu, 22 Nov 2012 15:46:33 +0100 Subject: [PATCH 033/316] [-] BO : fixed sorting and filter in BO tabs #PSCFV-5618 --- classes/controller/AdminController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index b2d4a4af2..9ba604af3 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2069,12 +2069,18 @@ class AdminControllerCore extends Controller if ($this->explicitSelect) { foreach ($this->fields_list as $key => $array_value) + { + // Add it only if it is not already in $this->_select + if (isset($this->_select) && preg_match('/'.preg_quote($key, '/').'`?\s*,/', $this->_select)) + continue; + if (isset($array_value['filter_key'])) $this->_listsql .= str_replace('!', '.', $array_value['filter_key']).' as '.$key.','; elseif ($key == 'id_'.$this->table) $this->_listsql .= 'a.`'.bqSQL($key).'`,'; elseif ($key != 'image' && !preg_match('/'.preg_quote($key, '/').'/i', $this->_select)) $this->_listsql .= '`'.bqSQL($key).'`,'; + } $this->_listsql = rtrim($this->_listsql, ','); } else From 6d3a916c7a77147500e35c45714bca477c3fd4e2 Mon Sep 17 00:00:00 2001 From: Caleydon Media Date: Thu, 22 Nov 2012 15:51:59 +0100 Subject: [PATCH 034/316] Update modules/blockuserinfo/blockuserinfo.tpl SEO and accessibility improvement --- modules/blockuserinfo/blockuserinfo.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/blockuserinfo/blockuserinfo.tpl b/modules/blockuserinfo/blockuserinfo.tpl index 47c61dee6..8cc362d66 100644 --- a/modules/blockuserinfo/blockuserinfo.tpl +++ b/modules/blockuserinfo/blockuserinfo.tpl @@ -28,7 +28,7 @@

{l s='Welcome' mod='blockuserinfo'} {if $logged} - - {l s='Log out' mod='blockuserinfo'} + + {l s='Log out' mod='blockuserinfo'} {else} - + {/if}

From 4e160a652376f220890d515305dcdbfb0a42c716 Mon Sep 17 00:00:00 2001 From: Caleydon Media Date: Thu, 22 Nov 2012 16:07:50 +0100 Subject: [PATCH 035/316] Update themes/default/css/cms.css Added ordered list formating on CMS pages --- themes/default/css/cms.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/themes/default/css/cms.css b/themes/default/css/cms.css index e69de29bb..e8ea6af98 100644 --- a/themes/default/css/cms.css +++ b/themes/default/css/cms.css @@ -0,0 +1,6 @@ +/* CMS pages ****************************************************************************** */ +#cms #center_column ul, +#cms #center_column ol, +#cms #center_column dl { margin-left:25px; margin-bottom:20px } + +#cms #center_column li { margin-bottom:5px } \ No newline at end of file From ee374e8172d81d5aba1dda863626a9219af08af2 Mon Sep 17 00:00:00 2001 From: Caleydon Media Date: Thu, 22 Nov 2012 16:45:01 +0100 Subject: [PATCH 036/316] Update themes/default/sitemap.tpl SEO and accessibility improvement - added link title and rel parameters - improving dynamically displayed sitemap links (different list of link for logged/unlogged customer) --- themes/default/sitemap.tpl | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/themes/default/sitemap.tpl b/themes/default/sitemap.tpl index c83cffd26..92962c5ea 100644 --- a/themes/default/sitemap.tpl +++ b/themes/default/sitemap.tpl @@ -31,23 +31,31 @@

{l s='Our offers'}

{l s='Your Account'}


@@ -55,7 +63,7 @@

{l s='Categories'}

- +
    {if isset($categoriesTree.children)} {foreach $categoriesTree.children as $child} @@ -70,7 +78,7 @@

{l s='Pages'}

- +
From 0d141e204c47054798c2c89aa8990780e2294c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 22 Nov 2012 16:46:12 +0100 Subject: [PATCH 037/316] [-] FO: Fix #PSCFV-5052 update the cart rules in the cart when the address is changed --- controllers/front/OrderController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php index f0febc16b..0fe3e89ff 100644 --- a/controllers/front/OrderController.php +++ b/controllers/front/OrderController.php @@ -270,6 +270,10 @@ class OrderControllerCore extends ParentOrderController { $this->context->cart->id_address_delivery = (int)Tools::getValue('id_address_delivery'); $this->context->cart->id_address_invoice = Tools::isSubmit('same') ? $this->context->cart->id_address_delivery : (int)Tools::getValue('id_address_invoice'); + + CartRule::autoRemoveFromCart($this->context); + CartRule::autoAddToCart($this->context); + if (!$this->context->cart->update()) $this->errors[] = Tools::displayError('An error occurred while updating your cart.'); From 3048713f2caefb2e6ddc7e85a51d12505b13e44e Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 22 Nov 2012 16:45:54 +0100 Subject: [PATCH 038/316] //fix from sarah --- css/admin.css | 6 +++--- modules/homefeatured/homefeatured.css | 9 ++++++++- themes/default/css/product_list.css | 9 ++++++++- themes/default/header.tpl | 4 ++-- themes/default/order-detail.tpl | 2 +- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/css/admin.css b/css/admin.css index 2b606208e..2beb6597e 100644 --- a/css/admin.css +++ b/css/admin.css @@ -1294,7 +1294,7 @@ html[xmlns] .clearfix { .table_info h5{ font-size:16px; font-weight:normal; - color:000; + color:#000; margin:0; padding:6px; text-shadow:0 1px 0 #fff; @@ -2202,7 +2202,7 @@ div#scrollTop a:hover{ margin-left:10px; } .metadata-command dl dt, .metadata-command dl dd { - color:#color: #585A69; + color:#585A69; float:left; margin:0; padding-right:10px; @@ -2383,4 +2383,4 @@ margin-bottom:7px; #BoxUseSpecialSyntax ul{ margin-left:30px; list-style-type:disc; -} \ No newline at end of file +} diff --git a/modules/homefeatured/homefeatured.css b/modules/homefeatured/homefeatured.css index d12188cc0..fa8c75598 100644 --- a/modules/homefeatured/homefeatured.css +++ b/modules/homefeatured/homefeatured.css @@ -32,9 +32,16 @@ -webkit-transform: rotate(45deg); -o-transform:rotate(45deg); -ms-transform: rotate(45deg); - background-color: #990000 + background-color: #990000; + transform: rotate(45deg); /* Newer browsers */ + filter: progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476); /* IE6,IE7 */ + -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"; /* IE8 */ } +.ie8 #featured-products_block_center .product_image span.new {top:-17px;} +.ie7 #featured-products_block_center .product_image span.new {top:-30px;right:-25px} +.lt-ie6 #featured-products_block_center .product_image span.new {top:-30px;right:-25px} + #featured-products_block_center .product_desc {height:45px;} #featured-products_block_center .product_desc, #featured-products_block_center .product_desc a { diff --git a/themes/default/css/product_list.css b/themes/default/css/product_list.css index 89fec0943..1beda9686 100644 --- a/themes/default/css/product_list.css +++ b/themes/default/css/product_list.css @@ -58,8 +58,15 @@ ul#product_list { -webkit-transform: rotate(45deg); -o-transform:rotate(45deg); -ms-transform: rotate(45deg); - background-color: #990000 + background-color: #990000; + transform: rotate(45deg); /* Newer browsers */ + filter: progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476); /* IE6,IE7 */ + -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"; /* IE8 */ } + + .ie8 #product_list li span.new{top:-17px;} + .ie7 #product_list li span.new {top:-30px;right:-25px} + .lt-ie6 #featured-products_block_center .product_image span.new {top:-30px;right:-25px} #product_list li h3 { padding:0 0 10px 0; font-size:13px; diff --git a/themes/default/header.tpl b/themes/default/header.tpl index b4bbc3d31..8886c55c9 100644 --- a/themes/default/header.tpl +++ b/themes/default/header.tpl @@ -25,9 +25,9 @@ - + - + {$meta_title|escape:'htmlall':'UTF-8'} diff --git a/themes/default/order-detail.tpl b/themes/default/order-detail.tpl index a729364c0..4b95c736b 100644 --- a/themes/default/order-detail.tpl +++ b/themes/default/order-detail.tpl @@ -39,7 +39,7 @@ {if $invoice AND $invoiceAllowed}

- {l s='Download your invoice as a PDF file'} + {l s='Download your invoice as a PDF file'}

{/if} {if $order->recyclable} From 110965a338e7baf86f65d191a59f8b8a31a31c39 Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Thu, 22 Nov 2012 17:12:58 +0100 Subject: [PATCH 039/316] [-] FO : fixed bug #PSCFV-5779 - order_conf still not fixed propertly --- classes/PaymentModule.php | 823 ++++++++++++++++++++++++++++++++++++++ mails/en/order_conf.html | 12 +- 2 files changed, 833 insertions(+), 2 deletions(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index afd50e8b1..98069f611 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -1,3 +1,4 @@ +<<<<<<< HEAD +* @copyright 2007-2012 PrestaShop SA +* @version Release: $Revision: 6844 $ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +abstract class PaymentModuleCore extends Module +{ + /** @var integer Current order's id */ + public $currentOrder; + public $currencies = true; + public $currencies_mode = 'checkbox'; + + public function install() + { + if (!parent::install()) + return false; + + // Insert currencies availability + if ($this->currencies_mode == 'checkbox') + { + if (!$this->addCheckboxCurrencyRestrictionsForModule()) + return false; + } + elseif ($this->currencies_mode == 'radio') + { + if (!$this->addRadioCurrencyRestrictionsForModule()) + return false; + } + else + Tools::displayError('No currency mode for payment module'); + + // Insert countries availability + $return = $this->addCheckboxCountryRestrictionsForModule(); + + return $return; + } + + public function uninstall() + { + if (!Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_country` WHERE id_module = '.(int)$this->id) + || !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_currency` WHERE id_module = '.(int)$this->id) + || !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_group` WHERE id_module = '.(int)$this->id)) + return false; + return parent::uninstall(); + } + + + /** + * Add checkbox currency restrictions for a new module + * @param integer id_module + * @param array $shops + */ + public function addCheckboxCurrencyRestrictionsForModule(array $shops = array()) + { + if (!$shops) + $shops = Shop::getShops(true, null, true); + + foreach ($shops as $s) + { + if (!Db::getInstance()->execute(' + INSERT INTO `'._DB_PREFIX_.'module_currency` (`id_module`, `id_shop`, `id_currency`) + SELECT '.(int)$this->id.', "'.(int)$s.'", `id_currency` FROM `'._DB_PREFIX_.'currency` WHERE deleted = 0')) + return false; + } + return true; + } + + /** + * Add radio currency restrictions for a new module + * @param integer id_module + * @param array $shops + */ + public function addRadioCurrencyRestrictionsForModule(array $shops = array()) + { + if (!$shops) + $shops = Shop::getShops(true, null, true); + + foreach ($shops as $s) + if (!Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'module_currency` (`id_module`, `id_shop`, `id_currency`) + VALUES ('.(int)$this->id.', "'.(int)$s.'", -2)')) + return false; + return true; + } + + /** + * Add checkbox country restrictions for a new module + * @param integer id_module + * @param array $shops + */ + public function addCheckboxCountryRestrictionsForModule(array $shops = array()) + { + $countries = Country::getCountries((int)Context::getContext()->language->id, true); //get only active country + $country_ids = array(); + foreach ($countries as $country) + $country_ids[] = $country['id_country']; + return Country::addModuleRestrictions($shops, $countries, array(array('id_module' => (int)$this->id))); + } + + /** + * Validate an order in database + * Function called from a payment module + * + * @param integer $id_cart Value + * @param integer $id_order_state Value + * @param float $amount_paid Amount really paid by customer (in the default currency) + * @param string $payment_method Payment method (eg. 'Credit card') + * @param string $message Message to attach to order + */ + public function validateOrder($id_cart, $id_order_state, $amount_paid, $payment_method = 'Unknown', + $message = null, $extra_vars = array(), $currency_special = null, $dont_touch_amount = false, + $secure_key = false, Shop $shop = null) + { + $this->context->cart = new Cart($id_cart); + $this->context->customer = new Customer($this->context->cart->id_customer); + $this->context->language = new Language($this->context->cart->id_lang); + $this->context->shop = ($shop ? $shop : new Shop($this->context->cart->id_shop)); + $id_currency = $currency_special ? (int)$currency_special : (int)$this->context->cart->id_currency; + $this->context->currency = new Currency($id_currency, null, $this->context->shop->id); + if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_delivery') + $context_country = $this->context->country; + + $order_status = new OrderState((int)$id_order_state, (int)$this->context->language->id); + if (!Validate::isLoadedObject($order_status)) + throw new PrestaShopException('Can\'t load Order state status'); + + if (!$this->active) + die(Tools::displayError()); + // Does order already exists ? + if (Validate::isLoadedObject($this->context->cart) && $this->context->cart->OrderExists() == false) + { + if ($secure_key !== false && $secure_key != $this->context->cart->secure_key) + die(Tools::displayError()); + + // For each package, generate an order + $delivery_option_list = $this->context->cart->getDeliveryOptionList(); + $package_list = $this->context->cart->getPackageList(); + $cart_delivery_option = $this->context->cart->getDeliveryOption(); + + // If some delivery options are not defined, or not valid, use the first valid option + foreach ($delivery_option_list as $id_address => $package) + if (!isset($cart_delivery_option[$id_address]) || !array_key_exists($cart_delivery_option[$id_address], $package)) + foreach ($package as $key => $val) + { + $cart_delivery_option[$id_address] = $key; + break; + } + + $order_list = array(); + $order_detail_list = array(); + $reference = Order::generateReference(); + $this->currentOrderReference = $reference; + + $order_creation_failed = false; + $cart_total_paid = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH), 2); + + if ($this->context->cart->orderExists()) + { + $error = Tools::displayError('An order has already been placed using this cart.'); + Logger::addLog($error, 4, '0000001', 'Cart', intval($this->context->cart->id)); + die($error); + } + + foreach ($cart_delivery_option as $id_address => $key_carriers) + foreach ($delivery_option_list[$id_address][$key_carriers]['carrier_list'] as $id_carrier => $data) + foreach ($data['package_list'] as $id_package) + { + // Rewrite the id_warehouse + $package_list[$id_address][$id_package]['id_warehouse'] = $this->context->cart->getPackageIdWarehouse($package_list[$id_address][$id_package], (int)$id_carrier); + $package_list[$id_address][$id_package]['id_carrier'] = $id_carrier; + } + // Make sure CarRule caches are empty + CartRule::cleanCache(); + + foreach ($package_list as $id_address => $packageByAddress) + foreach ($packageByAddress as $id_package => $package) + { + $order = new Order(); + $order->product_list = $package['product_list']; + + if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_delivery') + { + $address = new Address($id_address); + $this->context->country = new Country($address->id_country, $this->context->cart->id_lang); + } + + $carrier = null; + if (!$this->context->cart->isVirtualCart() && isset($package['id_carrier'])) + { + $carrier = new Carrier($package['id_carrier'], $this->context->cart->id_lang); + $order->id_carrier = (int)$carrier->id; + $id_carrier = (int)$carrier->id; + } + else + { + $order->id_carrier = 0; + $id_carrier = 0; + } + + $order->id_customer = (int)$this->context->cart->id_customer; + $order->id_address_invoice = (int)$this->context->cart->id_address_invoice; + $order->id_address_delivery = (int)$id_address; + $order->id_currency = $this->context->currency->id; + $order->id_lang = (int)$this->context->cart->id_lang; + $order->id_cart = (int)$this->context->cart->id; + $order->reference = $reference; + $order->id_shop = (int)$this->context->shop->id; + $order->id_shop_group = (int)$this->context->shop->id_shop_group; + + $order->secure_key = ($secure_key ? pSQL($secure_key) : pSQL($this->context->customer->secure_key)); + $order->payment = $payment_method; + if (isset($this->name)) + $order->module = $this->name; + $order->recyclable = $this->context->cart->recyclable; + $order->gift = (int)$this->context->cart->gift; + $order->gift_message = $this->context->cart->gift_message; + $order->conversion_rate = $this->context->currency->conversion_rate; + $amount_paid = !$dont_touch_amount ? Tools::ps_round((float)$amount_paid, 2) : $amount_paid; + $order->total_paid_real = 0; + + $order->total_products = (float)$this->context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS, $order->product_list, $id_carrier); + $order->total_products_wt = (float)$this->context->cart->getOrderTotal(true, Cart::ONLY_PRODUCTS, $order->product_list, $id_carrier); + + $order->total_discounts_tax_excl = (float)abs($this->context->cart->getOrderTotal(false, Cart::ONLY_DISCOUNTS, $order->product_list, $id_carrier)); + $order->total_discounts_tax_incl = (float)abs($this->context->cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS, $order->product_list, $id_carrier)); + $order->total_discounts = $order->total_discounts_tax_incl; + + $order->total_shipping_tax_excl = (float)$this->context->cart->getPackageShippingCost((int)$id_carrier, false, null, $order->product_list); + $order->total_shipping_tax_incl = (float)$this->context->cart->getPackageShippingCost((int)$id_carrier, true, null, $order->product_list); + $order->total_shipping = $order->total_shipping_tax_incl; + + if (!is_null($carrier) && Validate::isLoadedObject($carrier)) + $order->carrier_tax_rate = $carrier->getTaxesRate(new Address($this->context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')})); + + $order->total_wrapping_tax_excl = (float)abs($this->context->cart->getOrderTotal(false, Cart::ONLY_WRAPPING, $order->product_list, $id_carrier)); + $order->total_wrapping_tax_incl = (float)abs($this->context->cart->getOrderTotal(true, Cart::ONLY_WRAPPING, $order->product_list, $id_carrier)); + $order->total_wrapping = $order->total_wrapping_tax_incl; + + $order->total_paid_tax_excl = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(false, Cart::BOTH, $order->product_list, $id_carrier), 2); + $order->total_paid_tax_incl = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH, $order->product_list, $id_carrier), 2); + $order->total_paid = $order->total_paid_tax_incl; + + $order->invoice_date = '0000-00-00 00:00:00'; + $order->delivery_date = '0000-00-00 00:00:00'; + + // Creating order + $result = $order->add(); + + if (!$result) + throw new PrestaShopException('Can\'t save Order'); + + // Amount paid by customer is not the right one -> Status = payment error + // We don't use the following condition to avoid the float precision issues : http://www.php.net/manual/en/language.types.float.php + // if ($order->total_paid != $order->total_paid_real) + // We use number_format in order to compare two string + if ($order_status->logable && number_format($cart_total_paid, 2) != number_format($amount_paid, 2)) + $id_order_state = Configuration::get('PS_OS_ERROR'); + + $order_list[] = $order; + + // Insert new Order detail list using cart for the current order + $order_detail = new OrderDetail(null, null, $this->context); + $order_detail->createList($order, $this->context->cart, $id_order_state, $order->product_list, 0, true, $package_list[$id_address][$id_package]['id_warehouse']); + $order_detail_list[] = $order_detail; + + // Adding an entry in order_carrier table + if (!is_null($carrier)) + { + $order_carrier = new OrderCarrier(); + $order_carrier->id_order = (int)$order->id; + $order_carrier->id_carrier = (int)$id_carrier; + $order_carrier->weight = (float)$order->getTotalWeight(); + $order_carrier->shipping_cost_tax_excl = (float)$order->total_shipping_tax_excl; + $order_carrier->shipping_cost_tax_incl = (float)$order->total_shipping_tax_incl; + $order_carrier->add(); + } + } + + // The country can only change if the address used for the calculation is the delivery address, and if multi-shipping is activated + if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_delivery') + $this->context->country = $context_country; + + // Register Payment only if the order status validate the order + if ($order_status->logable) + { + // $order is the last order loop in the foreach + // The method addOrderPayment of the class Order make a create a paymentOrder + // linked to the order reference and not to the order id + if (isset($extra_vars['transaction_id'])) + $transaction_id = $extra_vars['transaction_id']; + else + $transaction_id = null; + + if (!$order->addOrderPayment($amount_paid, null, $transaction_id)) + throw new PrestaShopException('Can\'t save Order Payment'); + } + + // Next ! + $only_one_gift = false; + $cart_rule_used = array(); + $products = $this->context->cart->getProducts(); + $cart_rules = $this->context->cart->getCartRules(); + + // Make sure CarRule caches are empty + CartRule::cleanCache(); + + foreach ($order_detail_list as $key => $order_detail) + { + $order = $order_list[$key]; + if (!$order_creation_failed & isset($order->id)) + { + if (!$secure_key) + $message .= '
'.Tools::displayError('Warning: the secure key is empty, check your payment account before validation'); + // Optional message to attach to this order + if (isset($message) & !empty($message)) + { + $msg = new Message(); + $message = strip_tags($message, '
'); + if (Validate::isCleanHtml($message)) + { + $msg->message = $message; + $msg->id_order = intval($order->id); + $msg->private = 1; + $msg->add(); + } + } + + // Insert new Order detail list using cart for the current order + //$orderDetail = new OrderDetail(null, null, $this->context); + //$orderDetail->createList($order, $this->context->cart, $id_order_state); + + // Construct order detail table for the email + $products_list = ''; + $virtual_product = true; + foreach ($products as $key => $product) + { + $price = Product::getPriceStatic((int)$product['id_product'], false, ($product['id_product_attribute'] ? (int)$product['id_product_attribute'] : null), 6, null, false, true, $product['cart_quantity'], false, (int)$order->id_customer, (int)$order->id_cart, (int)$order->{Configuration::get('PS_TAX_ADDRESS_TYPE')}); + $price_wt = Product::getPriceStatic((int)$product['id_product'], true, ($product['id_product_attribute'] ? (int)$product['id_product_attribute'] : null), 2, null, false, true, $product['cart_quantity'], false, (int)$order->id_customer, (int)$order->id_cart, (int)$order->{Configuration::get('PS_TAX_ADDRESS_TYPE')}); + + $customization_quantity = 0; + if (isset($customized_datas[$product['id_product']][$product['id_product_attribute']])) + { + $customization_text = ''; + foreach ($customized_datas[$product['id_product']][$product['id_product_attribute']] as $customization) + { + if (isset($customization['datas'][Product::CUSTOMIZE_TEXTFIELD])) + foreach ($customization['datas'][Product::CUSTOMIZE_TEXTFIELD] as $text) + $customization_text .= $text['name'].': '.$text['value'].'
'; + + if (isset($customization['datas'][Product::CUSTOMIZE_FILE])) + $customization_text .= sprintf(Tools::displayError('%d image(s)'), count($customization['datas'][Product::CUSTOMIZE_FILE])).'
'; + + $customization_text .= '---
'; + } + + $customization_text = rtrim($customization_text, '---
'); + + $customization_quantity = (int)$product['customizationQuantityTotal']; + $products_list .= + ' + '.$product['reference'].' + '.$product['name'].(isset($product['attributes']) ? ' - '.$product['attributes'] : '').' - '.Tools::displayError('Customized').(!empty($customization_text) ? ' - '.$customization_text : '').' + '.Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt, $this->context->currency, false).' + '.$customization_quantity.' + '.Tools::displayPrice($customization_quantity * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt), $this->context->currency, false).' + '; + } + + if (!$customization_quantity || (int)$product['cart_quantity'] > $customization_quantity) + $products_list .= + ' + '.$product['reference'].' + '.$product['name'].(isset($product['attributes']) ? ' - '.$product['attributes'] : '').' + '.Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt, $this->context->currency, false).' + '.((int)$product['cart_quantity'] - $customization_quantity).' + '.Tools::displayPrice(((int)$product['cart_quantity'] - $customization_quantity) * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt), $this->context->currency, false).' + '; + + // Check if is not a virutal product for the displaying of shipping + if (!$product['is_virtual']) + $virtual_product &= false; + + } // end foreach ($products) + + $cart_rules_list = ''; + foreach ($cart_rules as $cart_rule) + { + $package = array('id_carrier' => $order->id_carrier, 'id_address' => $order->id_address_delivery, 'products' => $order->product_list); + $values = array( + 'tax_incl' => $cart_rule['obj']->getContextualValue(true, $this->context, CartRule::FILTER_ACTION_ALL, $package), + 'tax_excl' => $cart_rule['obj']->getContextualValue(false, $this->context, CartRule::FILTER_ACTION_ALL, $package) + ); + + // If the reduction is not applicable to this order, then continue with the next one + if (!$values['tax_excl']) + continue; + + $order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $values); + + /* IF + ** - This is not multi-shipping + ** - The value of the voucher is greater than the total of the order + ** - Partial use is allowed + ** - This is an "amount" reduction, not a reduction in % or a gift + ** THEN + ** The voucher is cloned with a new value corresponding to the remainder + */ + if (count($order_list) == 1 && $values['tax_incl'] > $order->total_products_wt && $cart_rule['obj']->partial_use == 1 && $cart_rule['obj']->reduction_amount > 0) + { + // Create a new voucher from the original + $voucher = new CartRule($cart_rule['obj']->id); // We need to instantiate the CartRule without lang parameter to allow saving it + unset($voucher->id); + + // Set a new voucher code + $voucher->code = empty($voucher->code) ? substr(md5($order->id.'-'.$order->id_customer.'-'.$cart_rule['obj']->id), 0, 16) : $voucher->code.'-2'; + if (preg_match('/\-([0-9]{1,2})\-([0-9]{1,2})$/', $voucher->code, $matches) && $matches[1] == $matches[2]) + $voucher->code = preg_replace('/'.$matches[0].'$/', '-'.(intval($matches[1]) + 1), $voucher->code); + + // Set the new voucher value + if ($voucher->reduction_tax) + $voucher->reduction_amount = $values['tax_incl'] - $order->total_products_wt; + else + $voucher->reduction_amount = $values['tax_excl'] - $order->total_products; + + $voucher->id_customer = $order->id_customer; + $voucher->quantity = 1; + if ($voucher->add()) + { + // If the voucher has conditions, they are now copied to the new voucher + CartRule::copyConditions($cart_rule['obj']->id, $voucher->id); + + $params = array( + '{voucher_amount}' => Tools::displayPrice($voucher->reduction_amount, $this->context->currency, false), + '{voucher_num}' => $voucher->code, + '{firstname}' => $this->context->customer->firstname, + '{lastname}' => $this->context->customer->lastname, + '{id_order}' => $order->reference, + '{order_name}' => $order->getUniqReference() + ); + Mail::Send( + (int)$order->id_lang, + 'voucher', + sprintf(Mail::l('New voucher regarding your order %s', (int)$order->id_lang), $order->reference), + $params, + $this->context->customer->email, + $this->context->customer->firstname.' '.$this->context->customer->lastname, + null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop + ); + } + } + + if ($id_order_state != Configuration::get('PS_OS_ERROR') && $id_order_state != Configuration::get('PS_OS_CANCELED') && !in_array($cart_rule['obj']->id, $cart_rule_used)) + { + $cart_rule_used[] = $cart_rule['obj']->id; + + // Create a new instance of Cart Rule without id_lang, in order to update its quantity + $cart_rule_to_update = new CartRule($cart_rule['obj']->id); + $cart_rule_to_update->quantity = max(0, $cart_rule_to_update->quantity - 1); + $cart_rule_to_update->update(); + } + + $cart_rules_list .= ' + + '.Tools::displayError('Voucher name:').' '.$cart_rule['obj']->name.' + '.($values['tax_incl'] != 0.00 ? '-' : '').Tools::displayPrice($values['tax_incl'], $this->context->currency, false).' + '; + } + + // Specify order id for message + $old_message = Message::getMessageByCartId((int)$this->context->cart->id); + if ($old_message) + { + $update_message = new Message((int)$old_message['id_message']); + $update_message->id_order = (int)$order->id; + $update_message->update(); + + // Add this message in the customer thread + $customer_thread = new CustomerThread(); + $customer_thread->id_contact = 0; + $customer_thread->id_customer = (int)$order->id_customer; + $customer_thread->id_shop = (int)$this->context->shop->id; + $customer_thread->id_order = (int)$order->id; + $customer_thread->id_lang = (int)$this->context->language->id; + $customer_thread->email = $this->context->customer->email; + $customer_thread->status = 'open'; + $customer_thread->token = Tools::passwdGen(12); + $customer_thread->add(); + + $customer_message = new CustomerMessage(); + $customer_message->id_customer_thread = $customer_thread->id; + $customer_message->id_employee = 0; + $customer_message->message = htmlentities($update_message->message, ENT_COMPAT, 'UTF-8'); + $customer_message->private = 0; + + if (!$customer_message->add()) + $this->errors[] = Tools::displayError('An error occurred while saving message'); + } + + // Hook validate order + Hook::exec('actionValidateOrder', array( + 'cart' => $this->context->cart, + 'order' => $order, + 'customer' => $this->context->customer, + 'currency' => $this->context->currency, + 'orderStatus' => $order_status + )); + + foreach ($this->context->cart->getProducts() as $product) + if ($order_status->logable) + ProductSale::addProductSale((int)$product['id_product'], (int)$product['cart_quantity']); + + if (Configuration::get('PS_STOCK_MANAGEMENT') && $order_detail->getStockState()) + { + $history = new OrderHistory(); + $history->id_order = (int)$order->id; + $history->changeIdOrderState(Configuration::get('PS_OS_OUTOFSTOCK'), $order); + $history->addWithemail(); + } + + // Set order state in order history ONLY even if the "out of stock" status has not been yet reached + // So you migth have two order states + $new_history = new OrderHistory(); + $new_history->id_order = (int)$order->id; + $new_history->changeIdOrderState((int)$id_order_state, $order, true); + $new_history->addWithemail(true, $extra_vars); + + unset($order_detail); + + // Order is reloaded because the status just changed + $order = new Order($order->id); + + // Send an e-mail to customer (one order = one email) + if ($id_order_state != Configuration::get('PS_OS_ERROR') && $id_order_state != Configuration::get('PS_OS_CANCELED') && $this->context->customer->id) + { + $invoice = new Address($order->id_address_invoice); + $delivery = new Address($order->id_address_delivery); + $delivery_state = $delivery->id_state ? new State($delivery->id_state) : false; + $invoice_state = $invoice->id_state ? new State($invoice->id_state) : false; + + $data = array( + '{firstname}' => $this->context->customer->firstname, + '{lastname}' => $this->context->customer->lastname, + '{email}' => $this->context->customer->email, + '{delivery_block_txt}' => $this->_getFormatedAddress($delivery, "\n"), + '{invoice_block_txt}' => $this->_getFormatedAddress($invoice, "\n"), + '{delivery_block_html}' => $this->_getFormatedAddress($delivery, '
', array( + 'firstname' => '%s', + 'lastname' => '%s' + )), + '{invoice_block_html}' => $this->_getFormatedAddress($invoice, '
', array( + 'firstname' => '%s', + 'lastname' => '%s' + )), + '{delivery_company}' => $delivery->company, + '{delivery_firstname}' => $delivery->firstname, + '{delivery_lastname}' => $delivery->lastname, + '{delivery_address1}' => $delivery->address1, + '{delivery_address2}' => $delivery->address2, + '{delivery_city}' => $delivery->city, + '{delivery_postal_code}' => $delivery->postcode, + '{delivery_country}' => $delivery->country, + '{delivery_state}' => $delivery->id_state ? $delivery_state->name : '', + '{delivery_phone}' => ($delivery->phone) ? $delivery->phone : $delivery->phone_mobile, + '{delivery_other}' => $delivery->other, + '{invoice_company}' => $invoice->company, + '{invoice_vat_number}' => $invoice->vat_number, + '{invoice_firstname}' => $invoice->firstname, + '{invoice_lastname}' => $invoice->lastname, + '{invoice_address2}' => $invoice->address2, + '{invoice_address1}' => $invoice->address1, + '{invoice_city}' => $invoice->city, + '{invoice_postal_code}' => $invoice->postcode, + '{invoice_country}' => $invoice->country, + '{invoice_state}' => $invoice->id_state ? $invoice_state->name : '', + '{invoice_phone}' => ($invoice->phone) ? $invoice->phone : $invoice->phone_mobile, + '{invoice_other}' => $invoice->other, + '{order_name}' => $order->getUniqReference(), + '{date}' => Tools::displayDate(date('Y-m-d H:i:s'), (int)$order->id_lang, 1), + '{carrier}' => $virtual_product ? Tools::displayError('No carrier') : $carrier->name, + '{payment}' => Tools::substr($order->payment, 0, 32), + '{products}' => $this->formatProductAndVoucherForEmail($products_list), + '{discounts}' => $this->formatProductAndVoucherForEmail($cart_rules_list), + '{total_paid}' => Tools::displayPrice($order->total_paid, $this->context->currency, false), + '{total_products}' => Tools::displayPrice($order->total_paid - $order->total_shipping - $order->total_wrapping + $order->total_discounts, $this->context->currency, false), + '{total_discounts}' => Tools::displayPrice($order->total_discounts, $this->context->currency, false), + '{total_shipping}' => Tools::displayPrice($order->total_shipping, $this->context->currency, false), + '{total_wrapping}' => Tools::displayPrice($order->total_wrapping, $this->context->currency, false)); + + if (is_array($extra_vars)) + $data = array_merge($data, $extra_vars); + + // Join PDF invoice + if ((int)Configuration::get('PS_INVOICE') && $order_status->invoice && $order->invoice_number) + { + $pdf = new PDF($order->getInvoicesCollection(), PDF::TEMPLATE_INVOICE, $this->context->smarty); + $file_attachement['content'] = $pdf->render(false); + $file_attachement['name'] = Configuration::get('PS_INVOICE_PREFIX', (int)$order->id_lang).sprintf('%06d', $order->invoice_number).'.pdf'; + $file_attachement['mime'] = 'application/pdf'; + } + else + $file_attachement = null; + + if (Validate::isEmail($this->context->customer->email)) + Mail::Send( + (int)$order->id_lang, + 'order_conf', + Mail::l('Order confirmation', (int)$order->id_lang), + $data, + $this->context->customer->email, + $this->context->customer->firstname.' '.$this->context->customer->lastname, + null, + null, + $file_attachement, + null, _PS_MAIL_DIR_, false, (int)$order->id_shop + ); + } + + // updates stock in shops + if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) + { + $product_list = $order->getProducts(); + foreach ($product_list as $product) + { + // if the available quantities depends on the physical stock + if (StockAvailable::dependsOnStock($product['product_id'])) + { + // synchronizes + StockAvailable::synchronize($product['product_id'], $order->id_shop); + } + } + } + } + else + { + $error = Tools::displayError('Order creation failed'); + Logger::addLog($error, 4, '0000002', 'Cart', intval($order->id_cart)); + die($error); + } + } // End foreach $order_detail_list + // Use the last order as currentOrder + $this->currentOrder = (int)$order->id; + return true; + } + else + { + $error = Tools::displayError('Cart cannot be loaded or an order has already been placed using this cart'); + Logger::addLog($error, 4, '0000001', 'Cart', intval($this->context->cart->id)); + die($error); + } + } + + public function formatProductAndVoucherForEmail($content) + { + return ' + + + + + + + '.$content.'
'; + } + + /** + * @param Object Address $the_address that needs to be txt formated + * @return String the txt formated address block + */ + protected function _getTxtFormatedAddress($the_address) + { + $adr_fields = AddressFormat::getOrderedAddressFields($the_address->id_country, false, true); + $r_values = array(); + foreach ($adr_fields as $fields_line) + { + $tmp_values = array(); + foreach (explode(' ', $fields_line) as $field_item) + { + $field_item = trim($field_item); + $tmp_values[] = $the_address->{$field_item}; + } + $r_values[] = implode(' ', $tmp_values); + } + + $out = implode("\n", $r_values); + return $out; + } + + /** + * @param Object Address $the_address that needs to be txt formated + * @return String the txt formated address block + */ + + protected function _getFormatedAddress(Address $the_address, $line_sep, $fields_style = array()) + { + return AddressFormat::generateAddress($the_address, array('avoid' => array()), $line_sep, ' ', $fields_style); + } + + /** + * @param int $id_currency : this parameter is optionnal but on 1.5 version of Prestashop, it will be REQUIRED + * @return Currency + */ + public function getCurrency($current_id_currency = null) + { + if (!(int)$current_id_currency) + $current_id_currency = Context::getContext()->currency->id; + + if (!$this->currencies) + return false; + if ($this->currencies_mode == 'checkbox') + { + $currencies = Currency::getPaymentCurrencies($this->id); + return $currencies; + } + elseif ($this->currencies_mode == 'radio') + { + $currencies = Currency::getPaymentCurrenciesSpecial($this->id); + $currency = $currencies['id_currency']; + if ($currency == -1) + $id_currency = (int)$current_id_currency; + elseif ($currency == -2) + $id_currency = (int)Configuration::get('PS_CURRENCY_DEFAULT'); + else + $id_currency = $currency; + } + if (!isset($id_currency) || empty($id_currency)) + return false; + return (new Currency($id_currency)); + } + + /** + * Allows specified payment modules to be used by a specific currency + * + * @since 1.4.5 + * @param int $id_currency + * @param array $id_module_list + * @return boolean + */ + public static function addCurrencyPermissions($id_currency, array $id_module_list = array()) + { + $values = ''; + if (count($id_module_list) == 0) + { + // fetch all installed module ids + $modules = PaymentModuleCore::getInstalledPaymentModules(); + foreach ($modules as $module) + $id_module_list[] = $module['id_module']; + } + + foreach ($id_module_list as $id_module) + $values .= '('.(int)$id_module.','.(int)$id_currency.'),'; + + if (!empty($values)) + { + return Db::getInstance()->execute(' + INSERT INTO `'._DB_PREFIX_.'module_currency` (`id_module`, `id_currency`) + VALUES '.rtrim($values, ',') + ); + } + + return true; + } + + /** + * List all installed and active payment modules + * @see Module::getPaymentModules() if you need a list of module related to the user context + * + * @since 1.4.5 + * @return array module informations + */ + public static function getInstalledPaymentModules() + { + $hook_payment = 'Payment'; + if (Db::getInstance()->getValue('SELECT `id_hook` FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'displayPayment\'')) + $hook_payment = 'displayPayment'; + + return Db::getInstance()->executeS(' + SELECT DISTINCT m.`id_module`, h.`id_hook`, m.`name`, hm.`position` + FROM `'._DB_PREFIX_.'module` m + LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module` + LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook` + WHERE h.`name` = \''.pSQL($hook_payment).'\' + AND m.`active` = 1 + '); + } + + + public static function preCall($module_name) + { + if (!parent::preCall($module_name)) + return false; + + if (($module_instance = Module::getInstanceByName($module_name))) + if (!$module_instance->currencies || ($module_instance->currencies && count(Currency::checkPaymentCurrencies($module_instance->id)))) + return true; + + return false; + } + +} + +>>>>>>> [-] FO: fixed bug #PSCFV-5779 - order_conf still not fixed propertly diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html index 062ba36ac..b633150ed 100644 --- a/mails/en/order_conf.html +++ b/mails/en/order_conf.html @@ -35,9 +35,17 @@ - + + + + + + + - + From 867c9a5135882c9488c677f99a766f1d37b3761c Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Thu, 22 Nov 2012 17:40:56 +0100 Subject: [PATCH 040/316] [*] BO : the global search now looks into the modules --- .../controllers/search/helpers/view/view.tpl | 20 ++++++++++++-- admin-dev/themes/default/template/header.tpl | 1 + controllers/admin/AdminSearchController.php | 27 +++++++++++++++++++ 3 files changed, 46 insertions(+), 2 deletions(-) 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 31c1f0935..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 @@ -40,7 +40,7 @@ $(function() { {else}

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

ReferenceProductUnit priceQuantityTotal price
ReferenceProductUnit priceQuantityTotal price
{products} +{products} +
{discounts}
- {foreach $features key=key item=feature } + {foreach $features key=key item=feature} {foreach $feature key=k item=val name=feature_list} @@ -54,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/header.tpl b/admin-dev/themes/default/template/header.tpl index 8f9a8c34d..a4bd6b25d 100644 --- a/admin-dev/themes/default/template/header.tpl +++ b/admin-dev/themes/default/template/header.tpl @@ -168,6 +168,7 @@ + diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php index bdaa0afed..dc3a1b2a0 100644 --- a/controllers/admin/AdminSearchController.php +++ b/controllers/admin/AdminSearchController.php @@ -132,6 +132,17 @@ class AdminSearchControllerCore extends AdminController } /* IP */ // 6 - but it is included in the customer block + + /* Module search */ + if (!$searchType || $searchType == 7) + { + /* Handle module name */ + if ($searchType == 7 && Validate::isModuleName($this->query) AND ($module = Module::getInstanceByName($this->query)) && Validate::isLoadedObject($module)) + Tools::redirectAdmin('index.php?tab=AdminModules&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name).'&token='.Tools::getAdminTokenLite('AdminModules')); + + /* Normal catalog search */ + $this->searchModule(); + } } $this->display = 'view'; } @@ -168,6 +179,18 @@ class AdminSearchControllerCore extends AdminController { $this->_list['customers'] = Customer::searchByName($this->query); } + + public function searchModule() + { + $this->_list['modules'] = array(); + $all_modules = Module::getModulesOnDisk(true, true, Context::getContext()->employee->id); + foreach ($all_modules as $module) + if (stripos($module->name, $this->query) || stripos($module->displayName, $this->query) || stripos($module->description, $this->query)) + { + $module->linkto = 'index.php?tab=AdminModules&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name).'&token='.Tools::getAdminTokenLite('AdminModules'); + $this->_list['modules'][] = $module; + } + } /** * Search a feature in all store @@ -360,6 +383,10 @@ class AdminSearchControllerCore extends AdminController $view = $helper->generateList($this->_list['orders'], $this->fields_list['orders']); $this->tpl_view_vars['orders'] = $view; } + + if (isset($this->_list['modules'])) + $this->tpl_view_vars['modules'] = $this->_list['modules']; + return parent::renderView(); } } From 8c39de52bbc7c9f9b4418c19f7493f14f6cc2153 Mon Sep 17 00:00:00 2001 From: Caleydon Media Date: Thu, 22 Nov 2012 17:42:39 +0100 Subject: [PATCH 041/316] Update themes/default/password.tpl - fix for properly displaying breadcrumb on password recovery page (Home > My Account > Forgot your password). Breadcrumb now displaying real user location. - SEO improvement (added link rel="nofollow" parameters) - just suggestion: rename customer entry page from "My Account" to "Authentication". "My Account" is good name for customer page where he can manage his account, not for multi-function entry page. --- themes/default/password.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/default/password.tpl b/themes/default/password.tpl index dc83a2d76..abaf65d1e 100644 --- a/themes/default/password.tpl +++ b/themes/default/password.tpl @@ -23,7 +23,7 @@ * International Registered Trademark & Property of PrestaShop SA *} -{capture name=path}{l s='Forgot your password?'}{/capture} +{capture name=path}{l s='Authentication'}{$navigationPipe}{l s='Forgot your password'}{/capture} {include file="$tpl_dir./breadcrumb.tpl"}

{l s='Forgot your password?'}

@@ -49,5 +49,5 @@ {/if}

- {l s='Return to Login'}{l s='Back to Login'} + {l s='Return to Login'}{l s='Back to Login'}

From c11b283fca6ace281f7baf52257424fb90c2c33a Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 22 Nov 2012 17:52:10 +0100 Subject: [PATCH 042/316] //fix sarah bug :p --- classes/PaymentModule.php | 1639 ++++++++++++++++++------------------- 1 file changed, 817 insertions(+), 822 deletions(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 98069f611..71226f0bc 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -1,4 +1,3 @@ -<<<<<<< HEAD -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -abstract class PaymentModuleCore extends Module -{ - /** @var integer Current order's id */ - public $currentOrder; - public $currencies = true; - public $currencies_mode = 'checkbox'; - - public function install() - { - if (!parent::install()) - return false; - - // Insert currencies availability - if ($this->currencies_mode == 'checkbox') - { - if (!$this->addCheckboxCurrencyRestrictionsForModule()) - return false; - } - elseif ($this->currencies_mode == 'radio') - { - if (!$this->addRadioCurrencyRestrictionsForModule()) - return false; - } - else - Tools::displayError('No currency mode for payment module'); - - // Insert countries availability - $return = $this->addCheckboxCountryRestrictionsForModule(); - - return $return; - } - - public function uninstall() - { - if (!Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_country` WHERE id_module = '.(int)$this->id) - || !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_currency` WHERE id_module = '.(int)$this->id) - || !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_group` WHERE id_module = '.(int)$this->id)) - return false; - return parent::uninstall(); - } - - - /** - * Add checkbox currency restrictions for a new module - * @param integer id_module - * @param array $shops - */ - public function addCheckboxCurrencyRestrictionsForModule(array $shops = array()) - { - if (!$shops) - $shops = Shop::getShops(true, null, true); - - foreach ($shops as $s) - { - if (!Db::getInstance()->execute(' - INSERT INTO `'._DB_PREFIX_.'module_currency` (`id_module`, `id_shop`, `id_currency`) - SELECT '.(int)$this->id.', "'.(int)$s.'", `id_currency` FROM `'._DB_PREFIX_.'currency` WHERE deleted = 0')) - return false; - } - return true; - } - - /** - * Add radio currency restrictions for a new module - * @param integer id_module - * @param array $shops - */ - public function addRadioCurrencyRestrictionsForModule(array $shops = array()) - { - if (!$shops) - $shops = Shop::getShops(true, null, true); - - foreach ($shops as $s) - if (!Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'module_currency` (`id_module`, `id_shop`, `id_currency`) - VALUES ('.(int)$this->id.', "'.(int)$s.'", -2)')) - return false; - return true; - } - - /** - * Add checkbox country restrictions for a new module - * @param integer id_module - * @param array $shops - */ - public function addCheckboxCountryRestrictionsForModule(array $shops = array()) - { - $countries = Country::getCountries((int)Context::getContext()->language->id, true); //get only active country - $country_ids = array(); - foreach ($countries as $country) - $country_ids[] = $country['id_country']; - return Country::addModuleRestrictions($shops, $countries, array(array('id_module' => (int)$this->id))); - } - - /** - * Validate an order in database - * Function called from a payment module - * - * @param integer $id_cart Value - * @param integer $id_order_state Value - * @param float $amount_paid Amount really paid by customer (in the default currency) - * @param string $payment_method Payment method (eg. 'Credit card') - * @param string $message Message to attach to order - */ - public function validateOrder($id_cart, $id_order_state, $amount_paid, $payment_method = 'Unknown', - $message = null, $extra_vars = array(), $currency_special = null, $dont_touch_amount = false, - $secure_key = false, Shop $shop = null) - { - $this->context->cart = new Cart($id_cart); - $this->context->customer = new Customer($this->context->cart->id_customer); - $this->context->language = new Language($this->context->cart->id_lang); - $this->context->shop = ($shop ? $shop : new Shop($this->context->cart->id_shop)); - $id_currency = $currency_special ? (int)$currency_special : (int)$this->context->cart->id_currency; - $this->context->currency = new Currency($id_currency, null, $this->context->shop->id); - if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_delivery') - $context_country = $this->context->country; - - $order_status = new OrderState((int)$id_order_state, (int)$this->context->language->id); - if (!Validate::isLoadedObject($order_status)) - throw new PrestaShopException('Can\'t load Order state status'); - - if (!$this->active) - die(Tools::displayError()); - // Does order already exists ? - if (Validate::isLoadedObject($this->context->cart) && $this->context->cart->OrderExists() == false) - { - if ($secure_key !== false && $secure_key != $this->context->cart->secure_key) - die(Tools::displayError()); - - // For each package, generate an order - $delivery_option_list = $this->context->cart->getDeliveryOptionList(); - $package_list = $this->context->cart->getPackageList(); - $cart_delivery_option = $this->context->cart->getDeliveryOption(); - - // If some delivery options are not defined, or not valid, use the first valid option - foreach ($delivery_option_list as $id_address => $package) - if (!isset($cart_delivery_option[$id_address]) || !array_key_exists($cart_delivery_option[$id_address], $package)) - foreach ($package as $key => $val) - { - $cart_delivery_option[$id_address] = $key; - break; - } - - $order_list = array(); - $order_detail_list = array(); - $reference = Order::generateReference(); - $this->currentOrderReference = $reference; - - $order_creation_failed = false; - $cart_total_paid = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH), 2); - - if ($this->context->cart->orderExists()) - { - $error = Tools::displayError('An order has already been placed using this cart.'); - Logger::addLog($error, 4, '0000001', 'Cart', intval($this->context->cart->id)); - die($error); - } - - foreach ($cart_delivery_option as $id_address => $key_carriers) - foreach ($delivery_option_list[$id_address][$key_carriers]['carrier_list'] as $id_carrier => $data) - foreach ($data['package_list'] as $id_package) - { - // Rewrite the id_warehouse - $package_list[$id_address][$id_package]['id_warehouse'] = $this->context->cart->getPackageIdWarehouse($package_list[$id_address][$id_package], (int)$id_carrier); - $package_list[$id_address][$id_package]['id_carrier'] = $id_carrier; - } - // Make sure CarRule caches are empty - CartRule::cleanCache(); - - foreach ($package_list as $id_address => $packageByAddress) - foreach ($packageByAddress as $id_package => $package) - { - $order = new Order(); - $order->product_list = $package['product_list']; - - if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_delivery') - { - $address = new Address($id_address); - $this->context->country = new Country($address->id_country, $this->context->cart->id_lang); - } - - $carrier = null; - if (!$this->context->cart->isVirtualCart() && isset($package['id_carrier'])) - { - $carrier = new Carrier($package['id_carrier'], $this->context->cart->id_lang); - $order->id_carrier = (int)$carrier->id; - $id_carrier = (int)$carrier->id; - } - else - { - $order->id_carrier = 0; - $id_carrier = 0; - } - - $order->id_customer = (int)$this->context->cart->id_customer; - $order->id_address_invoice = (int)$this->context->cart->id_address_invoice; - $order->id_address_delivery = (int)$id_address; - $order->id_currency = $this->context->currency->id; - $order->id_lang = (int)$this->context->cart->id_lang; - $order->id_cart = (int)$this->context->cart->id; - $order->reference = $reference; - $order->id_shop = (int)$this->context->shop->id; - $order->id_shop_group = (int)$this->context->shop->id_shop_group; - - $order->secure_key = ($secure_key ? pSQL($secure_key) : pSQL($this->context->customer->secure_key)); - $order->payment = $payment_method; - if (isset($this->name)) - $order->module = $this->name; - $order->recyclable = $this->context->cart->recyclable; - $order->gift = (int)$this->context->cart->gift; - $order->gift_message = $this->context->cart->gift_message; - $order->conversion_rate = $this->context->currency->conversion_rate; - $amount_paid = !$dont_touch_amount ? Tools::ps_round((float)$amount_paid, 2) : $amount_paid; - $order->total_paid_real = 0; - - $order->total_products = (float)$this->context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS, $order->product_list, $id_carrier); - $order->total_products_wt = (float)$this->context->cart->getOrderTotal(true, Cart::ONLY_PRODUCTS, $order->product_list, $id_carrier); - - $order->total_discounts_tax_excl = (float)abs($this->context->cart->getOrderTotal(false, Cart::ONLY_DISCOUNTS, $order->product_list, $id_carrier)); - $order->total_discounts_tax_incl = (float)abs($this->context->cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS, $order->product_list, $id_carrier)); - $order->total_discounts = $order->total_discounts_tax_incl; - - $order->total_shipping_tax_excl = (float)$this->context->cart->getPackageShippingCost((int)$id_carrier, false, null, $order->product_list); - $order->total_shipping_tax_incl = (float)$this->context->cart->getPackageShippingCost((int)$id_carrier, true, null, $order->product_list); - $order->total_shipping = $order->total_shipping_tax_incl; - - if (!is_null($carrier) && Validate::isLoadedObject($carrier)) - $order->carrier_tax_rate = $carrier->getTaxesRate(new Address($this->context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')})); - - $order->total_wrapping_tax_excl = (float)abs($this->context->cart->getOrderTotal(false, Cart::ONLY_WRAPPING, $order->product_list, $id_carrier)); - $order->total_wrapping_tax_incl = (float)abs($this->context->cart->getOrderTotal(true, Cart::ONLY_WRAPPING, $order->product_list, $id_carrier)); - $order->total_wrapping = $order->total_wrapping_tax_incl; - - $order->total_paid_tax_excl = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(false, Cart::BOTH, $order->product_list, $id_carrier), 2); - $order->total_paid_tax_incl = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH, $order->product_list, $id_carrier), 2); - $order->total_paid = $order->total_paid_tax_incl; - - $order->invoice_date = '0000-00-00 00:00:00'; - $order->delivery_date = '0000-00-00 00:00:00'; - - // Creating order - $result = $order->add(); - - if (!$result) - throw new PrestaShopException('Can\'t save Order'); - - // Amount paid by customer is not the right one -> Status = payment error - // We don't use the following condition to avoid the float precision issues : http://www.php.net/manual/en/language.types.float.php - // if ($order->total_paid != $order->total_paid_real) - // We use number_format in order to compare two string - if ($order_status->logable && number_format($cart_total_paid, 2) != number_format($amount_paid, 2)) - $id_order_state = Configuration::get('PS_OS_ERROR'); - - $order_list[] = $order; - - // Insert new Order detail list using cart for the current order - $order_detail = new OrderDetail(null, null, $this->context); - $order_detail->createList($order, $this->context->cart, $id_order_state, $order->product_list, 0, true, $package_list[$id_address][$id_package]['id_warehouse']); - $order_detail_list[] = $order_detail; - - // Adding an entry in order_carrier table - if (!is_null($carrier)) - { - $order_carrier = new OrderCarrier(); - $order_carrier->id_order = (int)$order->id; - $order_carrier->id_carrier = (int)$id_carrier; - $order_carrier->weight = (float)$order->getTotalWeight(); - $order_carrier->shipping_cost_tax_excl = (float)$order->total_shipping_tax_excl; - $order_carrier->shipping_cost_tax_incl = (float)$order->total_shipping_tax_incl; - $order_carrier->add(); - } - } - - // The country can only change if the address used for the calculation is the delivery address, and if multi-shipping is activated - if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_delivery') - $this->context->country = $context_country; - - // Register Payment only if the order status validate the order - if ($order_status->logable) - { - // $order is the last order loop in the foreach - // The method addOrderPayment of the class Order make a create a paymentOrder - // linked to the order reference and not to the order id - if (isset($extra_vars['transaction_id'])) - $transaction_id = $extra_vars['transaction_id']; - else - $transaction_id = null; - - if (!$order->addOrderPayment($amount_paid, null, $transaction_id)) - throw new PrestaShopException('Can\'t save Order Payment'); - } - - // Next ! - $only_one_gift = false; - $cart_rule_used = array(); - $products = $this->context->cart->getProducts(); - $cart_rules = $this->context->cart->getCartRules(); - - // Make sure CarRule caches are empty - CartRule::cleanCache(); - - foreach ($order_detail_list as $key => $order_detail) - { - $order = $order_list[$key]; - if (!$order_creation_failed & isset($order->id)) - { - if (!$secure_key) - $message .= '
'.Tools::displayError('Warning: the secure key is empty, check your payment account before validation'); - // Optional message to attach to this order - if (isset($message) & !empty($message)) - { - $msg = new Message(); - $message = strip_tags($message, '
'); - if (Validate::isCleanHtml($message)) - { - $msg->message = $message; - $msg->id_order = intval($order->id); - $msg->private = 1; - $msg->add(); - } - } - - // Insert new Order detail list using cart for the current order - //$orderDetail = new OrderDetail(null, null, $this->context); - //$orderDetail->createList($order, $this->context->cart, $id_order_state); - - // Construct order detail table for the email - $products_list = ''; - $virtual_product = true; - foreach ($products as $key => $product) - { - $price = Product::getPriceStatic((int)$product['id_product'], false, ($product['id_product_attribute'] ? (int)$product['id_product_attribute'] : null), 6, null, false, true, $product['cart_quantity'], false, (int)$order->id_customer, (int)$order->id_cart, (int)$order->{Configuration::get('PS_TAX_ADDRESS_TYPE')}); - $price_wt = Product::getPriceStatic((int)$product['id_product'], true, ($product['id_product_attribute'] ? (int)$product['id_product_attribute'] : null), 2, null, false, true, $product['cart_quantity'], false, (int)$order->id_customer, (int)$order->id_cart, (int)$order->{Configuration::get('PS_TAX_ADDRESS_TYPE')}); - - $customization_quantity = 0; - if (isset($customized_datas[$product['id_product']][$product['id_product_attribute']])) - { - $customization_text = ''; - foreach ($customized_datas[$product['id_product']][$product['id_product_attribute']] as $customization) - { - if (isset($customization['datas'][Product::CUSTOMIZE_TEXTFIELD])) - foreach ($customization['datas'][Product::CUSTOMIZE_TEXTFIELD] as $text) - $customization_text .= $text['name'].': '.$text['value'].'
'; - - if (isset($customization['datas'][Product::CUSTOMIZE_FILE])) - $customization_text .= sprintf(Tools::displayError('%d image(s)'), count($customization['datas'][Product::CUSTOMIZE_FILE])).'
'; - - $customization_text .= '---
'; - } - - $customization_text = rtrim($customization_text, '---
'); - - $customization_quantity = (int)$product['customizationQuantityTotal']; - $products_list .= - '
- - - - - - '; - } - - if (!$customization_quantity || (int)$product['cart_quantity'] > $customization_quantity) - $products_list .= - ' - - - - - - '; - - // Check if is not a virutal product for the displaying of shipping - if (!$product['is_virtual']) - $virtual_product &= false; - - } // end foreach ($products) - - $cart_rules_list = ''; - foreach ($cart_rules as $cart_rule) - { - $package = array('id_carrier' => $order->id_carrier, 'id_address' => $order->id_address_delivery, 'products' => $order->product_list); - $values = array( - 'tax_incl' => $cart_rule['obj']->getContextualValue(true, $this->context, CartRule::FILTER_ACTION_ALL, $package), - 'tax_excl' => $cart_rule['obj']->getContextualValue(false, $this->context, CartRule::FILTER_ACTION_ALL, $package) - ); - - // If the reduction is not applicable to this order, then continue with the next one - if (!$values['tax_excl']) - continue; - - $order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $values); - - /* IF - ** - This is not multi-shipping - ** - The value of the voucher is greater than the total of the order - ** - Partial use is allowed - ** - This is an "amount" reduction, not a reduction in % or a gift - ** THEN - ** The voucher is cloned with a new value corresponding to the remainder - */ - if (count($order_list) == 1 && $values['tax_incl'] > $order->total_products_wt && $cart_rule['obj']->partial_use == 1 && $cart_rule['obj']->reduction_amount > 0) - { - // Create a new voucher from the original - $voucher = new CartRule($cart_rule['obj']->id); // We need to instantiate the CartRule without lang parameter to allow saving it - unset($voucher->id); - - // Set a new voucher code - $voucher->code = empty($voucher->code) ? substr(md5($order->id.'-'.$order->id_customer.'-'.$cart_rule['obj']->id), 0, 16) : $voucher->code.'-2'; - if (preg_match('/\-([0-9]{1,2})\-([0-9]{1,2})$/', $voucher->code, $matches) && $matches[1] == $matches[2]) - $voucher->code = preg_replace('/'.$matches[0].'$/', '-'.(intval($matches[1]) + 1), $voucher->code); - - // Set the new voucher value - if ($voucher->reduction_tax) - $voucher->reduction_amount = $values['tax_incl'] - $order->total_products_wt; - else - $voucher->reduction_amount = $values['tax_excl'] - $order->total_products; - - $voucher->id_customer = $order->id_customer; - $voucher->quantity = 1; - if ($voucher->add()) - { - // If the voucher has conditions, they are now copied to the new voucher - CartRule::copyConditions($cart_rule['obj']->id, $voucher->id); - - $params = array( - '{voucher_amount}' => Tools::displayPrice($voucher->reduction_amount, $this->context->currency, false), - '{voucher_num}' => $voucher->code, - '{firstname}' => $this->context->customer->firstname, - '{lastname}' => $this->context->customer->lastname, - '{id_order}' => $order->reference, - '{order_name}' => $order->getUniqReference() - ); - Mail::Send( - (int)$order->id_lang, - 'voucher', - sprintf(Mail::l('New voucher regarding your order %s', (int)$order->id_lang), $order->reference), - $params, - $this->context->customer->email, - $this->context->customer->firstname.' '.$this->context->customer->lastname, - null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop - ); - } - } - - if ($id_order_state != Configuration::get('PS_OS_ERROR') && $id_order_state != Configuration::get('PS_OS_CANCELED') && !in_array($cart_rule['obj']->id, $cart_rule_used)) - { - $cart_rule_used[] = $cart_rule['obj']->id; - - // Create a new instance of Cart Rule without id_lang, in order to update its quantity - $cart_rule_to_update = new CartRule($cart_rule['obj']->id); - $cart_rule_to_update->quantity = max(0, $cart_rule_to_update->quantity - 1); - $cart_rule_to_update->update(); - } - - $cart_rules_list .= ' - - - - '; - } - - // Specify order id for message - $old_message = Message::getMessageByCartId((int)$this->context->cart->id); - if ($old_message) - { - $update_message = new Message((int)$old_message['id_message']); - $update_message->id_order = (int)$order->id; - $update_message->update(); - - // Add this message in the customer thread - $customer_thread = new CustomerThread(); - $customer_thread->id_contact = 0; - $customer_thread->id_customer = (int)$order->id_customer; - $customer_thread->id_shop = (int)$this->context->shop->id; - $customer_thread->id_order = (int)$order->id; - $customer_thread->id_lang = (int)$this->context->language->id; - $customer_thread->email = $this->context->customer->email; - $customer_thread->status = 'open'; - $customer_thread->token = Tools::passwdGen(12); - $customer_thread->add(); - - $customer_message = new CustomerMessage(); - $customer_message->id_customer_thread = $customer_thread->id; - $customer_message->id_employee = 0; - $customer_message->message = htmlentities($update_message->message, ENT_COMPAT, 'UTF-8'); - $customer_message->private = 0; - - if (!$customer_message->add()) - $this->errors[] = Tools::displayError('An error occurred while saving message'); - } - - // Hook validate order - Hook::exec('actionValidateOrder', array( - 'cart' => $this->context->cart, - 'order' => $order, - 'customer' => $this->context->customer, - 'currency' => $this->context->currency, - 'orderStatus' => $order_status - )); - - foreach ($this->context->cart->getProducts() as $product) - if ($order_status->logable) - ProductSale::addProductSale((int)$product['id_product'], (int)$product['cart_quantity']); - - if (Configuration::get('PS_STOCK_MANAGEMENT') && $order_detail->getStockState()) - { - $history = new OrderHistory(); - $history->id_order = (int)$order->id; - $history->changeIdOrderState(Configuration::get('PS_OS_OUTOFSTOCK'), $order); - $history->addWithemail(); - } - - // Set order state in order history ONLY even if the "out of stock" status has not been yet reached - // So you migth have two order states - $new_history = new OrderHistory(); - $new_history->id_order = (int)$order->id; - $new_history->changeIdOrderState((int)$id_order_state, $order, true); - $new_history->addWithemail(true, $extra_vars); - - unset($order_detail); - - // Order is reloaded because the status just changed - $order = new Order($order->id); - - // Send an e-mail to customer (one order = one email) - if ($id_order_state != Configuration::get('PS_OS_ERROR') && $id_order_state != Configuration::get('PS_OS_CANCELED') && $this->context->customer->id) - { - $invoice = new Address($order->id_address_invoice); - $delivery = new Address($order->id_address_delivery); - $delivery_state = $delivery->id_state ? new State($delivery->id_state) : false; - $invoice_state = $invoice->id_state ? new State($invoice->id_state) : false; - - $data = array( - '{firstname}' => $this->context->customer->firstname, - '{lastname}' => $this->context->customer->lastname, - '{email}' => $this->context->customer->email, - '{delivery_block_txt}' => $this->_getFormatedAddress($delivery, "\n"), - '{invoice_block_txt}' => $this->_getFormatedAddress($invoice, "\n"), - '{delivery_block_html}' => $this->_getFormatedAddress($delivery, '
', array( - 'firstname' => '%s', - 'lastname' => '%s' - )), - '{invoice_block_html}' => $this->_getFormatedAddress($invoice, '
', array( - 'firstname' => '%s', - 'lastname' => '%s' - )), - '{delivery_company}' => $delivery->company, - '{delivery_firstname}' => $delivery->firstname, - '{delivery_lastname}' => $delivery->lastname, - '{delivery_address1}' => $delivery->address1, - '{delivery_address2}' => $delivery->address2, - '{delivery_city}' => $delivery->city, - '{delivery_postal_code}' => $delivery->postcode, - '{delivery_country}' => $delivery->country, - '{delivery_state}' => $delivery->id_state ? $delivery_state->name : '', - '{delivery_phone}' => ($delivery->phone) ? $delivery->phone : $delivery->phone_mobile, - '{delivery_other}' => $delivery->other, - '{invoice_company}' => $invoice->company, - '{invoice_vat_number}' => $invoice->vat_number, - '{invoice_firstname}' => $invoice->firstname, - '{invoice_lastname}' => $invoice->lastname, - '{invoice_address2}' => $invoice->address2, - '{invoice_address1}' => $invoice->address1, - '{invoice_city}' => $invoice->city, - '{invoice_postal_code}' => $invoice->postcode, - '{invoice_country}' => $invoice->country, - '{invoice_state}' => $invoice->id_state ? $invoice_state->name : '', - '{invoice_phone}' => ($invoice->phone) ? $invoice->phone : $invoice->phone_mobile, - '{invoice_other}' => $invoice->other, - '{order_name}' => $order->getUniqReference(), - '{date}' => Tools::displayDate(date('Y-m-d H:i:s'), (int)$order->id_lang, 1), - '{carrier}' => $virtual_product ? Tools::displayError('No carrier') : $carrier->name, - '{payment}' => Tools::substr($order->payment, 0, 32), - '{products}' => $this->formatProductAndVoucherForEmail($products_list), - '{discounts}' => $this->formatProductAndVoucherForEmail($cart_rules_list), - '{total_paid}' => Tools::displayPrice($order->total_paid, $this->context->currency, false), - '{total_products}' => Tools::displayPrice($order->total_paid - $order->total_shipping - $order->total_wrapping + $order->total_discounts, $this->context->currency, false), - '{total_discounts}' => Tools::displayPrice($order->total_discounts, $this->context->currency, false), - '{total_shipping}' => Tools::displayPrice($order->total_shipping, $this->context->currency, false), - '{total_wrapping}' => Tools::displayPrice($order->total_wrapping, $this->context->currency, false)); - - if (is_array($extra_vars)) - $data = array_merge($data, $extra_vars); - - // Join PDF invoice - if ((int)Configuration::get('PS_INVOICE') && $order_status->invoice && $order->invoice_number) - { - $pdf = new PDF($order->getInvoicesCollection(), PDF::TEMPLATE_INVOICE, $this->context->smarty); - $file_attachement['content'] = $pdf->render(false); - $file_attachement['name'] = Configuration::get('PS_INVOICE_PREFIX', (int)$order->id_lang).sprintf('%06d', $order->invoice_number).'.pdf'; - $file_attachement['mime'] = 'application/pdf'; - } - else - $file_attachement = null; - - if (Validate::isEmail($this->context->customer->email)) - Mail::Send( - (int)$order->id_lang, - 'order_conf', - Mail::l('Order confirmation', (int)$order->id_lang), - $data, - $this->context->customer->email, - $this->context->customer->firstname.' '.$this->context->customer->lastname, - null, - null, - $file_attachement, - null, _PS_MAIL_DIR_, false, (int)$order->id_shop - ); - } - - // updates stock in shops - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) - { - $product_list = $order->getProducts(); - foreach ($product_list as $product) - { - // if the available quantities depends on the physical stock - if (StockAvailable::dependsOnStock($product['product_id'])) - { - // synchronizes - StockAvailable::synchronize($product['product_id'], $order->id_shop); - } - } - } - } - else - { - $error = Tools::displayError('Order creation failed'); - Logger::addLog($error, 4, '0000002', 'Cart', intval($order->id_cart)); - die($error); - } - } // End foreach $order_detail_list - // Use the last order as currentOrder - $this->currentOrder = (int)$order->id; - return true; - } - else - { - $error = Tools::displayError('Cart cannot be loaded or an order has already been placed using this cart'); - Logger::addLog($error, 4, '0000001', 'Cart', intval($this->context->cart->id)); - die($error); - } - } - - public function formatProductAndVoucherForEmail($content) - { - return '
{$category}
'.$product['reference'].''.$product['name'].(isset($product['attributes']) ? ' - '.$product['attributes'] : '').' - '.Tools::displayError('Customized').(!empty($customization_text) ? ' - '.$customization_text : '').''.Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt, $this->context->currency, false).''.$customization_quantity.''.Tools::displayPrice($customization_quantity * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt), $this->context->currency, false).'
'.$product['reference'].''.$product['name'].(isset($product['attributes']) ? ' - '.$product['attributes'] : '').''.Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt, $this->context->currency, false).''.((int)$product['cart_quantity'] - $customization_quantity).''.Tools::displayPrice(((int)$product['cart_quantity'] - $customization_quantity) * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt), $this->context->currency, false).'
'.Tools::displayError('Voucher name:').' '.$cart_rule['obj']->name.''.($values['tax_incl'] != 0.00 ? '-' : '').Tools::displayPrice($values['tax_incl'], $this->context->currency, false).'
- - - - - - - '.$content.'
'; - } - - /** - * @param Object Address $the_address that needs to be txt formated - * @return String the txt formated address block - */ - protected function _getTxtFormatedAddress($the_address) - { - $adr_fields = AddressFormat::getOrderedAddressFields($the_address->id_country, false, true); - $r_values = array(); - foreach ($adr_fields as $fields_line) - { - $tmp_values = array(); - foreach (explode(' ', $fields_line) as $field_item) - { - $field_item = trim($field_item); - $tmp_values[] = $the_address->{$field_item}; - } - $r_values[] = implode(' ', $tmp_values); - } - - $out = implode("\n", $r_values); - return $out; - } - - /** - * @param Object Address $the_address that needs to be txt formated - * @return String the txt formated address block - */ - - protected function _getFormatedAddress(Address $the_address, $line_sep, $fields_style = array()) - { - return AddressFormat::generateAddress($the_address, array('avoid' => array()), $line_sep, ' ', $fields_style); - } - - /** - * @param int $id_currency : this parameter is optionnal but on 1.5 version of Prestashop, it will be REQUIRED - * @return Currency - */ - public function getCurrency($current_id_currency = null) - { - if (!(int)$current_id_currency) - $current_id_currency = Context::getContext()->currency->id; - - if (!$this->currencies) - return false; - if ($this->currencies_mode == 'checkbox') - { - $currencies = Currency::getPaymentCurrencies($this->id); - return $currencies; - } - elseif ($this->currencies_mode == 'radio') - { - $currencies = Currency::getPaymentCurrenciesSpecial($this->id); - $currency = $currencies['id_currency']; - if ($currency == -1) - $id_currency = (int)$current_id_currency; - elseif ($currency == -2) - $id_currency = (int)Configuration::get('PS_CURRENCY_DEFAULT'); - else - $id_currency = $currency; - } - if (!isset($id_currency) || empty($id_currency)) - return false; - return (new Currency($id_currency)); - } - - /** - * Allows specified payment modules to be used by a specific currency - * - * @since 1.4.5 - * @param int $id_currency - * @param array $id_module_list - * @return boolean - */ - public static function addCurrencyPermissions($id_currency, array $id_module_list = array()) - { - $values = ''; - if (count($id_module_list) == 0) - { - // fetch all installed module ids - $modules = PaymentModuleCore::getInstalledPaymentModules(); - foreach ($modules as $module) - $id_module_list[] = $module['id_module']; - } - - foreach ($id_module_list as $id_module) - $values .= '('.(int)$id_module.','.(int)$id_currency.'),'; - - if (!empty($values)) - { - return Db::getInstance()->execute(' - INSERT INTO `'._DB_PREFIX_.'module_currency` (`id_module`, `id_currency`) - VALUES '.rtrim($values, ',') - ); - } - - return true; - } - - /** - * List all installed and active payment modules - * @see Module::getPaymentModules() if you need a list of module related to the user context - * - * @since 1.4.5 - * @return array module informations - */ - public static function getInstalledPaymentModules() - { - $hook_payment = 'Payment'; - if (Db::getInstance()->getValue('SELECT `id_hook` FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'displayPayment\'')) - $hook_payment = 'displayPayment'; - - return Db::getInstance()->executeS(' - SELECT DISTINCT m.`id_module`, h.`id_hook`, m.`name`, hm.`position` - FROM `'._DB_PREFIX_.'module` m - LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module` - LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook` - WHERE h.`name` = \''.pSQL($hook_payment).'\' - AND m.`active` = 1 - '); - } - - - public static function preCall($module_name) - { - if (!parent::preCall($module_name)) - return false; - - if (($module_instance = Module::getInstanceByName($module_name))) - if (!$module_instance->currencies || ($module_instance->currencies && count(Currency::checkPaymentCurrencies($module_instance->id)))) - return true; - - return false; - } - -} - ->>>>>>> [-] FO: fixed bug #PSCFV-5779 - order_conf still not fixed propertly + +* @copyright 2007-2012 PrestaShop SA +* @version Release: $Revision: 6844 $ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +abstract class PaymentModuleCore extends Module +{ + /** @var integer Current order's id */ + public $currentOrder; + public $currencies = true; + public $currencies_mode = 'checkbox'; + + public function install() + { + if (!parent::install()) + return false; + + // Insert currencies availability + if ($this->currencies_mode == 'checkbox') + { + if (!$this->addCheckboxCurrencyRestrictionsForModule()) + return false; + } + elseif ($this->currencies_mode == 'radio') + { + if (!$this->addRadioCurrencyRestrictionsForModule()) + return false; + } + else + Tools::displayError('No currency mode for payment module'); + + // Insert countries availability + $return = $this->addCheckboxCountryRestrictionsForModule(); + + return $return; + } + + public function uninstall() + { + if (!Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_country` WHERE id_module = '.(int)$this->id) + || !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_currency` WHERE id_module = '.(int)$this->id) + || !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_group` WHERE id_module = '.(int)$this->id)) + return false; + return parent::uninstall(); + } + + + /** + * Add checkbox currency restrictions for a new module + * @param integer id_module + * @param array $shops + */ + public function addCheckboxCurrencyRestrictionsForModule(array $shops = array()) + { + if (!$shops) + $shops = Shop::getShops(true, null, true); + + foreach ($shops as $s) + { + if (!Db::getInstance()->execute(' + INSERT INTO `'._DB_PREFIX_.'module_currency` (`id_module`, `id_shop`, `id_currency`) + SELECT '.(int)$this->id.', "'.(int)$s.'", `id_currency` FROM `'._DB_PREFIX_.'currency` WHERE deleted = 0')) + return false; + } + return true; + } + + /** + * Add radio currency restrictions for a new module + * @param integer id_module + * @param array $shops + */ + public function addRadioCurrencyRestrictionsForModule(array $shops = array()) + { + if (!$shops) + $shops = Shop::getShops(true, null, true); + + foreach ($shops as $s) + if (!Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'module_currency` (`id_module`, `id_shop`, `id_currency`) + VALUES ('.(int)$this->id.', "'.(int)$s.'", -2)')) + return false; + return true; + } + + /** + * Add checkbox country restrictions for a new module + * @param integer id_module + * @param array $shops + */ + public function addCheckboxCountryRestrictionsForModule(array $shops = array()) + { + $countries = Country::getCountries((int)Context::getContext()->language->id, true); //get only active country + $country_ids = array(); + foreach ($countries as $country) + $country_ids[] = $country['id_country']; + return Country::addModuleRestrictions($shops, $countries, array(array('id_module' => (int)$this->id))); + } + + /** + * Validate an order in database + * Function called from a payment module + * + * @param integer $id_cart Value + * @param integer $id_order_state Value + * @param float $amount_paid Amount really paid by customer (in the default currency) + * @param string $payment_method Payment method (eg. 'Credit card') + * @param string $message Message to attach to order + */ + public function validateOrder($id_cart, $id_order_state, $amount_paid, $payment_method = 'Unknown', + $message = null, $extra_vars = array(), $currency_special = null, $dont_touch_amount = false, + $secure_key = false, Shop $shop = null) + { + $this->context->cart = new Cart($id_cart); + $this->context->customer = new Customer($this->context->cart->id_customer); + $this->context->language = new Language($this->context->cart->id_lang); + $this->context->shop = ($shop ? $shop : new Shop($this->context->cart->id_shop)); + $id_currency = $currency_special ? (int)$currency_special : (int)$this->context->cart->id_currency; + $this->context->currency = new Currency($id_currency, null, $this->context->shop->id); + if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_delivery') + $context_country = $this->context->country; + + $order_status = new OrderState((int)$id_order_state, (int)$this->context->language->id); + if (!Validate::isLoadedObject($order_status)) + throw new PrestaShopException('Can\'t load Order state status'); + + if (!$this->active) + die(Tools::displayError()); + // Does order already exists ? + if (Validate::isLoadedObject($this->context->cart) && $this->context->cart->OrderExists() == false) + { + if ($secure_key !== false && $secure_key != $this->context->cart->secure_key) + die(Tools::displayError()); + + // For each package, generate an order + $delivery_option_list = $this->context->cart->getDeliveryOptionList(); + $package_list = $this->context->cart->getPackageList(); + $cart_delivery_option = $this->context->cart->getDeliveryOption(); + + // If some delivery options are not defined, or not valid, use the first valid option + foreach ($delivery_option_list as $id_address => $package) + if (!isset($cart_delivery_option[$id_address]) || !array_key_exists($cart_delivery_option[$id_address], $package)) + foreach ($package as $key => $val) + { + $cart_delivery_option[$id_address] = $key; + break; + } + + $order_list = array(); + $order_detail_list = array(); + $reference = Order::generateReference(); + $this->currentOrderReference = $reference; + + $order_creation_failed = false; + $cart_total_paid = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH), 2); + + if ($this->context->cart->orderExists()) + { + $error = Tools::displayError('An order has already been placed using this cart.'); + Logger::addLog($error, 4, '0000001', 'Cart', intval($this->context->cart->id)); + die($error); + } + + foreach ($cart_delivery_option as $id_address => $key_carriers) + foreach ($delivery_option_list[$id_address][$key_carriers]['carrier_list'] as $id_carrier => $data) + foreach ($data['package_list'] as $id_package) + { + // Rewrite the id_warehouse + $package_list[$id_address][$id_package]['id_warehouse'] = $this->context->cart->getPackageIdWarehouse($package_list[$id_address][$id_package], (int)$id_carrier); + $package_list[$id_address][$id_package]['id_carrier'] = $id_carrier; + } + // Make sure CarRule caches are empty + CartRule::cleanCache(); + + foreach ($package_list as $id_address => $packageByAddress) + foreach ($packageByAddress as $id_package => $package) + { + $order = new Order(); + $order->product_list = $package['product_list']; + + if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_delivery') + { + $address = new Address($id_address); + $this->context->country = new Country($address->id_country, $this->context->cart->id_lang); + } + + $carrier = null; + if (!$this->context->cart->isVirtualCart() && isset($package['id_carrier'])) + { + $carrier = new Carrier($package['id_carrier'], $this->context->cart->id_lang); + $order->id_carrier = (int)$carrier->id; + $id_carrier = (int)$carrier->id; + } + else + { + $order->id_carrier = 0; + $id_carrier = 0; + } + + $order->id_customer = (int)$this->context->cart->id_customer; + $order->id_address_invoice = (int)$this->context->cart->id_address_invoice; + $order->id_address_delivery = (int)$id_address; + $order->id_currency = $this->context->currency->id; + $order->id_lang = (int)$this->context->cart->id_lang; + $order->id_cart = (int)$this->context->cart->id; + $order->reference = $reference; + $order->id_shop = (int)$this->context->shop->id; + $order->id_shop_group = (int)$this->context->shop->id_shop_group; + + $order->secure_key = ($secure_key ? pSQL($secure_key) : pSQL($this->context->customer->secure_key)); + $order->payment = $payment_method; + if (isset($this->name)) + $order->module = $this->name; + $order->recyclable = $this->context->cart->recyclable; + $order->gift = (int)$this->context->cart->gift; + $order->gift_message = $this->context->cart->gift_message; + $order->conversion_rate = $this->context->currency->conversion_rate; + $amount_paid = !$dont_touch_amount ? Tools::ps_round((float)$amount_paid, 2) : $amount_paid; + $order->total_paid_real = 0; + + $order->total_products = (float)$this->context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS, $order->product_list, $id_carrier); + $order->total_products_wt = (float)$this->context->cart->getOrderTotal(true, Cart::ONLY_PRODUCTS, $order->product_list, $id_carrier); + + $order->total_discounts_tax_excl = (float)abs($this->context->cart->getOrderTotal(false, Cart::ONLY_DISCOUNTS, $order->product_list, $id_carrier)); + $order->total_discounts_tax_incl = (float)abs($this->context->cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS, $order->product_list, $id_carrier)); + $order->total_discounts = $order->total_discounts_tax_incl; + + $order->total_shipping_tax_excl = (float)$this->context->cart->getPackageShippingCost((int)$id_carrier, false, null, $order->product_list); + $order->total_shipping_tax_incl = (float)$this->context->cart->getPackageShippingCost((int)$id_carrier, true, null, $order->product_list); + $order->total_shipping = $order->total_shipping_tax_incl; + + if (!is_null($carrier) && Validate::isLoadedObject($carrier)) + $order->carrier_tax_rate = $carrier->getTaxesRate(new Address($this->context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')})); + + $order->total_wrapping_tax_excl = (float)abs($this->context->cart->getOrderTotal(false, Cart::ONLY_WRAPPING, $order->product_list, $id_carrier)); + $order->total_wrapping_tax_incl = (float)abs($this->context->cart->getOrderTotal(true, Cart::ONLY_WRAPPING, $order->product_list, $id_carrier)); + $order->total_wrapping = $order->total_wrapping_tax_incl; + + $order->total_paid_tax_excl = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(false, Cart::BOTH, $order->product_list, $id_carrier), 2); + $order->total_paid_tax_incl = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH, $order->product_list, $id_carrier), 2); + $order->total_paid = $order->total_paid_tax_incl; + + $order->invoice_date = '0000-00-00 00:00:00'; + $order->delivery_date = '0000-00-00 00:00:00'; + + // Creating order + $result = $order->add(); + + if (!$result) + throw new PrestaShopException('Can\'t save Order'); + + // Amount paid by customer is not the right one -> Status = payment error + // We don't use the following condition to avoid the float precision issues : http://www.php.net/manual/en/language.types.float.php + // if ($order->total_paid != $order->total_paid_real) + // We use number_format in order to compare two string + if ($order_status->logable && number_format($cart_total_paid, 2) != number_format($amount_paid, 2)) + $id_order_state = Configuration::get('PS_OS_ERROR'); + + $order_list[] = $order; + + // Insert new Order detail list using cart for the current order + $order_detail = new OrderDetail(null, null, $this->context); + $order_detail->createList($order, $this->context->cart, $id_order_state, $order->product_list, 0, true, $package_list[$id_address][$id_package]['id_warehouse']); + $order_detail_list[] = $order_detail; + + // Adding an entry in order_carrier table + if (!is_null($carrier)) + { + $order_carrier = new OrderCarrier(); + $order_carrier->id_order = (int)$order->id; + $order_carrier->id_carrier = (int)$id_carrier; + $order_carrier->weight = (float)$order->getTotalWeight(); + $order_carrier->shipping_cost_tax_excl = (float)$order->total_shipping_tax_excl; + $order_carrier->shipping_cost_tax_incl = (float)$order->total_shipping_tax_incl; + $order_carrier->add(); + } + } + + // The country can only change if the address used for the calculation is the delivery address, and if multi-shipping is activated + if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_delivery') + $this->context->country = $context_country; + + // Register Payment only if the order status validate the order + if ($order_status->logable) + { + // $order is the last order loop in the foreach + // The method addOrderPayment of the class Order make a create a paymentOrder + // linked to the order reference and not to the order id + if (isset($extra_vars['transaction_id'])) + $transaction_id = $extra_vars['transaction_id']; + else + $transaction_id = null; + + if (!$order->addOrderPayment($amount_paid, null, $transaction_id)) + throw new PrestaShopException('Can\'t save Order Payment'); + } + + // Next ! + $only_one_gift = false; + $cart_rule_used = array(); + $products = $this->context->cart->getProducts(); + $cart_rules = $this->context->cart->getCartRules(); + + // Make sure CarRule caches are empty + CartRule::cleanCache(); + + foreach ($order_detail_list as $key => $order_detail) + { + $order = $order_list[$key]; + if (!$order_creation_failed & isset($order->id)) + { + if (!$secure_key) + $message .= '
'.Tools::displayError('Warning: the secure key is empty, check your payment account before validation'); + // Optional message to attach to this order + if (isset($message) & !empty($message)) + { + $msg = new Message(); + $message = strip_tags($message, '
'); + if (Validate::isCleanHtml($message)) + { + $msg->message = $message; + $msg->id_order = intval($order->id); + $msg->private = 1; + $msg->add(); + } + } + + // Insert new Order detail list using cart for the current order + //$orderDetail = new OrderDetail(null, null, $this->context); + //$orderDetail->createList($order, $this->context->cart, $id_order_state); + + // Construct order detail table for the email + $products_list = ''; + $virtual_product = true; + foreach ($products as $key => $product) + { + $price = Product::getPriceStatic((int)$product['id_product'], false, ($product['id_product_attribute'] ? (int)$product['id_product_attribute'] : null), 6, null, false, true, $product['cart_quantity'], false, (int)$order->id_customer, (int)$order->id_cart, (int)$order->{Configuration::get('PS_TAX_ADDRESS_TYPE')}); + $price_wt = Product::getPriceStatic((int)$product['id_product'], true, ($product['id_product_attribute'] ? (int)$product['id_product_attribute'] : null), 2, null, false, true, $product['cart_quantity'], false, (int)$order->id_customer, (int)$order->id_cart, (int)$order->{Configuration::get('PS_TAX_ADDRESS_TYPE')}); + + $customization_quantity = 0; + if (isset($customized_datas[$product['id_product']][$product['id_product_attribute']])) + { + $customization_text = ''; + foreach ($customized_datas[$product['id_product']][$product['id_product_attribute']] as $customization) + { + if (isset($customization['datas'][Product::CUSTOMIZE_TEXTFIELD])) + foreach ($customization['datas'][Product::CUSTOMIZE_TEXTFIELD] as $text) + $customization_text .= $text['name'].': '.$text['value'].'
'; + + if (isset($customization['datas'][Product::CUSTOMIZE_FILE])) + $customization_text .= sprintf(Tools::displayError('%d image(s)'), count($customization['datas'][Product::CUSTOMIZE_FILE])).'
'; + + $customization_text .= '---
'; + } + + $customization_text = rtrim($customization_text, '---
'); + + $customization_quantity = (int)$product['customizationQuantityTotal']; + $products_list .= + ' + '.$product['reference'].' + '.$product['name'].(isset($product['attributes']) ? ' - '.$product['attributes'] : '').' - '.Tools::displayError('Customized').(!empty($customization_text) ? ' - '.$customization_text : '').' + '.Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt, $this->context->currency, false).' + '.$customization_quantity.' + '.Tools::displayPrice($customization_quantity * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt), $this->context->currency, false).' + '; + } + + if (!$customization_quantity || (int)$product['cart_quantity'] > $customization_quantity) + $products_list .= + ' + '.$product['reference'].' + '.$product['name'].(isset($product['attributes']) ? ' - '.$product['attributes'] : '').' + '.Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt, $this->context->currency, false).' + '.((int)$product['cart_quantity'] - $customization_quantity).' + '.Tools::displayPrice(((int)$product['cart_quantity'] - $customization_quantity) * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt), $this->context->currency, false).' + '; + + // Check if is not a virutal product for the displaying of shipping + if (!$product['is_virtual']) + $virtual_product &= false; + + } // end foreach ($products) + + $cart_rules_list = ''; + foreach ($cart_rules as $cart_rule) + { + $package = array('id_carrier' => $order->id_carrier, 'id_address' => $order->id_address_delivery, 'products' => $order->product_list); + $values = array( + 'tax_incl' => $cart_rule['obj']->getContextualValue(true, $this->context, CartRule::FILTER_ACTION_ALL, $package), + 'tax_excl' => $cart_rule['obj']->getContextualValue(false, $this->context, CartRule::FILTER_ACTION_ALL, $package) + ); + + // If the reduction is not applicable to this order, then continue with the next one + if (!$values['tax_excl']) + continue; + + $order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $values); + + /* IF + ** - This is not multi-shipping + ** - The value of the voucher is greater than the total of the order + ** - Partial use is allowed + ** - This is an "amount" reduction, not a reduction in % or a gift + ** THEN + ** The voucher is cloned with a new value corresponding to the remainder + */ + if (count($order_list) == 1 && $values['tax_incl'] > $order->total_products_wt && $cart_rule['obj']->partial_use == 1 && $cart_rule['obj']->reduction_amount > 0) + { + // Create a new voucher from the original + $voucher = new CartRule($cart_rule['obj']->id); // We need to instantiate the CartRule without lang parameter to allow saving it + unset($voucher->id); + + // Set a new voucher code + $voucher->code = empty($voucher->code) ? substr(md5($order->id.'-'.$order->id_customer.'-'.$cart_rule['obj']->id), 0, 16) : $voucher->code.'-2'; + if (preg_match('/\-([0-9]{1,2})\-([0-9]{1,2})$/', $voucher->code, $matches) && $matches[1] == $matches[2]) + $voucher->code = preg_replace('/'.$matches[0].'$/', '-'.(intval($matches[1]) + 1), $voucher->code); + + // Set the new voucher value + if ($voucher->reduction_tax) + $voucher->reduction_amount = $values['tax_incl'] - $order->total_products_wt; + else + $voucher->reduction_amount = $values['tax_excl'] - $order->total_products; + + $voucher->id_customer = $order->id_customer; + $voucher->quantity = 1; + if ($voucher->add()) + { + // If the voucher has conditions, they are now copied to the new voucher + CartRule::copyConditions($cart_rule['obj']->id, $voucher->id); + + $params = array( + '{voucher_amount}' => Tools::displayPrice($voucher->reduction_amount, $this->context->currency, false), + '{voucher_num}' => $voucher->code, + '{firstname}' => $this->context->customer->firstname, + '{lastname}' => $this->context->customer->lastname, + '{id_order}' => $order->reference, + '{order_name}' => $order->getUniqReference() + ); + Mail::Send( + (int)$order->id_lang, + 'voucher', + sprintf(Mail::l('New voucher regarding your order %s', (int)$order->id_lang), $order->reference), + $params, + $this->context->customer->email, + $this->context->customer->firstname.' '.$this->context->customer->lastname, + null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop + ); + } + } + + if ($id_order_state != Configuration::get('PS_OS_ERROR') && $id_order_state != Configuration::get('PS_OS_CANCELED') && !in_array($cart_rule['obj']->id, $cart_rule_used)) + { + $cart_rule_used[] = $cart_rule['obj']->id; + + // Create a new instance of Cart Rule without id_lang, in order to update its quantity + $cart_rule_to_update = new CartRule($cart_rule['obj']->id); + $cart_rule_to_update->quantity = max(0, $cart_rule_to_update->quantity - 1); + $cart_rule_to_update->update(); + } + + $cart_rules_list .= ' + + '.Tools::displayError('Voucher name:').' '.$cart_rule['obj']->name.' + '.($values['tax_incl'] != 0.00 ? '-' : '').Tools::displayPrice($values['tax_incl'], $this->context->currency, false).' + '; + } + + // Specify order id for message + $old_message = Message::getMessageByCartId((int)$this->context->cart->id); + if ($old_message) + { + $update_message = new Message((int)$old_message['id_message']); + $update_message->id_order = (int)$order->id; + $update_message->update(); + + // Add this message in the customer thread + $customer_thread = new CustomerThread(); + $customer_thread->id_contact = 0; + $customer_thread->id_customer = (int)$order->id_customer; + $customer_thread->id_shop = (int)$this->context->shop->id; + $customer_thread->id_order = (int)$order->id; + $customer_thread->id_lang = (int)$this->context->language->id; + $customer_thread->email = $this->context->customer->email; + $customer_thread->status = 'open'; + $customer_thread->token = Tools::passwdGen(12); + $customer_thread->add(); + + $customer_message = new CustomerMessage(); + $customer_message->id_customer_thread = $customer_thread->id; + $customer_message->id_employee = 0; + $customer_message->message = htmlentities($update_message->message, ENT_COMPAT, 'UTF-8'); + $customer_message->private = 0; + + if (!$customer_message->add()) + $this->errors[] = Tools::displayError('An error occurred while saving message'); + } + + // Hook validate order + Hook::exec('actionValidateOrder', array( + 'cart' => $this->context->cart, + 'order' => $order, + 'customer' => $this->context->customer, + 'currency' => $this->context->currency, + 'orderStatus' => $order_status + )); + + foreach ($this->context->cart->getProducts() as $product) + if ($order_status->logable) + ProductSale::addProductSale((int)$product['id_product'], (int)$product['cart_quantity']); + + if (Configuration::get('PS_STOCK_MANAGEMENT') && $order_detail->getStockState()) + { + $history = new OrderHistory(); + $history->id_order = (int)$order->id; + $history->changeIdOrderState(Configuration::get('PS_OS_OUTOFSTOCK'), $order); + $history->addWithemail(); + } + + // Set order state in order history ONLY even if the "out of stock" status has not been yet reached + // So you migth have two order states + $new_history = new OrderHistory(); + $new_history->id_order = (int)$order->id; + $new_history->changeIdOrderState((int)$id_order_state, $order, true); + $new_history->addWithemail(true, $extra_vars); + + unset($order_detail); + + // Order is reloaded because the status just changed + $order = new Order($order->id); + + // Send an e-mail to customer (one order = one email) + if ($id_order_state != Configuration::get('PS_OS_ERROR') && $id_order_state != Configuration::get('PS_OS_CANCELED') && $this->context->customer->id) + { + $invoice = new Address($order->id_address_invoice); + $delivery = new Address($order->id_address_delivery); + $delivery_state = $delivery->id_state ? new State($delivery->id_state) : false; + $invoice_state = $invoice->id_state ? new State($invoice->id_state) : false; + + $data = array( + '{firstname}' => $this->context->customer->firstname, + '{lastname}' => $this->context->customer->lastname, + '{email}' => $this->context->customer->email, + '{delivery_block_txt}' => $this->_getFormatedAddress($delivery, "\n"), + '{invoice_block_txt}' => $this->_getFormatedAddress($invoice, "\n"), + '{delivery_block_html}' => $this->_getFormatedAddress($delivery, '
', array( + 'firstname' => '%s', + 'lastname' => '%s' + )), + '{invoice_block_html}' => $this->_getFormatedAddress($invoice, '
', array( + 'firstname' => '%s', + 'lastname' => '%s' + )), + '{delivery_company}' => $delivery->company, + '{delivery_firstname}' => $delivery->firstname, + '{delivery_lastname}' => $delivery->lastname, + '{delivery_address1}' => $delivery->address1, + '{delivery_address2}' => $delivery->address2, + '{delivery_city}' => $delivery->city, + '{delivery_postal_code}' => $delivery->postcode, + '{delivery_country}' => $delivery->country, + '{delivery_state}' => $delivery->id_state ? $delivery_state->name : '', + '{delivery_phone}' => ($delivery->phone) ? $delivery->phone : $delivery->phone_mobile, + '{delivery_other}' => $delivery->other, + '{invoice_company}' => $invoice->company, + '{invoice_vat_number}' => $invoice->vat_number, + '{invoice_firstname}' => $invoice->firstname, + '{invoice_lastname}' => $invoice->lastname, + '{invoice_address2}' => $invoice->address2, + '{invoice_address1}' => $invoice->address1, + '{invoice_city}' => $invoice->city, + '{invoice_postal_code}' => $invoice->postcode, + '{invoice_country}' => $invoice->country, + '{invoice_state}' => $invoice->id_state ? $invoice_state->name : '', + '{invoice_phone}' => ($invoice->phone) ? $invoice->phone : $invoice->phone_mobile, + '{invoice_other}' => $invoice->other, + '{order_name}' => $order->getUniqReference(), + '{date}' => Tools::displayDate(date('Y-m-d H:i:s'), (int)$order->id_lang, 1), + '{carrier}' => $virtual_product ? Tools::displayError('No carrier') : $carrier->name, + '{payment}' => Tools::substr($order->payment, 0, 32), + '{products}' => $this->formatProductAndVoucherForEmail($products_list), + '{discounts}' => $this->formatProductAndVoucherForEmail($cart_rules_list), + '{total_paid}' => Tools::displayPrice($order->total_paid, $this->context->currency, false), + '{total_products}' => Tools::displayPrice($order->total_paid - $order->total_shipping - $order->total_wrapping + $order->total_discounts, $this->context->currency, false), + '{total_discounts}' => Tools::displayPrice($order->total_discounts, $this->context->currency, false), + '{total_shipping}' => Tools::displayPrice($order->total_shipping, $this->context->currency, false), + '{total_wrapping}' => Tools::displayPrice($order->total_wrapping, $this->context->currency, false)); + + if (is_array($extra_vars)) + $data = array_merge($data, $extra_vars); + + // Join PDF invoice + if ((int)Configuration::get('PS_INVOICE') && $order_status->invoice && $order->invoice_number) + { + $pdf = new PDF($order->getInvoicesCollection(), PDF::TEMPLATE_INVOICE, $this->context->smarty); + $file_attachement['content'] = $pdf->render(false); + $file_attachement['name'] = Configuration::get('PS_INVOICE_PREFIX', (int)$order->id_lang).sprintf('%06d', $order->invoice_number).'.pdf'; + $file_attachement['mime'] = 'application/pdf'; + } + else + $file_attachement = null; + + if (Validate::isEmail($this->context->customer->email)) + Mail::Send( + (int)$order->id_lang, + 'order_conf', + Mail::l('Order confirmation', (int)$order->id_lang), + $data, + $this->context->customer->email, + $this->context->customer->firstname.' '.$this->context->customer->lastname, + null, + null, + $file_attachement, + null, _PS_MAIL_DIR_, false, (int)$order->id_shop + ); + } + + // updates stock in shops + if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) + { + $product_list = $order->getProducts(); + foreach ($product_list as $product) + { + // if the available quantities depends on the physical stock + if (StockAvailable::dependsOnStock($product['product_id'])) + { + // synchronizes + StockAvailable::synchronize($product['product_id'], $order->id_shop); + } + } + } + } + else + { + $error = Tools::displayError('Order creation failed'); + Logger::addLog($error, 4, '0000002', 'Cart', intval($order->id_cart)); + die($error); + } + } // End foreach $order_detail_list + // Use the last order as currentOrder + $this->currentOrder = (int)$order->id; + return true; + } + else + { + $error = Tools::displayError('Cart cannot be loaded or an order has already been placed using this cart'); + Logger::addLog($error, 4, '0000001', 'Cart', intval($this->context->cart->id)); + die($error); + } + } + + public function formatProductAndVoucherForEmail($content) + { + return ' + + + + + + + '.$content.'
'; + } + + /** + * @param Object Address $the_address that needs to be txt formated + * @return String the txt formated address block + */ + protected function _getTxtFormatedAddress($the_address) + { + $adr_fields = AddressFormat::getOrderedAddressFields($the_address->id_country, false, true); + $r_values = array(); + foreach ($adr_fields as $fields_line) + { + $tmp_values = array(); + foreach (explode(' ', $fields_line) as $field_item) + { + $field_item = trim($field_item); + $tmp_values[] = $the_address->{$field_item}; + } + $r_values[] = implode(' ', $tmp_values); + } + + $out = implode("\n", $r_values); + return $out; + } + + /** + * @param Object Address $the_address that needs to be txt formated + * @return String the txt formated address block + */ + + protected function _getFormatedAddress(Address $the_address, $line_sep, $fields_style = array()) + { + return AddressFormat::generateAddress($the_address, array('avoid' => array()), $line_sep, ' ', $fields_style); + } + + /** + * @param int $id_currency : this parameter is optionnal but on 1.5 version of Prestashop, it will be REQUIRED + * @return Currency + */ + public function getCurrency($current_id_currency = null) + { + if (!(int)$current_id_currency) + $current_id_currency = Context::getContext()->currency->id; + + if (!$this->currencies) + return false; + if ($this->currencies_mode == 'checkbox') + { + $currencies = Currency::getPaymentCurrencies($this->id); + return $currencies; + } + elseif ($this->currencies_mode == 'radio') + { + $currencies = Currency::getPaymentCurrenciesSpecial($this->id); + $currency = $currencies['id_currency']; + if ($currency == -1) + $id_currency = (int)$current_id_currency; + elseif ($currency == -2) + $id_currency = (int)Configuration::get('PS_CURRENCY_DEFAULT'); + else + $id_currency = $currency; + } + if (!isset($id_currency) || empty($id_currency)) + return false; + return (new Currency($id_currency)); + } + + /** + * Allows specified payment modules to be used by a specific currency + * + * @since 1.4.5 + * @param int $id_currency + * @param array $id_module_list + * @return boolean + */ + public static function addCurrencyPermissions($id_currency, array $id_module_list = array()) + { + $values = ''; + if (count($id_module_list) == 0) + { + // fetch all installed module ids + $modules = PaymentModuleCore::getInstalledPaymentModules(); + foreach ($modules as $module) + $id_module_list[] = $module['id_module']; + } + + foreach ($id_module_list as $id_module) + $values .= '('.(int)$id_module.','.(int)$id_currency.'),'; + + if (!empty($values)) + { + return Db::getInstance()->execute(' + INSERT INTO `'._DB_PREFIX_.'module_currency` (`id_module`, `id_currency`) + VALUES '.rtrim($values, ',') + ); + } + + return true; + } + + /** + * List all installed and active payment modules + * @see Module::getPaymentModules() if you need a list of module related to the user context + * + * @since 1.4.5 + * @return array module informations + */ + public static function getInstalledPaymentModules() + { + $hook_payment = 'Payment'; + if (Db::getInstance()->getValue('SELECT `id_hook` FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'displayPayment\'')) + $hook_payment = 'displayPayment'; + + return Db::getInstance()->executeS(' + SELECT DISTINCT m.`id_module`, h.`id_hook`, m.`name`, hm.`position` + FROM `'._DB_PREFIX_.'module` m + LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module` + LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook` + WHERE h.`name` = \''.pSQL($hook_payment).'\' + AND m.`active` = 1 + '); + } + + public static function preCall($module_name) + { + if (!parent::preCall($module_name)) + return false; + + if (($module_instance = Module::getInstanceByName($module_name))) + if (!$module_instance->currencies || ($module_instance->currencies && count(Currency::checkPaymentCurrencies($module_instance->id)))) + return true; + + return false; + } +} \ No newline at end of file From 94731d6e6cddb4d7e0e983ec1a6aa095bf145c4a Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Thu, 22 Nov 2012 17:52:23 +0100 Subject: [PATCH 043/316] [-] MO : block RSS encoding fixed #PSCFV-5689 --- modules/blockrss/blockrss.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/modules/blockrss/blockrss.php b/modules/blockrss/blockrss.php index 626eb220f..28c83cf78 100644 --- a/modules/blockrss/blockrss.php +++ b/modules/blockrss/blockrss.php @@ -65,9 +65,9 @@ class Blockrss extends Module if (Tools::isSubmit('submitBlockRss')) { $errors = array(); - $urlfeed = strval(Tools::getValue('urlfeed')); - $title = strval(Tools::getValue('title')); - $nbr = (int)(Tools::getValue('nbr')); + $urlfeed = Tools::getValue('urlfeed'); + $title = Tools::getValue('title'); + $nbr = (int)Tools::getValue('nbr'); if ($urlfeed AND !Validate::isUrl($urlfeed)) $errors[] = $this->l('Invalid feed URL'); @@ -82,13 +82,9 @@ class Blockrss extends Module /* Even if the feed was reachable, We need to make sure that the feed is well formated */ else { - try - { + try { $xmlFeed = new XML_Feed_Parser($contents); - - } - catch (XML_Feed_Parser_Exception $e) - { + } catch (XML_Feed_Parser_Exception $e) { $errors[] = $this->l('Invalid feed:').' '.$e->getMessage(); } } @@ -124,13 +120,13 @@ class Blockrss extends Module
'.$this->l('Settings').'
- +

'.$this->l('Create a title for the block (default: \'RSS feed\')').'

- +

'.$this->l('Add the URL of the feed you want to use (sample: http://news.google.com/?output=rss)').'

From 992897e78504019458ea500d88086e7a013749b8 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 22 Nov 2012 17:57:19 +0100 Subject: [PATCH 044/316] //fix sarah bug :p part 2 --- classes/PaymentModule.php | 825 +------------------------------------- 1 file changed, 3 insertions(+), 822 deletions(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 71226f0bc..89eb1883c 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -324,827 +324,6 @@ abstract class PaymentModuleCore extends Module // Make sure CarRule caches are empty CartRule::cleanCache(); - foreach ($order_detail_list as $key => $order_detail) - { - $order = $order_list[$key]; - if (!$order_creation_failed & isset($order->id)) - { - if (!$secure_key) - $message .= '
'.Tools::displayError('Warning: the secure key is empty, check your payment account before validation'); - // Optional message to attach to this order - if (isset($message) & !empty($message)) - { - $msg = new Message(); - $message = strip_tags($message, '
'); - if (Validate::isCleanHtml($message)) - { - $msg->message = $message; - $msg->id_order = intval($order->id); - $msg->private = 1; - $msg->add(); - } - } - - // Insert new Order detail list using cart for the current order - //$orderDetail = new OrderDetail(null, null, $this->context); - //$orderDetail->createList($order, $this->context->cart, $id_order_state); - - // Construct order detail table for the email - $products_list = ''; - $virtual_product = true; - foreach ($products as $key => $product) - { - $price = Product::getPriceStatic((int)$product['id_product'], false, ($product['id_product_attribute'] ? (int)$product['id_product_attribute'] : null), 6, null, false, true, $product['cart_quantity'], false, (int)$order->id_customer, (int)$order->id_cart, (int)$order->{Configuration::get('PS_TAX_ADDRESS_TYPE')}); - $price_wt = Product::getPriceStatic((int)$product['id_product'], true, ($product['id_product_attribute'] ? (int)$product['id_product_attribute'] : null), 2, null, false, true, $product['cart_quantity'], false, (int)$order->id_customer, (int)$order->id_cart, (int)$order->{Configuration::get('PS_TAX_ADDRESS_TYPE')}); - - $customization_quantity = 0; - if (isset($customized_datas[$product['id_product']][$product['id_product_attribute']])) - { - $customization_text = ''; - foreach ($customized_datas[$product['id_product']][$product['id_product_attribute']] as $customization) - { - if (isset($customization['datas'][Product::CUSTOMIZE_TEXTFIELD])) - foreach ($customization['datas'][Product::CUSTOMIZE_TEXTFIELD] as $text) - $customization_text .= $text['name'].': '.$text['value'].'
'; - - if (isset($customization['datas'][Product::CUSTOMIZE_FILE])) - $customization_text .= sprintf(Tools::displayError('%d image(s)'), count($customization['datas'][Product::CUSTOMIZE_FILE])).'
'; - - $customization_text .= '---
'; - } - - $customization_text = rtrim($customization_text, '---
'); - - $customization_quantity = (int)$product['customizationQuantityTotal']; - $products_list .= - ' - '.$product['reference'].' - '.$product['name'].(isset($product['attributes']) ? ' - '.$product['attributes'] : '').' - '.Tools::displayError('Customized').(!empty($customization_text) ? ' - '.$customization_text : '').' - '.Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt, $this->context->currency, false).' - '.$customization_quantity.' - '.Tools::displayPrice($customization_quantity * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt), $this->context->currency, false).' - '; - } - - if (!$customization_quantity || (int)$product['cart_quantity'] > $customization_quantity) - $products_list .= - ' - '.$product['reference'].' - '.$product['name'].(isset($product['attributes']) ? ' - '.$product['attributes'] : '').' - '.Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt, $this->context->currency, false).' - '.((int)$product['cart_quantity'] - $customization_quantity).' - '.Tools::displayPrice(((int)$product['cart_quantity'] - $customization_quantity) * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt), $this->context->currency, false).' - '; - - // Check if is not a virutal product for the displaying of shipping - if (!$product['is_virtual']) - $virtual_product &= false; - - } // end foreach ($products) - - $cart_rules_list = ''; - foreach ($cart_rules as $cart_rule) - { - $package = array('id_carrier' => $order->id_carrier, 'id_address' => $order->id_address_delivery, 'products' => $order->product_list); - $values = array( - 'tax_incl' => $cart_rule['obj']->getContextualValue(true, $this->context, CartRule::FILTER_ACTION_ALL, $package), - 'tax_excl' => $cart_rule['obj']->getContextualValue(false, $this->context, CartRule::FILTER_ACTION_ALL, $package) - ); - - // If the reduction is not applicable to this order, then continue with the next one - if (!$values['tax_excl']) - continue; - - $order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $values); - - /* IF - ** - This is not multi-shipping - ** - The value of the voucher is greater than the total of the order - ** - Partial use is allowed - ** - This is an "amount" reduction, not a reduction in % or a gift - ** THEN - ** The voucher is cloned with a new value corresponding to the remainder - */ - if (count($order_list) == 1 && $values['tax_incl'] > $order->total_products_wt && $cart_rule['obj']->partial_use == 1 && $cart_rule['obj']->reduction_amount > 0) - { - // Create a new voucher from the original - $voucher = new CartRule($cart_rule['obj']->id); // We need to instantiate the CartRule without lang parameter to allow saving it - unset($voucher->id); - - // Set a new voucher code - $voucher->code = empty($voucher->code) ? substr(md5($order->id.'-'.$order->id_customer.'-'.$cart_rule['obj']->id), 0, 16) : $voucher->code.'-2'; - if (preg_match('/\-([0-9]{1,2})\-([0-9]{1,2})$/', $voucher->code, $matches) && $matches[1] == $matches[2]) - $voucher->code = preg_replace('/'.$matches[0].'$/', '-'.(intval($matches[1]) + 1), $voucher->code); - - // Set the new voucher value - if ($voucher->reduction_tax) - $voucher->reduction_amount = $values['tax_incl'] - $order->total_products_wt; - else - $voucher->reduction_amount = $values['tax_excl'] - $order->total_products; - - $voucher->id_customer = $order->id_customer; - $voucher->quantity = 1; - if ($voucher->add()) - { - // If the voucher has conditions, they are now copied to the new voucher - CartRule::copyConditions($cart_rule['obj']->id, $voucher->id); - - $params = array( - '{voucher_amount}' => Tools::displayPrice($voucher->reduction_amount, $this->context->currency, false), - '{voucher_num}' => $voucher->code, - '{firstname}' => $this->context->customer->firstname, - '{lastname}' => $this->context->customer->lastname, - '{id_order}' => $order->reference, - '{order_name}' => $order->getUniqReference() - ); - Mail::Send( - (int)$order->id_lang, - 'voucher', - sprintf(Mail::l('New voucher regarding your order %s', (int)$order->id_lang), $order->reference), - $params, - $this->context->customer->email, - $this->context->customer->firstname.' '.$this->context->customer->lastname, - null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop - ); - } - } - - if ($id_order_state != Configuration::get('PS_OS_ERROR') && $id_order_state != Configuration::get('PS_OS_CANCELED') && !in_array($cart_rule['obj']->id, $cart_rule_used)) - { - $cart_rule_used[] = $cart_rule['obj']->id; - - // Create a new instance of Cart Rule without id_lang, in order to update its quantity - $cart_rule_to_update = new CartRule($cart_rule['obj']->id); - $cart_rule_to_update->quantity = max(0, $cart_rule_to_update->quantity - 1); - $cart_rule_to_update->update(); - } - - $cart_rules_list .= ' - - '.Tools::displayError('Voucher name:').' '.$cart_rule['obj']->name.' - '.($values['tax_incl'] != 0.00 ? '-' : '').Tools::displayPrice($values['tax_incl'], $this->context->currency, false).' - '; - } - - // Specify order id for message - $old_message = Message::getMessageByCartId((int)$this->context->cart->id); - if ($old_message) - { - $update_message = new Message((int)$old_message['id_message']); - $update_message->id_order = (int)$order->id; - $update_message->update(); - - // Add this message in the customer thread - $customer_thread = new CustomerThread(); - $customer_thread->id_contact = 0; - $customer_thread->id_customer = (int)$order->id_customer; - $customer_thread->id_shop = (int)$this->context->shop->id; - $customer_thread->id_order = (int)$order->id; - $customer_thread->id_lang = (int)$this->context->language->id; - $customer_thread->email = $this->context->customer->email; - $customer_thread->status = 'open'; - $customer_thread->token = Tools::passwdGen(12); - $customer_thread->add(); - - $customer_message = new CustomerMessage(); - $customer_message->id_customer_thread = $customer_thread->id; - $customer_message->id_employee = 0; - $customer_message->message = htmlentities($update_message->message, ENT_COMPAT, 'UTF-8'); - $customer_message->private = 0; - - if (!$customer_message->add()) - $this->errors[] = Tools::displayError('An error occurred while saving message'); - } - - // Hook validate order - Hook::exec('actionValidateOrder', array( - 'cart' => $this->context->cart, - 'order' => $order, - 'customer' => $this->context->customer, - 'currency' => $this->context->currency, - 'orderStatus' => $order_status - )); - - foreach ($this->context->cart->getProducts() as $product) - if ($order_status->logable) - ProductSale::addProductSale((int)$product['id_product'], (int)$product['cart_quantity']); - - if (Configuration::get('PS_STOCK_MANAGEMENT') && $order_detail->getStockState()) - { - $history = new OrderHistory(); - $history->id_order = (int)$order->id; - $history->changeIdOrderState(Configuration::get('PS_OS_OUTOFSTOCK'), $order, true); - $history->addWithemail(); - } - - // Set order state in order history ONLY even if the "out of stock" status has not been yet reached - // So you migth have two order states - $new_history = new OrderHistory(); - $new_history->id_order = (int)$order->id; - $new_history->changeIdOrderState((int)$id_order_state, $order, true); - $new_history->addWithemail(true, $extra_vars); - - unset($order_detail); - - // Order is reloaded because the status just changed - $order = new Order($order->id); - - // Send an e-mail to customer (one order = one email) - if ($id_order_state != Configuration::get('PS_OS_ERROR') && $id_order_state != Configuration::get('PS_OS_CANCELED') && $this->context->customer->id) - { - $invoice = new Address($order->id_address_invoice); - $delivery = new Address($order->id_address_delivery); - $delivery_state = $delivery->id_state ? new State($delivery->id_state) : false; - $invoice_state = $invoice->id_state ? new State($invoice->id_state) : false; - - $data = array( - '{firstname}' => $this->context->customer->firstname, - '{lastname}' => $this->context->customer->lastname, - '{email}' => $this->context->customer->email, - '{delivery_block_txt}' => $this->_getFormatedAddress($delivery, "\n"), - '{invoice_block_txt}' => $this->_getFormatedAddress($invoice, "\n"), - '{delivery_block_html}' => $this->_getFormatedAddress($delivery, '
', array( - 'firstname' => '%s', - 'lastname' => '%s' - )), - '{invoice_block_html}' => $this->_getFormatedAddress($invoice, '
', array( - 'firstname' => '%s', - 'lastname' => '%s' - )), - '{delivery_company}' => $delivery->company, - '{delivery_firstname}' => $delivery->firstname, - '{delivery_lastname}' => $delivery->lastname, - '{delivery_address1}' => $delivery->address1, - '{delivery_address2}' => $delivery->address2, - '{delivery_city}' => $delivery->city, - '{delivery_postal_code}' => $delivery->postcode, - '{delivery_country}' => $delivery->country, - '{delivery_state}' => $delivery->id_state ? $delivery_state->name : '', - '{delivery_phone}' => ($delivery->phone) ? $delivery->phone : $delivery->phone_mobile, - '{delivery_other}' => $delivery->other, - '{invoice_company}' => $invoice->company, - '{invoice_vat_number}' => $invoice->vat_number, - '{invoice_firstname}' => $invoice->firstname, - '{invoice_lastname}' => $invoice->lastname, - '{invoice_address2}' => $invoice->address2, - '{invoice_address1}' => $invoice->address1, - '{invoice_city}' => $invoice->city, - '{invoice_postal_code}' => $invoice->postcode, - '{invoice_country}' => $invoice->country, - '{invoice_state}' => $invoice->id_state ? $invoice_state->name : '', - '{invoice_phone}' => ($invoice->phone) ? $invoice->phone : $invoice->phone_mobile, - '{invoice_other}' => $invoice->other, - '{order_name}' => $order->getUniqReference(), - '{date}' => Tools::displayDate(date('Y-m-d H:i:s'), (int)$order->id_lang, 1), - '{carrier}' => $virtual_product ? Tools::displayError('No carrier') : $carrier->name, - '{payment}' => Tools::substr($order->payment, 0, 32), - '{products}' => $this->formatProductAndVoucherForEmail($products_list), - '{discounts}' => $this->formatProductAndVoucherForEmail($cart_rules_list), - '{total_paid}' => Tools::displayPrice($order->total_paid, $this->context->currency, false), - '{total_products}' => Tools::displayPrice($order->total_paid - $order->total_shipping - $order->total_wrapping + $order->total_discounts, $this->context->currency, false), - '{total_discounts}' => Tools::displayPrice($order->total_discounts, $this->context->currency, false), - '{total_shipping}' => Tools::displayPrice($order->total_shipping, $this->context->currency, false), - '{total_wrapping}' => Tools::displayPrice($order->total_wrapping, $this->context->currency, false)); - - if (is_array($extra_vars)) - $data = array_merge($data, $extra_vars); - - // Join PDF invoice - if ((int)Configuration::get('PS_INVOICE') && $order_status->invoice && $order->invoice_number) - { - $pdf = new PDF($order->getInvoicesCollection(), PDF::TEMPLATE_INVOICE, $this->context->smarty); - $file_attachement['content'] = $pdf->render(false); - $file_attachement['name'] = Configuration::get('PS_INVOICE_PREFIX', (int)$order->id_lang).sprintf('%06d', $order->invoice_number).'.pdf'; - $file_attachement['mime'] = 'application/pdf'; - } - else - $file_attachement = null; - - if (Validate::isEmail($this->context->customer->email)) - Mail::Send( - (int)$order->id_lang, - 'order_conf', - Mail::l('Order confirmation', (int)$order->id_lang), - $data, - $this->context->customer->email, - $this->context->customer->firstname.' '.$this->context->customer->lastname, - null, - null, - $file_attachement, - null, _PS_MAIL_DIR_, false, (int)$order->id_shop - ); - } - - // updates stock in shops - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) - { - $product_list = $order->getProducts(); - foreach ($product_list as $product) - { - // if the available quantities depends on the physical stock - if (StockAvailable::dependsOnStock($product['product_id'])) - { - // synchronizes - StockAvailable::synchronize($product['product_id'], $order->id_shop); - } - } - } - } - else - { - $error = Tools::displayError('Order creation failed'); - Logger::addLog($error, 4, '0000002', 'Cart', intval($order->id_cart)); - die($error); - } - } // End foreach $order_detail_list - // Use the last order as currentOrder - $this->currentOrder = (int)$order->id; - return true; - } - else - { - $error = Tools::displayError('Cart cannot be loaded or an order has already been placed using this cart'); - Logger::addLog($error, 4, '0000001', 'Cart', intval($this->context->cart->id)); - die($error); - } - } - - public function formatProductAndVoucherForEmail($content) - { - return ' - - - - - - - '.$content.'
'; - } - - /** - * @param Object Address $the_address that needs to be txt formated - * @return String the txt formated address block - */ - protected function _getTxtFormatedAddress($the_address) - { - $adr_fields = AddressFormat::getOrderedAddressFields($the_address->id_country, false, true); - $r_values = array(); - foreach ($adr_fields as $fields_line) - { - $tmp_values = array(); - foreach (explode(' ', $fields_line) as $field_item) - { - $field_item = trim($field_item); - $tmp_values[] = $the_address->{$field_item}; - } - $r_values[] = implode(' ', $tmp_values); - } - - $out = implode("\n", $r_values); - return $out; - } - - /** - * @param Object Address $the_address that needs to be txt formated - * @return String the txt formated address block - */ - - protected function _getFormatedAddress(Address $the_address, $line_sep, $fields_style = array()) - { - return AddressFormat::generateAddress($the_address, array('avoid' => array()), $line_sep, ' ', $fields_style); - } - - /** - * @param int $id_currency : this parameter is optionnal but on 1.5 version of Prestashop, it will be REQUIRED - * @return Currency - */ - public function getCurrency($current_id_currency = null) - { - if (!(int)$current_id_currency) - $current_id_currency = Context::getContext()->currency->id; - - if (!$this->currencies) - return false; - if ($this->currencies_mode == 'checkbox') - { - $currencies = Currency::getPaymentCurrencies($this->id); - return $currencies; - } - elseif ($this->currencies_mode == 'radio') - { - $currencies = Currency::getPaymentCurrenciesSpecial($this->id); - $currency = $currencies['id_currency']; - if ($currency == -1) - $id_currency = (int)$current_id_currency; - elseif ($currency == -2) - $id_currency = (int)Configuration::get('PS_CURRENCY_DEFAULT'); - else - $id_currency = $currency; - } - if (!isset($id_currency) || empty($id_currency)) - return false; - return (new Currency($id_currency)); - } - - /** - * Allows specified payment modules to be used by a specific currency - * - * @since 1.4.5 - * @param int $id_currency - * @param array $id_module_list - * @return boolean - */ - public static function addCurrencyPermissions($id_currency, array $id_module_list = array()) - { - $values = ''; - if (count($id_module_list) == 0) - { - // fetch all installed module ids - $modules = PaymentModuleCore::getInstalledPaymentModules(); - foreach ($modules as $module) - $id_module_list[] = $module['id_module']; - } - - foreach ($id_module_list as $id_module) - $values .= '('.(int)$id_module.','.(int)$id_currency.'),'; - - if (!empty($values)) - { - return Db::getInstance()->execute(' - INSERT INTO `'._DB_PREFIX_.'module_currency` (`id_module`, `id_currency`) - VALUES '.rtrim($values, ',') - ); - } - - return true; - } - - /** - * List all installed and active payment modules - * @see Module::getPaymentModules() if you need a list of module related to the user context - * - * @since 1.4.5 - * @return array module informations - */ - public static function getInstalledPaymentModules() - { - $hook_payment = 'Payment'; - if (Db::getInstance()->getValue('SELECT `id_hook` FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'displayPayment\'')) - $hook_payment = 'displayPayment'; - - return Db::getInstance()->executeS(' - SELECT DISTINCT m.`id_module`, h.`id_hook`, m.`name`, hm.`position` - FROM `'._DB_PREFIX_.'module` m - LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module` - LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook` - WHERE h.`name` = \''.pSQL($hook_payment).'\' - AND m.`active` = 1 - '); - } - - - public static function preCall($module_name) - { - if (!parent::preCall($module_name)) - return false; - - if (($module_instance = Module::getInstanceByName($module_name))) - if (!$module_instance->currencies || ($module_instance->currencies && count(Currency::checkPaymentCurrencies($module_instance->id)))) - return true; - - return false; - } - -} - -======= - -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6844 $ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -abstract class PaymentModuleCore extends Module -{ - /** @var integer Current order's id */ - public $currentOrder; - public $currencies = true; - public $currencies_mode = 'checkbox'; - - public function install() - { - if (!parent::install()) - return false; - - // Insert currencies availability - if ($this->currencies_mode == 'checkbox') - { - if (!$this->addCheckboxCurrencyRestrictionsForModule()) - return false; - } - elseif ($this->currencies_mode == 'radio') - { - if (!$this->addRadioCurrencyRestrictionsForModule()) - return false; - } - else - Tools::displayError('No currency mode for payment module'); - - // Insert countries availability - $return = $this->addCheckboxCountryRestrictionsForModule(); - - return $return; - } - - public function uninstall() - { - if (!Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_country` WHERE id_module = '.(int)$this->id) - || !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_currency` WHERE id_module = '.(int)$this->id) - || !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_group` WHERE id_module = '.(int)$this->id)) - return false; - return parent::uninstall(); - } - - - /** - * Add checkbox currency restrictions for a new module - * @param integer id_module - * @param array $shops - */ - public function addCheckboxCurrencyRestrictionsForModule(array $shops = array()) - { - if (!$shops) - $shops = Shop::getShops(true, null, true); - - foreach ($shops as $s) - { - if (!Db::getInstance()->execute(' - INSERT INTO `'._DB_PREFIX_.'module_currency` (`id_module`, `id_shop`, `id_currency`) - SELECT '.(int)$this->id.', "'.(int)$s.'", `id_currency` FROM `'._DB_PREFIX_.'currency` WHERE deleted = 0')) - return false; - } - return true; - } - - /** - * Add radio currency restrictions for a new module - * @param integer id_module - * @param array $shops - */ - public function addRadioCurrencyRestrictionsForModule(array $shops = array()) - { - if (!$shops) - $shops = Shop::getShops(true, null, true); - - foreach ($shops as $s) - if (!Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'module_currency` (`id_module`, `id_shop`, `id_currency`) - VALUES ('.(int)$this->id.', "'.(int)$s.'", -2)')) - return false; - return true; - } - - /** - * Add checkbox country restrictions for a new module - * @param integer id_module - * @param array $shops - */ - public function addCheckboxCountryRestrictionsForModule(array $shops = array()) - { - $countries = Country::getCountries((int)Context::getContext()->language->id, true); //get only active country - $country_ids = array(); - foreach ($countries as $country) - $country_ids[] = $country['id_country']; - return Country::addModuleRestrictions($shops, $countries, array(array('id_module' => (int)$this->id))); - } - - /** - * Validate an order in database - * Function called from a payment module - * - * @param integer $id_cart Value - * @param integer $id_order_state Value - * @param float $amount_paid Amount really paid by customer (in the default currency) - * @param string $payment_method Payment method (eg. 'Credit card') - * @param string $message Message to attach to order - */ - public function validateOrder($id_cart, $id_order_state, $amount_paid, $payment_method = 'Unknown', - $message = null, $extra_vars = array(), $currency_special = null, $dont_touch_amount = false, - $secure_key = false, Shop $shop = null) - { - $this->context->cart = new Cart($id_cart); - $this->context->customer = new Customer($this->context->cart->id_customer); - $this->context->language = new Language($this->context->cart->id_lang); - $this->context->shop = ($shop ? $shop : new Shop($this->context->cart->id_shop)); - $id_currency = $currency_special ? (int)$currency_special : (int)$this->context->cart->id_currency; - $this->context->currency = new Currency($id_currency, null, $this->context->shop->id); - if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_delivery') - $context_country = $this->context->country; - - $order_status = new OrderState((int)$id_order_state, (int)$this->context->language->id); - if (!Validate::isLoadedObject($order_status)) - throw new PrestaShopException('Can\'t load Order state status'); - - if (!$this->active) - die(Tools::displayError()); - // Does order already exists ? - if (Validate::isLoadedObject($this->context->cart) && $this->context->cart->OrderExists() == false) - { - if ($secure_key !== false && $secure_key != $this->context->cart->secure_key) - die(Tools::displayError()); - - // For each package, generate an order - $delivery_option_list = $this->context->cart->getDeliveryOptionList(); - $package_list = $this->context->cart->getPackageList(); - $cart_delivery_option = $this->context->cart->getDeliveryOption(); - - // If some delivery options are not defined, or not valid, use the first valid option - foreach ($delivery_option_list as $id_address => $package) - if (!isset($cart_delivery_option[$id_address]) || !array_key_exists($cart_delivery_option[$id_address], $package)) - foreach ($package as $key => $val) - { - $cart_delivery_option[$id_address] = $key; - break; - } - - $order_list = array(); - $order_detail_list = array(); - $reference = Order::generateReference(); - $this->currentOrderReference = $reference; - - $order_creation_failed = false; - $cart_total_paid = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH), 2); - - if ($this->context->cart->orderExists()) - { - $error = Tools::displayError('An order has already been placed using this cart.'); - Logger::addLog($error, 4, '0000001', 'Cart', intval($this->context->cart->id)); - die($error); - } - - foreach ($cart_delivery_option as $id_address => $key_carriers) - foreach ($delivery_option_list[$id_address][$key_carriers]['carrier_list'] as $id_carrier => $data) - foreach ($data['package_list'] as $id_package) - { - // Rewrite the id_warehouse - $package_list[$id_address][$id_package]['id_warehouse'] = $this->context->cart->getPackageIdWarehouse($package_list[$id_address][$id_package], (int)$id_carrier); - $package_list[$id_address][$id_package]['id_carrier'] = $id_carrier; - } - // Make sure CarRule caches are empty - CartRule::cleanCache(); - - foreach ($package_list as $id_address => $packageByAddress) - foreach ($packageByAddress as $id_package => $package) - { - $order = new Order(); - $order->product_list = $package['product_list']; - - if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_delivery') - { - $address = new Address($id_address); - $this->context->country = new Country($address->id_country, $this->context->cart->id_lang); - } - - $carrier = null; - if (!$this->context->cart->isVirtualCart() && isset($package['id_carrier'])) - { - $carrier = new Carrier($package['id_carrier'], $this->context->cart->id_lang); - $order->id_carrier = (int)$carrier->id; - $id_carrier = (int)$carrier->id; - } - else - { - $order->id_carrier = 0; - $id_carrier = 0; - } - - $order->id_customer = (int)$this->context->cart->id_customer; - $order->id_address_invoice = (int)$this->context->cart->id_address_invoice; - $order->id_address_delivery = (int)$id_address; - $order->id_currency = $this->context->currency->id; - $order->id_lang = (int)$this->context->cart->id_lang; - $order->id_cart = (int)$this->context->cart->id; - $order->reference = $reference; - $order->id_shop = (int)$this->context->shop->id; - $order->id_shop_group = (int)$this->context->shop->id_shop_group; - - $order->secure_key = ($secure_key ? pSQL($secure_key) : pSQL($this->context->customer->secure_key)); - $order->payment = $payment_method; - if (isset($this->name)) - $order->module = $this->name; - $order->recyclable = $this->context->cart->recyclable; - $order->gift = (int)$this->context->cart->gift; - $order->gift_message = $this->context->cart->gift_message; - $order->conversion_rate = $this->context->currency->conversion_rate; - $amount_paid = !$dont_touch_amount ? Tools::ps_round((float)$amount_paid, 2) : $amount_paid; - $order->total_paid_real = 0; - - $order->total_products = (float)$this->context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS, $order->product_list, $id_carrier); - $order->total_products_wt = (float)$this->context->cart->getOrderTotal(true, Cart::ONLY_PRODUCTS, $order->product_list, $id_carrier); - - $order->total_discounts_tax_excl = (float)abs($this->context->cart->getOrderTotal(false, Cart::ONLY_DISCOUNTS, $order->product_list, $id_carrier)); - $order->total_discounts_tax_incl = (float)abs($this->context->cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS, $order->product_list, $id_carrier)); - $order->total_discounts = $order->total_discounts_tax_incl; - - $order->total_shipping_tax_excl = (float)$this->context->cart->getPackageShippingCost((int)$id_carrier, false, null, $order->product_list); - $order->total_shipping_tax_incl = (float)$this->context->cart->getPackageShippingCost((int)$id_carrier, true, null, $order->product_list); - $order->total_shipping = $order->total_shipping_tax_incl; - - if (!is_null($carrier) && Validate::isLoadedObject($carrier)) - $order->carrier_tax_rate = $carrier->getTaxesRate(new Address($this->context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')})); - - $order->total_wrapping_tax_excl = (float)abs($this->context->cart->getOrderTotal(false, Cart::ONLY_WRAPPING, $order->product_list, $id_carrier)); - $order->total_wrapping_tax_incl = (float)abs($this->context->cart->getOrderTotal(true, Cart::ONLY_WRAPPING, $order->product_list, $id_carrier)); - $order->total_wrapping = $order->total_wrapping_tax_incl; - - $order->total_paid_tax_excl = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(false, Cart::BOTH, $order->product_list, $id_carrier), 2); - $order->total_paid_tax_incl = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH, $order->product_list, $id_carrier), 2); - $order->total_paid = $order->total_paid_tax_incl; - - $order->invoice_date = '0000-00-00 00:00:00'; - $order->delivery_date = '0000-00-00 00:00:00'; - - // Creating order - $result = $order->add(); - - if (!$result) - throw new PrestaShopException('Can\'t save Order'); - - // Amount paid by customer is not the right one -> Status = payment error - // We don't use the following condition to avoid the float precision issues : http://www.php.net/manual/en/language.types.float.php - // if ($order->total_paid != $order->total_paid_real) - // We use number_format in order to compare two string - if ($order_status->logable && number_format($cart_total_paid, 2) != number_format($amount_paid, 2)) - $id_order_state = Configuration::get('PS_OS_ERROR'); - - $order_list[] = $order; - - // Insert new Order detail list using cart for the current order - $order_detail = new OrderDetail(null, null, $this->context); - $order_detail->createList($order, $this->context->cart, $id_order_state, $order->product_list, 0, true, $package_list[$id_address][$id_package]['id_warehouse']); - $order_detail_list[] = $order_detail; - - // Adding an entry in order_carrier table - if (!is_null($carrier)) - { - $order_carrier = new OrderCarrier(); - $order_carrier->id_order = (int)$order->id; - $order_carrier->id_carrier = (int)$id_carrier; - $order_carrier->weight = (float)$order->getTotalWeight(); - $order_carrier->shipping_cost_tax_excl = (float)$order->total_shipping_tax_excl; - $order_carrier->shipping_cost_tax_incl = (float)$order->total_shipping_tax_incl; - $order_carrier->add(); - } - } - - // The country can only change if the address used for the calculation is the delivery address, and if multi-shipping is activated - if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_delivery') - $this->context->country = $context_country; - - // Register Payment only if the order status validate the order - if ($order_status->logable) - { - // $order is the last order loop in the foreach - // The method addOrderPayment of the class Order make a create a paymentOrder - // linked to the order reference and not to the order id - if (isset($extra_vars['transaction_id'])) - $transaction_id = $extra_vars['transaction_id']; - else - $transaction_id = null; - - if (!$order->addOrderPayment($amount_paid, null, $transaction_id)) - throw new PrestaShopException('Can\'t save Order Payment'); - } - - // Next ! - $only_one_gift = false; - $cart_rule_used = array(); - $products = $this->context->cart->getProducts(); - $cart_rules = $this->context->cart->getCartRules(); - - // Make sure CarRule caches are empty - CartRule::cleanCache(); - foreach ($order_detail_list as $key => $order_detail) { $order = $order_list[$key]; @@ -1354,7 +533,7 @@ abstract class PaymentModuleCore extends Module { $history = new OrderHistory(); $history->id_order = (int)$order->id; - $history->changeIdOrderState(Configuration::get('PS_OS_OUTOFSTOCK'), $order); + $history->changeIdOrderState(Configuration::get('PS_OS_OUTOFSTOCK'), $order, true); $history->addWithemail(); } @@ -1623,6 +802,7 @@ abstract class PaymentModuleCore extends Module '); } + public static function preCall($module_name) { if (!parent::preCall($module_name)) @@ -1634,4 +814,5 @@ abstract class PaymentModuleCore extends Module return false; } + } \ No newline at end of file From 308b27d22ba789c81a36559b7d835c0c550ffad1 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Thu, 22 Nov 2012 18:13:53 +0100 Subject: [PATCH 045/316] [-] FO : store locator working hours fixed #PSCFV-5709 --- themes/default/js/stores.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/js/stores.js b/themes/default/js/stores.js index 7fdccd8c7..a70c57057 100644 --- a/themes/default/js/stores.js +++ b/themes/default/js/stores.js @@ -110,7 +110,7 @@ function searchLocationsNear(center) parseFloat(markerNodes[i].getAttribute('lng'))); createOption(name, distance, i); - createMarker(latlng, name, address, addressNoHtml, other, id_store, has_store_picture); + createMarker(latlng, name, address, other, id_store, has_store_picture); bounds.extend(latlng); $('#stores-table tr:last').after(''+parseInt(i + 1)+''+name+''+(has_store_picture == 1 ? '
' : '')+''+address+(phone != '' ? '

'+translation_4+' '+phone : '')+''+distance+' '+distance_unit+''); From 625e0f0c5b8937216364dad637d7775bf7bff331 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 22 Nov 2012 18:27:07 +0100 Subject: [PATCH 046/316] //small fix in adminThemeController --- controllers/admin/AdminThemesController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 5d498d56e..029f43503 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -211,9 +211,10 @@ class AdminThemesControllerCore extends AdminController if (!$paypal_installed && in_array($iso_code, $paypal_countries)) { - $this->warnings[] = $this->l('The mobile theme only works with the PayPal\'s payment module at this time. Please activate the module to enable payments.') - .'
'. - $this->l('In order to use the mobile theme you have to install and configure the PayPal module.'); + if (!$this->isXmlHttpRequest()) + $this->warnings[] = $this->l('The mobile theme only works with the PayPal\'s payment module at this time. Please activate the module to enable payments.') + .'
'. + $this->l('In order to use the mobile theme you have to install and configure the PayPal module.'); } } From 92541b8aca47dda1ce22cb798c146b254b325ede Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Thu, 22 Nov 2012 18:42:56 +0100 Subject: [PATCH 047/316] [-] FO : fixed bug #PSCFV-5649 - Product comparison error when Features are not set --- themes/default/products-comparison.tpl | 288 ++++++++++++------------- 1 file changed, 144 insertions(+), 144 deletions(-) diff --git a/themes/default/products-comparison.tpl b/themes/default/products-comparison.tpl index fd5467a61..0cf88b0de 100644 --- a/themes/default/products-comparison.tpl +++ b/themes/default/products-comparison.tpl @@ -1,144 +1,144 @@ -{* -* 2007-2012 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @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 -*} - -{capture name=path}{l s='Product Comparison'}{/capture} - -{include file="$tpl_dir./breadcrumb.tpl"} -

{l s='Product Comparison'}

- -{if $hasProduct} -
- - - {assign var='taxes_behavior' value=false} - {if $use_taxes && (!$priceDisplay || $priceDisplay == 2)} - {assign var='taxes_behavior' value=true} - {/if} - {foreach from=$products item=product name=for_products} - {assign var='replace_id' value=$product->id|cat:'|'} - - - {/foreach} - - - - - {section loop=$products|count step=1 start=0 name=td} - - {/section} - - - {if $ordered_features} - {foreach from=$ordered_features item=feature} - - {cycle values='comparison_feature_odd,comparison_feature_even' assign='classname'} - - - {foreach from=$products item=product name=for_products} - {assign var='product_id' value=$product->id} - {assign var='feature_id' value=$feature.id_feature} - {if isset($product_features[$product_id])} - {assign var='tab' value=$product_features[$product_id]} - - {else} - - {/if} - {/foreach} - - {/foreach} - {else} - - - - - {/if} - - {$HOOK_EXTRA_PRODUCT_COMPARISON} -
- - {$product->name|escape:html:'UTF-8'} - -
{$product->name|truncate:27:'...'|escape:'htmlall':'UTF-8'}
- - {l s='View'} - -
-
- {if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE} -

{convertPrice price=$product->getPrice($taxes_behavior)}

-
- {if $product->on_sale} - {l s='On sale!'} - {elseif $product->specificPrice AND $product->specificPrice.reduction} - {l s='Reduced price!'} - {/if} -
- - {if !empty($product->unity) && $product->unit_price_ratio > 0.000000} - {math equation="pprice / punit_price" pprice=$product->getPrice($taxes_behavior) punit_price=$product->unit_price_ratio assign=unit_price} -

{convertPrice price=$unit_price} {l s='per %s' sprintf=$product->unity|escape:'htmlall':'UTF-8'}

- {else} -   - {/if} - {/if} -
- -

- {if !(($product->quantity <= 0 && !$product->available_later) OR ($product->quantity != 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE)} - {l s='Availability:'} - quantity <= 0} class="warning-inline"{/if}> - {if $product->quantity <= 0} - {if $allow_oosp} - {$product->available_later|escape:'htmlall':'UTF-8'} - {else} - {l s='This product is no longer in stock'} - {/if} - {else} - {$product->available_now|escape:'htmlall':'UTF-8'} - {/if} - - {/if} -

- {l s='Remove'} - {if (!$product->hasAttributes() OR (isset($add_prod_display) AND ($add_prod_display == 1))) AND $product->minimal_quantity == 1 AND $product->customizable != 2 AND !$PS_CATALOG_MODE} - {if ($product->quantity > 0 OR $product->allow_oosp)} - id}&token={$static_token}&add")}" title="{l s='Add to cart'}">{l s='Add to cart'} - {else} - {l s='Add to cart'} - {/if} - {else} -
- {/if} -
-
- {l s='Features'} -
- {$feature.name|escape:'htmlall':'UTF-8'} - {$tab[$feature_id]|escape:'htmlall':'UTF-8'}
{l s='No features to compare'}
-
-{else} -

{l s='There are no products selected for comparison'}

-{/if} - +{* +* 2007-2012 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @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 +*} + +{capture name=path}{l s='Product Comparison'}{/capture} + +{include file="$tpl_dir./breadcrumb.tpl"} +

{l s='Product Comparison'}

+ +{if $hasProduct} +
+ + + {assign var='taxes_behavior' value=false} + {if $use_taxes && (!$priceDisplay || $priceDisplay == 2)} + {assign var='taxes_behavior' value=true} + {/if} + {foreach from=$products item=product name=for_products} + {assign var='replace_id' value=$product->id|cat:'|'} + + + {/foreach} + + + + + {section loop=$products|count step=1 start=0 name=td} + + {/section} + + + {if $ordered_features} + {foreach from=$ordered_features item=feature} + + {cycle values='comparison_feature_odd,comparison_feature_even' assign='classname'} + + + {foreach from=$products item=product name=for_products} + {assign var='product_id' value=$product->id} + {assign var='feature_id' value=$feature.id_feature} + {if isset($product_features[$product_id])} + {assign var='tab' value=$product_features[$product_id]} + + {else} + + {/if} + {/foreach} + + {/foreach} + {else} + + + + + {/if} + + {$HOOK_EXTRA_PRODUCT_COMPARISON} +
+ + {$product->name|escape:html:'UTF-8'} + +
{$product->name|truncate:27:'...'|escape:'htmlall':'UTF-8'}
+ + {l s='View'} + +
+
+ {if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE} +

{convertPrice price=$product->getPrice($taxes_behavior)}

+
+ {if $product->on_sale} + {l s='On sale!'} + {elseif $product->specificPrice AND $product->specificPrice.reduction} + {l s='Reduced price!'} + {/if} +
+ + {if !empty($product->unity) && $product->unit_price_ratio > 0.000000} + {math equation="pprice / punit_price" pprice=$product->getPrice($taxes_behavior) punit_price=$product->unit_price_ratio assign=unit_price} +

{convertPrice price=$unit_price} {l s='per %s' sprintf=$product->unity|escape:'htmlall':'UTF-8'}

+ {else} +   + {/if} + {/if} +
+ +

+ {if !(($product->quantity <= 0 && !$product->available_later) OR ($product->quantity != 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE)} + {l s='Availability:'} + quantity <= 0} class="warning-inline"{/if}> + {if $product->quantity <= 0} + {if $allow_oosp} + {$product->available_later|escape:'htmlall':'UTF-8'} + {else} + {l s='This product is no longer in stock'} + {/if} + {else} + {$product->available_now|escape:'htmlall':'UTF-8'} + {/if} + + {/if} +

+ {l s='Remove'} + {if (!$product->hasAttributes() OR (isset($add_prod_display) AND ($add_prod_display == 1))) AND $product->minimal_quantity == 1 AND $product->customizable != 2 AND !$PS_CATALOG_MODE} + {if ($product->quantity > 0 OR $product->allow_oosp)} + id}&token={$static_token}&add")}" title="{l s='Add to cart'}">{l s='Add to cart'} + {else} + {l s='Add to cart'} + {/if} + {else} +
+ {/if} +
+
+ {l s='Features'} +
+ {$feature.name|escape:'htmlall':'UTF-8'} + {if (isset($tab[$feature_id]))}{$tab[$feature_id]|escape:'htmlall':'UTF-8'}{/if}
{l s='No features to compare'}
+
+{else} +

{l s='There are no products selected for comparison'}

+{/if} + From e3457836d81c0436b2b4ce28f404a64747b7674e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 22 Nov 2012 19:02:55 +0100 Subject: [PATCH 048/316] [-] BO: Fix #PSCFV-5207 update of some fields on multishop with deleted property --- classes/Carrier.php | 2 + classes/ObjectModel.php | 48 +++++++++++++++++++ classes/controller/AdminController.php | 25 +++++----- controllers/admin/AdminCarriersController.php | 23 +++++---- 4 files changed, 75 insertions(+), 23 deletions(-) diff --git a/classes/Carrier.php b/classes/Carrier.php index 86f10851d..6beb272b0 100644 --- a/classes/Carrier.php +++ b/classes/Carrier.php @@ -842,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/ObjectModel.php b/classes/ObjectModel.php index 4946ae6b8..9dab94460 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -518,6 +518,54 @@ abstract class ObjectModelCore return $result; } + + /** + * Duplicate current object to database + * + * @return new object + */ + public function duplicateObject() + { + $definition = ObjectModel::getDefinition($this); + + $res = Db::getInstance()->getRow(' + SELECT * + FROM `'._DB_PREFIX_.bqSQL($definition['table']).'` + WHERE `'.bqSQL($definition['primary']).'` = '.(int)$this->id + ); + if (!$res) + return false; + unset($res[$definition['primary']]); + + if (!Db::getInstance()->insert($definition['table'], $res)) + return false; + + $object_id = Db::getInstance()->Insert_ID(); + + if ($definition['multilang']) + { + $res = Db::getInstance()->executeS(' + SELECT * + FROM `'._DB_PREFIX_.bqSQL($definition['table']).'_lang` + WHERE `'.bqSQL($definition['primary']).'` = '.(int)$this->id + ); + + if (!$res) + return false; + + foreach ($res as $row) + { + $row[$definition['primary']] = (int)$object_id; + if (!Db::getInstance()->insert($definition['table'].'_lang', $row)) + return false; + } + } + + $object_duplicated = new $definition['classname']((int)$object_id); + $object_duplicated->duplicateShops((int)$this->id); + + return $object_duplicated; + } /** * Update current object to database diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 9ba604af3..2651d9286 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -696,20 +696,19 @@ class AdminControllerCore extends Controller if ($this->deleted && $this->beforeDelete($object)) { // Create new one with old objet values - $object_new = new $this->className($object->id); - $object_new->id = null; - $object_new->date_add = ''; - $object_new->date_upd = ''; - - // Update old object to deleted - $object->deleted = 1; - $object->update(); - - // Update new object with post values - $this->copyFromPost($object_new, $this->table); - $result = $object_new->add(); + $object_new = $object->duplicateObject(); if (Validate::isLoadedObject($object_new)) - $this->afterDelete($object_new, $object->id); + { + // Update old object to deleted + $object->deleted = 1; + $object->update(); + + // Update new object with post values + $this->copyFromPost($object_new, $this->table); + $result = $object_new->update(); + if (Validate::isLoadedObject($object_new)) + $this->afterDelete($object_new, $object->id); + } } else { diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index 715045420..989457d84 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -472,17 +472,20 @@ class AdminCarriersControllerCore extends AdminController $current_carrier = new Carrier($id); if (!Validate::isLoadedObject($current_carrier)) throw new PrestaShopException('Cannot load Carrier object'); - // Set flag deteled to true for historization - $current_carrier->deleted = true; - $current_carrier->update(); - - // Create new carrier - $new_carrier = new Carrier(); - // Fill the new carrier object - $this->copyFromPost($new_carrier, $this->table); - $new_carrier->position = $current_carrier->position; - if ($new_carrier->add()) + + // Duplicate current Carrier + $new_carrier = $current_carrier->duplicateObject(); + if (Validate::isLoadedObject($new_carrier)) { + // Set flag deteled to true for historization + $current_carrier->deleted = true; + $current_carrier->update(); + + // Fill the new carrier object + $this->copyFromPost($new_carrier, $this->table); + $new_carrier->position = $current_carrier->position; + $new_carrier->update(); + $this->updateAssoShop($new_carrier->id); $new_carrier->copyCarrierData((int)$current_carrier->id); $this->changeGroups($new_carrier->id); From 77b80d8ec23e3928c7e93b0cbcb16e7bacba90e3 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Thu, 22 Nov 2012 19:01:48 +0100 Subject: [PATCH 049/316] [-] FO : fixed parse error on ContactController.php #PSCFV-5803 --- controllers/front/ContactController.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php index fa1f7ecda..8746bfe09 100644 --- a/controllers/front/ContactController.php +++ b/controllers/front/ContactController.php @@ -265,24 +265,22 @@ class ContactControllerCore extends FrontController $this->context->smarty->assign('isLogged', 1); $products = array(); + $result = Db::getInstance()->executeS(' + SELECT id_order + FROM '._DB_PREFIX_.'orders + WHERE id_customer = '.(int)$this->context->customer->id.' ORDER BY date_add'); $orders = array(); - $getOrders = Db::getInstance()->executeS(' - SELECT id_order - FROM '._DB_PREFIX_.'orders - WHERE id_customer = '.(int)$this->context->customer->id.' ORDER BY date_add'); - $order_tab = array(); - foreach ($getOrders as $row) + foreach ($result as $row) { $order = new Order($row['id_order']); - $date = explode(' ', $order->date_add); - $orders[] = + $date = explode(' ', $order->date_add); $tmp = $order->getProducts(); foreach ($tmp as $key => $val) $products[$row['id_order']][$val['product_id']] = array('value' => $val['product_id'], 'label' => $val['product_name']); - $order_tab[] = array('value' => $order->id, 'label' => $order->getUniqReference().' - '.Tools::displayDate($date[0], $this->context->language->id), 'selected' => (int)Tools::getValue('id_order') == $order->id); + $orders[] = array('value' => $order->id, 'label' => $order->getUniqReference().' - '.Tools::displayDate($date[0], $this->context->language->id), 'selected' => (int)Tools::getValue('id_order') == $order->id); } - $this->context->smarty->assign('orderList', $order_tab); + $this->context->smarty->assign('orderList', $orders); $this->context->smarty->assign('orderedProductList', $products); } } From 6171d1af590c34ef3fbefd8f2e997d17baca2383 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Thu, 22 Nov 2012 19:49:20 +0100 Subject: [PATCH 050/316] [-] BO : fixed filters on statuses tab #PSCFV-5763 --- classes/helper/HelperList.php | 2 +- controllers/admin/AdminStatusesController.php | 26 ++++++++++++------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index b7deb6e3d..1df950daa 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -261,7 +261,7 @@ class HelperListCore extends Helper $path_to_image = _PS_IMG_DIR_.$params['image'].'/'.Image::getImgFolderStatic($tr['id_image']).(int)$tr['id_image'].'.'.$this->imageType; $this->_list[$index][$key] = ImageManager::thumbnail($path_to_image, $this->table.'_mini_'.$item_id.'.'.$this->imageType, 45, $this->imageType); } - elseif (isset($params['icon']) && (isset($params['icon'][$tr[$key]]) || isset($params['icon']['default']))) + elseif (isset($params['icon']) && isset($tr[$key]) && (isset($params['icon'][$tr[$key]]) || isset($params['icon']['default']))) { if (isset($params['icon'][$tr[$key]]) && is_array($params['icon'][$tr[$key]])) $this->_list[$index][$key] = array( diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php index 35ed6c7c5..aa1f49146 100644 --- a/controllers/admin/AdminStatusesController.php +++ b/controllers/admin/AdminStatusesController.php @@ -50,7 +50,7 @@ class AdminStatusesControllerCore extends AdminController if (Tools::isSubmit('updateorder_return_state')) $this->display = 'edit'; - parent::init(); + return parent::init(); } /** @@ -114,7 +114,6 @@ class AdminStatusesControllerCore extends AdminController 'width' => 120 ) ); - } /** @@ -142,10 +141,6 @@ class AdminStatusesControllerCore extends AdminController 'color' => 'color' ) ); - - // call postProcess() for take care about actions and filters - $this->postProcess(); - $this->toolbar_title = $this->l('Return statuses'); } protected function initOrderReturnsForm() @@ -193,8 +188,14 @@ class AdminStatusesControllerCore extends AdminController $lists = parent::renderList(); //init and render the second list + $this->_filter = false; $this->initOrdersReturnsList(); + + // call postProcess() to take care of actions and filters + $this->postProcess(); + $this->toolbar_title = $this->l('Return statuses'); $this->checkFilterForOrdersReturnsList(); + parent::initToolbar(); $lists .= parent::renderList(); @@ -393,7 +394,6 @@ class AdminStatusesControllerCore extends AdminController return $helper->generateForm($this->fields_form); } - protected function getTemplates($iso_code) { $array = array(); @@ -410,7 +410,6 @@ class AdminStatusesControllerCore extends AdminController return $array; } - public function postProcess() { if (Tools::isSubmit($this->table.'Orderby') || Tools::isSubmit($this->table.'Orderway')) @@ -501,6 +500,13 @@ class AdminStatusesControllerCore extends AdminController else return parent::postProcess(); } + + protected function filterToField($key, $filter) + { + if ($this->table == 'order_state') + $this->initOrderStatutsList(); + elseif ($this->table == 'order_return_state') + $this->initOrdersReturnsList(); + return parent::filterToField($key, $filter); + } } - - From bcac1037fb35554b2882faa5a122d65d097aaf00 Mon Sep 17 00:00:00 2001 From: adonis karavokyros Date: Thu, 22 Nov 2012 21:19:12 +0100 Subject: [PATCH 051/316] Clean history.js js selectors should be more simple in order to be more flexible in theme development --- themes/default/js/history.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/themes/default/js/history.js b/themes/default/js/history.js index 6c8f88cbc..a489dc649 100644 --- a/themes/default/js/history.js +++ b/themes/default/js/history.js @@ -36,26 +36,26 @@ function showOrder(mode, var_content, file) { $(this).html(data); /* if return is allowed*/ - if ($('div#order-detail-content table td.order_cb').length > 0) + if ($('#order-detail-content .order_cb').length > 0) { //return slip : check or uncheck every checkboxes - $('form div#order-detail-content th input[type=checkbox]').click(function() + $('#order-detail-content th input[type=checkbox]').click(function() { - $('form div#order-detail-content td input[type=checkbox]').each(function() + $('#order-detail-content td input[type=checkbox]').each(function() { - this.checked = $('form div#order-detail-content th input[type=checkbox]').is(':checked'); + this.checked = $('#order-detail-content th input[type=checkbox]').is(':checked'); updateOrderLineDisplay(this); }); }); //return slip : enable or disable 'global' quantity editing - $('form div#order-detail-content td input[type=checkbox]').click(function() + $('#order-detail-content td input[type=checkbox]').click(function() { updateOrderLineDisplay(this); }); //return slip : limit quantities - $('form div#order-detail-content td input.order_qte_input').keyup(function() + $('#order-detail-content td .order_qte_input').keyup(function() { - var maxQuantity = parseInt($(this).parent().find('span.order_qte_span').text()); + var maxQuantity = parseInt($(this).parent().find('.order_qte_span').text()); var quantity = parseInt($(this).val()); if (isNaN($(this).val()) && $(this).val() != '') { @@ -84,8 +84,8 @@ function showOrder(mode, var_content, file) function updateOrderLineDisplay(domCheckbox) { - var lineQuantitySpan = $(domCheckbox).parent().parent().find('span.order_qte_span'); - var lineQuantityInput = $(domCheckbox).parent().parent().find('input.order_qte_input'); + var lineQuantitySpan = $(domCheckbox).parent().parent().find('.order_qte_span'); + var lineQuantityInput = $(domCheckbox).parent().parent().find('.order_qte_input'); if($(domCheckbox).is(':checked')) { lineQuantitySpan.hide(); @@ -103,19 +103,19 @@ function updateOrderLineDisplay(domCheckbox) function sendOrderMessage() { paramString = "ajax=true"; - $('form#sendOrderMessage').find('input, textarea').each(function(){ + $('#sendOrderMessage').find('input, textarea').each(function(){ paramString += '&' + $(this).attr('name') + '=' + encodeURI($(this).val()); }); $.ajax({ type: "POST", - url: $('form#sendOrderMessage').attr("action"), + url: $('#sendOrderMessage').attr("action"), data: paramString, success: function (msg){ $('#block-order-detail').fadeOut('slow', function() { $(this).html(msg); //catch the submit event of sendOrderMessage form - $('form#sendOrderMessage').submit(function(){ + $('#sendOrderMessage').submit(function(){ return sendOrderMessage(); }); $(this).fadeIn('slow'); From a177e1bc5419bdfa44946b5dc6239b514cda1da2 Mon Sep 17 00:00:00 2001 From: adonis karavokyros Date: Thu, 22 Nov 2012 21:37:44 +0100 Subject: [PATCH 052/316] Clean product.js Jquery Selector : keep it simple --- themes/default/js/product.js | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/themes/default/js/product.js b/themes/default/js/product.js index f54f9aec5..5e7f62cd8 100644 --- a/themes/default/js/product.js +++ b/themes/default/js/product.js @@ -77,7 +77,7 @@ function findCombination(firstTime) $('#quantity_wanted').val(1); //create a temporary 'choice' array containing the choices of the customer var choice = new Array(); - $('div#attributes select, div#attributes input[type=hidden], div#attributes input[type=radio]:checked').each(function(){ + $('#attributes select, #attributes input[type=hidden], #attributes input[type=radio]:checked').each(function(){ choice.push($(this).val()); }); @@ -265,20 +265,20 @@ function updateDisplay() { $('#availability_value').text(availableLaterValue); if(stock_management == 1) - $('p#availability_statut:hidden').show('slow'); + $('#availability_statut:hidden').show('slow'); } else - $('p#availability_statut:visible').hide('slow'); + $('#availability_statut:visible').hide('slow'); } else { $('#add_to_cart:visible').fadeOut(600); if(stock_management == 1) - $('p#availability_statut:hidden').show('slow'); + $('#availability_statut:hidden').show('slow'); } if (productAvailableForOrder == 0) - $('p#availability_statut:visible').hide(); + $('#availability_statut:visible').hide(); } if (selectedCombination['reference'] || productReference) @@ -447,7 +447,7 @@ function displayImage(domAAroundImgThumb, no_animation) //update display of the discounts table function displayDiscounts(combination) { - $('#quantityDiscount table tbody tr').each(function() { + $('#quantityDiscount tbody tr').each(function() { if (($(this).attr('id') != 'quantityDiscount_0') && ($(this).attr('id') != 'quantityDiscount_'+combination) && ($(this).attr('id') != 'noQuantityDiscount')) @@ -470,8 +470,8 @@ function serialScrollFixLock(event, targeted, scrolled, items, position) var leftArrow = position == 0 ? true : false; var rightArrow = position + serialScrollNbImagesDisplayed >= serialScrollNbImages ? true : false; - $('a#view_scroll_left').css('cursor', leftArrow ? 'default' : 'pointer').css('display', leftArrow ? 'none' : 'block').fadeTo(0, leftArrow ? 0 : 1); - $('a#view_scroll_right').css('cursor', rightArrow ? 'default' : 'pointer').fadeTo(0, rightArrow ? 0 : 1).css('display', rightArrow ? 'none' : 'block'); + $('#view_scroll_left').css('cursor', leftArrow ? 'default' : 'pointer').css('display', leftArrow ? 'none' : 'block').fadeTo(0, leftArrow ? 0 : 1); + $('#view_scroll_right').css('cursor', rightArrow ? 'default' : 'pointer').fadeTo(0, rightArrow ? 0 : 1).css('display', rightArrow ? 'none' : 'block'); return true; } @@ -507,8 +507,8 @@ $(document).ready(function() //init the serialScroll for thumbs $('#thumbs_list').serialScroll({ items:'li:visible', - prev:'a#view_scroll_left', - next:'a#view_scroll_right', + prev:'#view_scroll_left', + next:'#view_scroll_right', axis:'x', offset:0, start:0, @@ -542,21 +542,21 @@ $(document).ready(function() }); } //add a link on the span 'view full size' and on the big image - $('span#view_full_size, div#image-block img').click(function(){ - $('#views_block li a.shown').click(); + $('#view_full_size, #image-block img').click(function(){ + $('#views_block .shown').click(); }); //catch the click on the "more infos" button at the top of the page - $('div#short_description_block p a.button').click(function(){ + $('#short_description_block .button').click(function(){ $('#more_info_tab_more_info').click(); $.scrollTo( '#more_info_tabs', 1200 ); }); // Hide the customization submit button and display some message - $('p#customizedDatas input').click(function() { - $('p#customizedDatas input').hide(); + $('#customizedDatas input').click(function() { + $('#customizedDatas input').hide(); $('#ajax-loader').fadeIn(); - $('p#customizedDatas').append(uploading_in_progress); + $('#customizedDatas').append(uploading_in_progress); }); //init the price in relation of the selected attributes @@ -565,7 +565,7 @@ $(document).ready(function() else if (typeof productHasAttributes != 'undefined' && !productHasAttributes) refreshProductImages(0); - $('a#resetImages').click(function() { + $('#resetImages').click(function() { refreshProductImages(0); }); @@ -657,7 +657,7 @@ function getProductAttribute() request = ''; //create a temporary 'tab_attributes' array containing the choices of the customer var tab_attributes = new Array(); - $('div#attributes select, div#attributes input[type=hidden], div#attributes input[type=radio]:checked').each(function(){ + $('#attributes select, #attributes input[type=hidden], #attributes input[type=radio]:checked').each(function(){ tab_attributes.push($(this).val()); }); From a17ab9d1ea8a383dcdefa627dda5b3d657bf67b4 Mon Sep 17 00:00:00 2001 From: adonis karavokyros Date: Thu, 22 Nov 2012 21:46:03 +0100 Subject: [PATCH 053/316] Clean order-opc.js Jquery Selectors : keep it simple --- themes/default/js/order-opc.js | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/themes/default/js/order-opc.js b/themes/default/js/order-opc.js index f52ab702a..e21f63c5e 100644 --- a/themes/default/js/order-opc.js +++ b/themes/default/js/order-opc.js @@ -41,13 +41,13 @@ function updateCarrierList(json) function updatePaymentMethods(json) { $('#HOOK_TOP_PAYMENT').html(json.HOOK_TOP_PAYMENT); - $('#opc_payment_methods-content div#HOOK_PAYMENT').html(json.HOOK_PAYMENT); + $('#opc_payment_methods-content #HOOK_PAYMENT').html(json.HOOK_PAYMENT); } function updateAddressSelection() { - var idAddress_delivery = ($('input#opc_id_address_delivery').length == 1 ? $('input#opc_id_address_delivery').val() : $('#id_address_delivery').val()); - var idAddress_invoice = ($('input#opc_id_address_invoice').length == 1 ? $('input#opc_id_address_invoice').val() : ($('input[type=checkbox]#addressesAreEquals:checked').length == 1 ? idAddress_delivery : ($('#id_address_invoice').length == 1 ? $('select#id_address_invoice').val() : idAddress_delivery))); + var idAddress_delivery = ($('#opc_id_address_delivery').length == 1 ? $('#opc_id_address_delivery').val() : $('#id_address_delivery').val()); + var idAddress_invoice = ($('#opc_id_address_invoice').length == 1 ? $('#opc_id_address_invoice').val() : ($('#addressesAreEquals:checked').length == 1 ? idAddress_delivery : ($('#id_address_invoice').length == 1 ? $('#id_address_invoice').val() : idAddress_delivery))); $('#opc_account-overlay').fadeIn('slow'); $('#opc_delivery_methods-overlay').fadeIn('slow'); @@ -186,7 +186,7 @@ function updateCarrierSelectionAndGift() if ($('input#gift:checked').length) { gift = 1; - giftMessage = encodeURIComponent($('textarea#gift_message').val()); + giftMessage = encodeURIComponent($('#gift_message').val()); } $('#opc_payment_methods-overlay').fadeIn('slow'); @@ -518,7 +518,7 @@ $(function() { // RESET ERROR(S) MESSAGE(S) $('#opc_account_errors').html('').slideUp('slow'); - if ($('input#opc_id_customer').val() == 0) + if ($('#opc_id_customer').val() == 0) { var callingFile = authenticationUrl; var params = 'submitAccount=true&'; @@ -588,18 +588,18 @@ $(function() { static_token = jsonData.token; // update addresses id - $('input#opc_id_address_delivery').val(jsonData.id_address_delivery); - $('input#opc_id_address_invoice').val(jsonData.id_address_invoice); + $('#opc_id_address_delivery').val(jsonData.id_address_delivery); + $('#opc_id_address_invoice').val(jsonData.id_address_invoice); // It's not a new customer - if ($('input#opc_id_customer').val() != '0') + if ($('#opc_id_customer').val() != '0') { if (!saveAddress('delivery')) return false; } // update id_customer - $('input#opc_id_customer').val(jsonData.id_customer); + $('#opc_id_customer').val(jsonData.id_customer); if ($('#invoice_address:checked').length != 0) { @@ -608,7 +608,7 @@ $(function() { } // update id_customer - $('input#opc_id_customer').val(jsonData.id_customer); + $('#opc_id_customer').val(jsonData.id_customer); // force to refresh carrier list if (isGuest) @@ -684,26 +684,26 @@ function bindInputs() }); // Recyclable checkbox - $('input#recyclable').click(function() { + $('#recyclable').click(function() { updateCarrierSelectionAndGift(); }); // Gift checkbox update - $('input#gift').click(function() { - if ($('input#gift').is(':checked')) - $('p#gift_div').show(); + $('#gift').click(function() { + if ($('#gift').is(':checked')) + $('#gift_div').show(); else - $('p#gift_div').hide(); + $('#gift_div').hide(); updateCarrierSelectionAndGift(); }); - if ($('input#gift').is(':checked')) - $('p#gift_div').show(); + if ($('#gift').is(':checked')) + $('#gift_div').show(); else - $('p#gift_div').hide(); + $('#gift_div').hide(); // Gift message update - $('textarea#gift_message').change(function() { + $('#gift_message').change(function() { updateCarrierSelectionAndGift(); }); From 1a9f65c8b94fe84dad575c25512161d856408d73 Mon Sep 17 00:00:00 2001 From: Caleydon Media Date: Thu, 22 Nov 2012 22:13:21 +0100 Subject: [PATCH 054/316] Update modules/blockuserinfo/blockuserinfo.tpl --- modules/blockuserinfo/blockuserinfo.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/blockuserinfo/blockuserinfo.tpl b/modules/blockuserinfo/blockuserinfo.tpl index 8cc362d66..7ce207dc4 100644 --- a/modules/blockuserinfo/blockuserinfo.tpl +++ b/modules/blockuserinfo/blockuserinfo.tpl @@ -28,7 +28,7 @@
    {if !$PS_CATALOG_MODE}
  • - {l s='Cart:' mod='block>{l s='Cart:' mod='blockuserinfo'} + {l s='Cart:' mod='blockuserinfo'} {$cart_qties} {l s='product' mod='blockuserinfo'} {l s='products' mod='blockuserinfo'} From 51dd140f977c1871a801fecae24459612dcae937 Mon Sep 17 00:00:00 2001 From: bumbu Date: Thu, 22 Nov 2012 23:31:44 +0200 Subject: [PATCH 055/316] Update admin-dev/themes/default/template/helpers/form/form.tpl Fix error that appears on adding input with attribute 'lang' => false to admin controller form. --- admin-dev/themes/default/template/helpers/form/form.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl index d562c3165..3add6a590 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -60,7 +60,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 +209,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}
    From d2a442fb59d73b037051c47a248b4a710ee2082a Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Fri, 23 Nov 2012 09:48:32 +0100 Subject: [PATCH 056/316] [-] FO : removed useless extra parameter not implemented in Manufacturer::getManufacturers() #PSCFV-5771 --- controllers/front/ManufacturerController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/controllers/front/ManufacturerController.php b/controllers/front/ManufacturerController.php index 209754ae8..494356a89 100644 --- a/controllers/front/ManufacturerController.php +++ b/controllers/front/ManufacturerController.php @@ -110,8 +110,7 @@ class ManufacturerControllerCore extends FrontController { if (Configuration::get('PS_DISPLAY_SUPPLIERS')) { - $id_current_shop_group = Shop::getContextShopGroupID(); - $data = Manufacturer::getManufacturers(true, $this->context->language->id, true, false, false, false, $id_current_shop_group); + $data = Manufacturer::getManufacturers(true, $this->context->language->id, true, false, false, false); $nbProducts = count($data); $this->pagination($nbProducts); From 1df709fcfd7522267db110d15c776e18cfe05101 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Fri, 23 Nov 2012 10:16:48 +0100 Subject: [PATCH 057/316] [*] BO : added backup of the settings file whenever there is a modification #PSCFV-5676 --- admin-dev/functions.php | 4 +-- .../admin/AdminPerformanceController.php | 36 ++++++++++++------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/admin-dev/functions.php b/admin-dev/functions.php index a6b808ac6..a79749b62 100644 --- a/admin-dev/functions.php +++ b/admin-dev/functions.php @@ -104,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/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php index 08606f101..aad501d1a 100644 --- a/controllers/admin/AdminPerformanceController.php +++ b/controllers/admin/AdminPerformanceController.php @@ -687,38 +687,43 @@ class AdminPerformanceControllerCore extends AdminController if ($this->tabAccess['edit'] === '1') { $algo = (int)Tools::getValue('PS_CIPHER_ALGORITHM'); - $settings = file_get_contents(dirname(__FILE__).'/../../config/settings.inc.php'); + $prev_settings = file_get_contents(dirname(__FILE__).'/../../config/settings.inc.php'); + $new_settings = $prev_settings; if ($algo) { if (!function_exists('mcrypt_encrypt')) $this->errors[] = Tools::displayError('PHP "Mcrypt" extension is not activated on this server.'); else { - if (!strstr($settings, '_RIJNDAEL_KEY_')) + if (!strstr($new_settings, '_RIJNDAEL_KEY_')) { $key_size = mcrypt_get_key_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_ECB); $key = Tools::passwdGen($key_size); - $settings = preg_replace( + $new_settings = preg_replace( '/define\(\'_COOKIE_KEY_\', \'([a-z0-9=\/+-_]+)\'\);/i', 'define(\'_COOKIE_KEY_\', \'\1\');'."\n".'define(\'_RIJNDAEL_KEY_\', \''.$key.'\');', - $settings + $new_settings ); } - if (!strstr($settings, '_RIJNDAEL_IV_')) + if (!strstr($new_settings, '_RIJNDAEL_IV_')) { $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_ECB); $iv = base64_encode(mcrypt_create_iv($iv_size, MCRYPT_RAND)); - $settings = preg_replace( + $new_settings = preg_replace( '/define\(\'_COOKIE_IV_\', \'([a-z0-9=\/+-_]+)\'\);/i', 'define(\'_COOKIE_IV_\', \'\1\');'."\n".'define(\'_RIJNDAEL_IV_\', \''.$iv.'\');', - $settings + $new_settings ); } } } if (!count($this->errors)) { - if (file_put_contents(dirname(__FILE__).'/../../config/settings.inc.php', $settings)) + // If there is not settings file modification or if the backup and replacement of the settings file worked + if ($new_settings == $prev_settings || ( + copy(dirname(__FILE__).'/../../config/settings.inc.php', dirname(__FILE__).'/../../config/settings.old.php') + && file_put_contents(dirname(__FILE__).'/../../config/settings.inc.php', $new_settings) + )) { Configuration::updateValue('PS_CIPHER_ALGORITHM', $algo); $redirecAdmin = true; @@ -735,7 +740,8 @@ class AdminPerformanceControllerCore extends AdminController { if ($this->tabAccess['edit'] === '1') { - $settings = file_get_contents(dirname(__FILE__).'/../../config/settings.inc.php'); + $prev_settings = file_get_contents(dirname(__FILE__).'/../../config/settings.inc.php'); + $new_settings = $prev_settings; if (!Tools::getValue('active')) $cache_active = 0; else @@ -743,10 +749,10 @@ class AdminPerformanceControllerCore extends AdminController if (!$caching_system = Tools::getValue('caching_system')) $this->errors[] = Tools::displayError('Caching system is missing'); else - $settings = preg_replace( + $new_settings = preg_replace( '/define\(\'_PS_CACHING_SYSTEM_\', \'([a-z0-9=\/+-_]+)\'\);/Ui', 'define(\'_PS_CACHING_SYSTEM_\', \''.$caching_system.'\');', - $settings + $new_settings ); if ($cache_active && $caching_system == 'CacheMemcache' && !extension_loaded('memcache')) $this->errors[] = Tools::displayError('To use Memcached, you must install the Memcache PECL extension on your server.').' @@ -779,8 +785,12 @@ class AdminPerformanceControllerCore extends AdminController if (!count($this->errors)) { - $settings = preg_replace('/define\(\'_PS_CACHE_ENABLED_\', \'([0-9])\'\);/Ui', 'define(\'_PS_CACHE_ENABLED_\', \''.(int)$cache_active.'\');', $settings); - if (file_put_contents(dirname(__FILE__).'/../../config/settings.inc.php', $settings)) + $new_settings = preg_replace('/define\(\'_PS_CACHE_ENABLED_\', \'([0-9])\'\);/Ui', 'define(\'_PS_CACHE_ENABLED_\', \''.(int)$cache_active.'\');', $new_settings); + // If there is not settings file modification or if the backup and replacement of the settings file worked + if ($new_settings == $prev_settings || ( + copy(dirname(__FILE__).'/../../config/settings.inc.php', dirname(__FILE__).'/../../config/settings.old.php') + && file_put_contents(dirname(__FILE__).'/../../config/settings.inc.php', $new_settings) + )) $redirecAdmin = true; else $this->errors[] = Tools::displayError('Cannot overwrite settings file.'); From 50f5b20f0001cf3764cc089418fe6510ebb534d8 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Fri, 23 Nov 2012 10:39:04 +0100 Subject: [PATCH 058/316] [-] FO : fixed a problem with quantity of customized products #PSCFV-5630 [-] FO : removed cart rules already in the cart from available cart rules in the cart summary --- controllers/front/ParentOrderController.php | 46 ++++++++++++--------- themes/default/shopping-cart.tpl | 2 +- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php index bff45d140..6de89a766 100644 --- a/controllers/front/ParentOrderController.php +++ b/controllers/front/ParentOrderController.php @@ -300,22 +300,23 @@ class ParentOrderControllerCore extends FrontController if ($cart_product_context->shop->id != $product['id_shop']) $cart_product_context->shop = new Shop((int)$product['id_shop']); - $product['price_without_specific_price'] = Product::getPriceStatic($product['id_product'], - !Product::getTaxCalculationMethod(), - $product['id_product_attribute'], - 2, - null, - false, - false, - 1, - false, - null, - null, - null, - $null, - true, - true, - $cart_product_context); + $product['price_without_specific_price'] = Product::getPriceStatic( + $product['id_product'], + !Product::getTaxCalculationMethod(), + $product['id_product_attribute'], + 2, + null, + false, + false, + 1, + false, + null, + null, + null, + $null, + true, + true, + $cart_product_context); if (Product::getTaxCalculationMethod()) $product['is_discounted'] = $product['price_without_specific_price'] != $product['price']; @@ -323,8 +324,15 @@ class ParentOrderControllerCore extends FrontController $product['is_discounted'] = $product['price_without_specific_price'] != $product['price_wt']; } - $show_option_allow_separate_package = !$this->context->cart->isAllProductsInStock(true) - && Configuration::get('PS_SHIP_WHEN_AVAILABLE'); + // Get available cart rules and unset the cart rules already in the cart + $available_cart_rules = CartRule::getCustomerCartRules($this->context->language->id, (isset($this->context->customer->id) ? $this->context->customer->id : 0), true, true, true, $this->context->cart); + $cart_cart_rules = $this->context->cart->getCartRules(); + foreach ($available_cart_rules as $key => $available_cart_rule) + foreach ($cart_cart_rules as $cart_cart_rule) + if ($available_cart_rule['id_cart_rule'] == $cart_cart_rule['id_cart_rule']) + unset($available_cart_rules[$key]); + + $show_option_allow_separate_package = (!$this->context->cart->isAllProductsInStock(true) && Configuration::get('PS_SHIP_WHEN_AVAILABLE')); $this->context->smarty->assign($summary); $this->context->smarty->assign(array( @@ -339,7 +347,7 @@ class ParentOrderControllerCore extends FrontController 'CUSTOMIZE_FILE' => Product::CUSTOMIZE_FILE, 'CUSTOMIZE_TEXTFIELD' => Product::CUSTOMIZE_TEXTFIELD, 'lastProductAdded' => $this->context->cart->getLastProduct(), - 'displayVouchers' => CartRule::getCustomerCartRules($this->context->language->id, (isset($this->context->customer->id) ? $this->context->customer->id : 0), true, true, true, $this->context->cart), + 'displayVouchers' => $available_cart_rules, 'currencySign' => $this->context->currency->sign, 'currencyRate' => $this->context->currency->conversion_rate, 'currencyFormat' => $this->context->currency->format, diff --git a/themes/default/shopping-cart.tpl b/themes/default/shopping-cart.tpl index 0a141ad7a..6c2cef4ed 100644 --- a/themes/default/shopping-cart.tpl +++ b/themes/default/shopping-cart.tpl @@ -272,7 +272,7 @@ {/if}
    - + {/if} From 4368782c4b20bc1901ecec5510189cbcc5de8ea7 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Fri, 23 Nov 2012 10:41:34 +0100 Subject: [PATCH 059/316] [-] BO : fixed duplicated rows with free order in dashboard stats #PSCFV-5626 --- controllers/admin/AdminHomeController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 3d3ba36c6..dee062dfb 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -377,8 +377,9 @@ class AdminHomeControllerCore extends AdminController SELECT total_paid / conversion_rate as total_converted, left(invoice_date, 10) as invoice_date FROM '._DB_PREFIX_.'orders o WHERE valid = 1 - AND invoice_date BETWEEN \''.date('Y-m-d', strtotime('-7 DAYS', time())).' 00:00:00\' AND \''.date('Y-m-d H:i:s').'\' - '.Shop::addSqlRestriction(Shop::SHARE_ORDER).' + AND total_paid > 0 + AND invoice_date BETWEEN \''.date('Y-m-d', strtotime('-7 DAYS', time())).' 00:00:00\' AND \''.date('Y-m-d H:i:s').'\' + '.Shop::addSqlRestriction(Shop::SHARE_ORDER).' '); foreach ($result as $row) $chart->getCurve(1)->setPoint(strtotime($row['invoice_date'].' 02:00:00'), $row['total_converted']); From d793984de213dc0fb6af298a7833ddbb708f70e0 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Fri, 23 Nov 2012 11:02:09 +0100 Subject: [PATCH 060/316] [-] FO : changed redirection management when accessing page number out of scope #PSCFV-5567 --- classes/controller/FrontController.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index 967c20dbd..a9c47d4f0 100755 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -863,10 +863,7 @@ class FrontControllerCore extends Controller $this->p = abs((int)Tools::getValue('p', 1)); if (!is_numeric(Tools::getValue('p', 1)) || Tools::getValue('p', 1) < 0) - { - $this->redirect_after = '404'; - $this->redirect(); - } + Tools::redirect(self::$link->getPaginationLink(false, false, $this->n, false, 1, false)); $current_url = tools::htmlentitiesUTF8($_SERVER['REQUEST_URI']); //delete parameter page @@ -880,13 +877,9 @@ class FrontControllerCore extends Controller if (isset($this->context->cookie->nb_item_per_page) && $this->n != $this->context->cookie->nb_item_per_page && in_array($this->n, $nArray)) $this->context->cookie->nb_item_per_page = $this->n; - if ($this->p > (($nbProducts / $this->n) + 1)) - { - $this->redirect_after = preg_replace('/[&?]p=\d+/', '', $_SERVER['REQUEST_URI']); - $this->redirect(); - } - $pages_nb = ceil($nbProducts / (int)$this->n); + if ($this->p > $pages_nb) + Tools::redirect(self::$link->getPaginationLink(false, false, $this->n, false, $pages_nb, false)); $start = (int)($this->p - $range); if ($start < 1) From b62466c75346b3182d8dce18d5cabf06c91d06f1 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Fri, 23 Nov 2012 11:28:31 +0100 Subject: [PATCH 061/316] [-] BO : admin does not crash anymore when custom BO theme is not available #PSCFV-5492 --- classes/controller/AdminController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 2651d9286..cc86d5234 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -277,6 +277,9 @@ class AdminControllerCore extends Controller $this->multishop_context = Shop::CONTEXT_ALL | Shop::CONTEXT_GROUP | Shop::CONTEXT_SHOP; $this->bo_theme = ((Validate::isLoadedObject($this->context->employee) && $this->context->employee->bo_theme) ? $this->context->employee->bo_theme : 'default'); + if (!file_exists(_PS_BO_ALL_THEMES_DIR_.$this->bo_theme.DIRECTORY_SEPARATOR.'template')) + $this->bo_theme = 'default'; + $this->context->smarty->setTemplateDir(array( _PS_BO_ALL_THEMES_DIR_.$this->bo_theme.DIRECTORY_SEPARATOR.'template', _PS_OVERRIDE_DIR_.'controllers'.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR.'templates' From 6bbd93ddb1c30c63055202a1703305acf5d92356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Fri, 23 Nov 2012 14:30:00 +0100 Subject: [PATCH 062/316] // Fix admin listing on some tab --- classes/controller/AdminController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index cc86d5234..c91102bb6 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2073,7 +2073,7 @@ class AdminControllerCore extends Controller foreach ($this->fields_list as $key => $array_value) { // Add it only if it is not already in $this->_select - if (isset($this->_select) && preg_match('/'.preg_quote($key, '/').'`?\s*,/', $this->_select)) + if (isset($this->_select) && preg_match('/[\s]`?'.preg_quote($key, '/').'`?\s*,/', $this->_select)) continue; if (isset($array_value['filter_key'])) @@ -2790,5 +2790,4 @@ class AdminControllerCore extends Controller // No content, return false return false; } -} - +} \ No newline at end of file From e444f971b205799c1315c13c89bffd26328f7282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Fri, 23 Nov 2012 14:55:13 +0100 Subject: [PATCH 063/316] [-] MO: Fix #PSCFV-5246 add and remove favorite products was not working using SSL --- .../views/templates/hook/favoriteproducts-header.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl b/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl index 9f043a4cf..07b47f48b 100755 --- a/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl +++ b/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl @@ -23,8 +23,8 @@ * International Registered Trademark & Property of PrestaShop SA *} - \ No newline at end of file diff --git a/modules/blockwishlist/blockwishlist.php b/modules/blockwishlist/blockwishlist.php index c01827e02..0e96ef3ab 100644 --- a/modules/blockwishlist/blockwishlist.php +++ b/modules/blockwishlist/blockwishlist.php @@ -169,7 +169,7 @@ class BlockWishList extends Module public function hookHeader($params) { $this->context->controller->addCSS(($this->_path).'blockwishlist.css', 'all'); - return $this->display(__FILE__, 'blockwishlist-header.tpl'); + $this->context->controller->addJS(($this->_path).'js/ajax-wishlist.js'); } public function hookRightColumn($params) From 6f063ff3033befc7b5b91996f630cef32a96c51c Mon Sep 17 00:00:00 2001 From: Damon Skelhorn Date: Fri, 23 Nov 2012 15:18:21 +0000 Subject: [PATCH 070/316] Missing dbl quote on href --- themes/default/product-list.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/product-list.tpl b/themes/default/product-list.tpl index 819ea18dd..37d9904a6 100644 --- a/themes/default/product-list.tpl +++ b/themes/default/product-list.tpl @@ -59,7 +59,7 @@ {if isset($static_token)} {l s='Add to cart'} {else} - {l s='Add to cart'} + {l s='Add to cart'} {/if} {else} {l s='Add to cart'}
    From 049caca3b776ddd307b0da56045a0b7ca4ebf618 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Fri, 23 Nov 2012 16:35:57 +0100 Subject: [PATCH 071/316] [-] CORE : fixed some bad include of jquery plugin --- .../default/template/controllers/modules/js.tpl | 6 ++---- classes/Media.php | 2 +- controllers/admin/AdminCartRulesController.php | 13 ++++++------- controllers/admin/AdminModulesController.php | 6 ++++++ 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/modules/js.tpl b/admin-dev/themes/default/template/controllers/modules/js.tpl index 73e463c13..e3d073c01 100644 --- a/admin-dev/themes/default/template/controllers/modules/js.tpl +++ b/admin-dev/themes/default/template/controllers/modules/js.tpl @@ -18,15 +18,13 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @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 *} - - - - -

    {if !isset($email_create)}{l s='Log in'}{else}{l s='Create your account'}{/if}

    - -{include file="$tpl_dir./errors.tpl"} -{assign var='stateExist' value=false} -{if !isset($email_create)} - - -
    -
    -

    {l s='Create your account'}

    -
    -

    {l s='Enter your e-mail address to create an account'}.

    - -

    - - -

    -

    - {if isset($back)}{/if} - - -

    -
    -
    -
    - -
    -
    -

    {l s='Already registered?'}

    -
    -

    - - -

    -

    - - -

    -

    {l s='Forgot your password?'}

    -

    - {if isset($back)}{/if} - -

    -
    -
    -
    - - {if isset($inOrderProcess) && $inOrderProcess && $PS_GUEST_CHECKOUT_ENABLED} -
    -
    -

    {l s='Instant Checkout'}

    -
    - -

    - - -

    -

    - {l s='Title'} - {foreach from=$genders key=k item=gender} - id}checked="checked"{/if} /> - - {/foreach} -

    -

    - - - -

    -

    - - - -

    -

    - {l s='Date of Birth'} - - {* - {l s='January'} - {l s='February'} - {l s='March'} - {l s='April'} - {l s='May'} - {l s='June'} - {l s='July'} - {l s='August'} - {l s='September'} - {l s='October'} - {l s='November'} - {l s='December'} - *} - - -

    - {if isset($newsletter) && $newsletter} -

    - - -

    -

    - - -

    - {/if} -

    {l s='Delivery address'}

    - {foreach from=$dlv_all_fields item=field_name} - {if $field_name eq "company"} -

    - - -

    - {elseif $field_name eq "vat_number"} - - {elseif $field_name eq "address1"} -

    - - -

    - {elseif $field_name eq "postcode"} -

    - - -

    - {elseif $field_name eq "city"} -

    - - -

    - - {elseif $field_name eq "Country:name" || $field_name eq "country"} -

    - - -

    - {elseif $field_name eq "State:name"} - {assign var='stateExist' value=true} - -

    - - -

    - {elseif $field_name eq "phone"} -

    - - -

    - {/if} - {/foreach} - {if $stateExist eq false} -

    - - -

    - {/if} - - - -
    -
    - - {$HOOK_CREATE_ACCOUNT_FORM} -

    - *{l s='Required field'} - - -

    -
    - {/if} -{else} - -
    - {$HOOK_CREATE_ACCOUNT_TOP} - - {if $b2b_enable} - - {/if} - {if isset($PS_REGISTRATION_PROCESS_TYPE) && $PS_REGISTRATION_PROCESS_TYPE} - - - {/if} - {$HOOK_CREATE_ACCOUNT_FORM} -

    - - - {if isset($back)}{/if} - - *{l s='Required field'} -

    -
    +{* +* 2007-2012 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @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 +*} + +{capture name=path}{l s='Login'}{/capture} +{include file="$tpl_dir./breadcrumb.tpl"} + + + +

    {if !isset($email_create)}{l s='Log in'}{else}{l s='Create your account'}{/if}

    + +{include file="$tpl_dir./errors.tpl"} +{assign var='stateExist' value=false} +{if !isset($email_create)} + + +
    +
    +

    {l s='Create your account'}

    +
    +

    {l s='Enter your e-mail address to create an account'}.

    + +

    + + +

    +

    + {if isset($back)}{/if} + + +

    +
    +
    +
    + +
    +
    +

    {l s='Already registered?'}

    +
    +

    + + +

    +

    + + +

    +

    {l s='Forgot your password?'}

    +

    + {if isset($back)}{/if} + +

    +
    +
    +
    + + {if isset($inOrderProcess) && $inOrderProcess && $PS_GUEST_CHECKOUT_ENABLED} +
    +
    +

    {l s='Instant Checkout'}

    +
    + +

    + + +

    +

    + {l s='Title'} + {foreach from=$genders key=k item=gender} + id}checked="checked"{/if} /> + + {/foreach} +

    +

    + + + +

    +

    + + + +

    +

    + {l s='Date of Birth'} + + {* + {l s='January'} + {l s='February'} + {l s='March'} + {l s='April'} + {l s='May'} + {l s='June'} + {l s='July'} + {l s='August'} + {l s='September'} + {l s='October'} + {l s='November'} + {l s='December'} + *} + + +

    + {if isset($newsletter) && $newsletter} +

    + + +

    +

    + + +

    + {/if} +

    {l s='Delivery address'}

    + {foreach from=$dlv_all_fields item=field_name} + {if $field_name eq "company"} +

    + + +

    + {elseif $field_name eq "vat_number"} + + {elseif $field_name eq "address1"} +

    + + +

    + {elseif $field_name eq "postcode"} +

    + + +

    + {elseif $field_name eq "city"} +

    + + +

    + + {elseif $field_name eq "Country:name" || $field_name eq "country"} +

    + + +

    + {elseif $field_name eq "State:name"} + {assign var='stateExist' value=true} + +

    + + +

    + {elseif $field_name eq "phone"} +

    + + +

    + {/if} + {/foreach} + {if $stateExist eq false} +

    + + +

    + {/if} + + + +
    +
    + + {$HOOK_CREATE_ACCOUNT_FORM} +

    + *{l s='Required field'} + + +

    +
    + {/if} +{else} + +
    + {$HOOK_CREATE_ACCOUNT_TOP} + + {if $b2b_enable} + + {/if} + {if isset($PS_REGISTRATION_PROCESS_TYPE) && $PS_REGISTRATION_PROCESS_TYPE} + + + {/if} + {$HOOK_CREATE_ACCOUNT_FORM} +

    + + + {if isset($back)}{/if} + + *{l s='Required field'} +

    +
    {/if} \ No newline at end of file From 6e640dfe9bb8ee7ca48428d76fc69961d28289c1 Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Tue, 27 Nov 2012 15:27:11 +0100 Subject: [PATCH 120/316] [-] FO: fix The "Compare buttons" on the Manufacturers List page is coded incorrectly... - #PSCFV-5636 I also fixed this bug on the supplier list --- themes/default/manufacturer.tpl | 122 ++++++++++++++++++-------------- themes/default/supplier.tpl | 110 +++++++++++++++------------- 2 files changed, 128 insertions(+), 104 deletions(-) diff --git a/themes/default/manufacturer.tpl b/themes/default/manufacturer.tpl index a47871ad2..b080bbe7c 100644 --- a/themes/default/manufacturer.tpl +++ b/themes/default/manufacturer.tpl @@ -1,55 +1,67 @@ -{* -* 2007-2012 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @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 -*} - -{include file="$tpl_dir./breadcrumb.tpl"} - -{include file="$tpl_dir./errors.tpl"} - -{if !isset($errors) OR !sizeof($errors)} -

    {l s='List of products by manufacturer'} {$manufacturer->name|escape:'htmlall':'UTF-8'}

    - {if !empty($manufacturer->description) || !empty($manufacturer->short_description)} -
    - {if !empty($manufacturer->short_description)} -

    {$manufacturer->short_description}

    -

    {$manufacturer->description}

    - {l s='More'} - {else} -

    {$manufacturer->description}

    - {/if} -
    - {/if} - - {if $products} -
    - {include file="./product-sort.tpl"} -
    - {include file="./product-compare.tpl"} - {include file="./product-list.tpl" products=$products} - {include file="./pagination.tpl"} - {include file="./product-compare.tpl"} - {else} -

    {l s='No products for this manufacturer.'}

    - {/if} -{/if} +{* +* 2007-2012 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @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 +*} + +{include file="$tpl_dir./breadcrumb.tpl"} + +{include file="$tpl_dir./errors.tpl"} + +{if !isset($errors) OR !sizeof($errors)} +

    {l s='List of products by manufacturer'} {$manufacturer->name|escape:'htmlall':'UTF-8'}

    + {if !empty($manufacturer->description) || !empty($manufacturer->short_description)} +
    + {if !empty($manufacturer->short_description)} +

    {$manufacturer->short_description}

    +

    {$manufacturer->description}

    + {l s='More'} + {else} +

    {$manufacturer->description}

    + {/if} +
    + {/if} + + {if $products} +
    + {include file="$tpl_dir./pagination.tpl"} + +
    + {include file="./product-sort.tpl"} + {include file="./product-compare.tpl"} + {include file="./nbr-product-page.tpl"} +
    +
    + + {include file="./product-list.tpl" products=$products} + +
    +
    + {include file="./product-sort.tpl"} {include file="./product-compare.tpl"} {include file="./nbr-product-page.tpl"} + +
    + {include file="./pagination.tpl"} +
    + {else} +

    {l s='No products for this manufacturer.'}

    + {/if} +{/if} diff --git a/themes/default/supplier.tpl b/themes/default/supplier.tpl index 560f5e2bc..c85c5c952 100644 --- a/themes/default/supplier.tpl +++ b/themes/default/supplier.tpl @@ -1,49 +1,61 @@ -{* -* 2007-2012 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @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 -*} - -{include file="$tpl_dir./breadcrumb.tpl"} - -{include file="$tpl_dir./errors.tpl"} - -{if !isset($errors) OR !sizeof($errors)} -

    {l s='List of products by supplier:'} {$supplier->name|escape:'htmlall':'UTF-8'}

    - {if !empty($supplier->description)} -
    -

    {$supplier->description}

    -
    - {/if} - - {if $products} -
    - {include file="$tpl_dir./product-sort.tpl"} -
    - {include file="./product-compare.tpl"} - {include file="$tpl_dir./product-list.tpl" products=$products} - {include file="$tpl_dir./pagination.tpl"} - {include file="./product-compare.tpl"} - {else} -

    {l s='No products for this supplier.'}

    - {/if} -{/if} +{* +* 2007-2012 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @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 +*} + +{include file="$tpl_dir./breadcrumb.tpl"} + +{include file="$tpl_dir./errors.tpl"} + +{if !isset($errors) OR !sizeof($errors)} +

    {l s='List of products by supplier:'} {$supplier->name|escape:'htmlall':'UTF-8'}

    + {if !empty($supplier->description)} +
    +

    {$supplier->description}

    +
    + {/if} + + {if $products} +
    + {include file="$tpl_dir./pagination.tpl"} + +
    + {include file="./product-sort.tpl"} + {include file="./product-compare.tpl"} + {include file="./nbr-product-page.tpl"} +
    +
    + + {include file="./product-list.tpl" products=$products} + +
    +
    + {include file="./product-sort.tpl"} {include file="./product-compare.tpl"} {include file="./nbr-product-page.tpl"} + +
    + {include file="./pagination.tpl"} +
    + {else} +

    {l s='No products for this manufacturer.'}

    + {/if} +{/if} From 6d3d2bec77713ccda446e7955f5713ebac0bae38 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Tue, 27 Nov 2012 15:30:37 +0100 Subject: [PATCH 121/316] [-] INSTALLER : fixed bug #PSCFV-5721 Duplicate column name 'cover' --- install-dev/upgrade/php/image_shop1510.php | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 install-dev/upgrade/php/image_shop1510.php diff --git a/install-dev/upgrade/php/image_shop1510.php b/install-dev/upgrade/php/image_shop1510.php new file mode 100644 index 000000000..3f0ba3756 --- /dev/null +++ b/install-dev/upgrade/php/image_shop1510.php @@ -0,0 +1,36 @@ + +* @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); +} From b123955b268b5d39b67179ad4b21f6e65a860bbc Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Tue, 27 Nov 2012 15:31:21 +0100 Subject: [PATCH 122/316] [-] INSTALLER : fixed bug #PSCFV-5721 Duplicate column name 'cover' part 2 --- install-dev/upgrade/sql/1.5.1.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); From a7d67fcd481ff49eb1b203196cb5cea68e6a7090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 27 Nov 2012 15:57:01 +0100 Subject: [PATCH 123/316] // small fix for merge pull #49 --- modules/blockbestsellers/blockbestsellers.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/blockbestsellers/blockbestsellers.php b/modules/blockbestsellers/blockbestsellers.php index 4f00dcc91..48e96e797 100644 --- a/modules/blockbestsellers/blockbestsellers.php +++ b/modules/blockbestsellers/blockbestsellers.php @@ -100,14 +100,10 @@ class BlockBestSellers extends Module $currency = new Currency($params['cookie']->id_currency); - $id_group = $this->context->customer->id_default_group; - if(Group::getPriceDisplayMethod($id_group) == PS_TAX_EXC) + if (Product::getTaxCalculationMethod((int)$this->context->customer->id) == PS_TAX_EXC) $usetax = false; else - if(Configuration::get('PS_TAX_DISPLAY') == PS_TAX_EXC) - $usetax = false; - else - $usetax = true; + $usetax = true; $bestsellers = ProductSale::getBestSalesLight((int)($params['cookie']->id_lang), 0, 5); From 23862593f1a61cc2945582db28c4b55567ca4242 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Tue, 27 Nov 2012 16:33:32 +0100 Subject: [PATCH 124/316] [-] FO : fixed bug #PSCFV-5865 - Payment modules are not visible in the hookPayment for a foreigner country --- classes/controller/FrontController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index b35710e15..abe7d578f 100755 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -165,7 +165,7 @@ class FrontControllerCore extends Controller /* Theme is missing */ if (!is_dir(_PS_THEME_DIR_)) die(sprintf(Tools::displayError('Current theme unavailable "%s". Please check your theme directory name and permissions.'), basename(rtrim(_PS_THEME_DIR_, '/\\')))); - + if (Configuration::get('PS_GEOLOCATION_ENABLED')) if (($newDefault = $this->geolocationManagement($this->context->country)) && Validate::isLoadedObject($newDefault)) $this->context->country = $newDefault; @@ -298,6 +298,7 @@ class FrontControllerCore extends Controller { $infos = Address::getCountryAndState((int)($cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')})); $country = new Country((int)$infos['id_country']); + $this->context->country = $country; if (Validate::isLoadedObject($country)) $display_tax_label = $country->display_tax_label; } From 8cb08f5d840fb32f9778e5e6e469fc03a74d8290 Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Tue, 27 Nov 2012 16:40:41 +0100 Subject: [PATCH 125/316] [-] FO: fix Referral Program Email link fix generates duplicate address in the url - #PSCFV-5853 Fixed in all languages --- .../referralprogram/mails/de/referralprogram-invitation.html | 2 +- .../referralprogram/mails/en/referralprogram-invitation.html | 2 +- .../referralprogram/mails/es/referralprogram-invitation.html | 2 +- .../referralprogram/mails/fr/referralprogram-invitation.html | 2 +- .../referralprogram/mails/it/referralprogram-invitation.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/referralprogram/mails/de/referralprogram-invitation.html b/modules/referralprogram/mails/de/referralprogram-invitation.html index dc3bef094..f2cc7b6d5 100644 --- a/modules/referralprogram/mails/de/referralprogram-invitation.html +++ b/modules/referralprogram/mails/de/referralprogram-invitation.html @@ -32,7 +32,7 @@   -Klicken Sie einfach hier, um sich anzumelden! +Klicken Sie einfach hier, um sich anzumelden!   diff --git a/modules/referralprogram/mails/en/referralprogram-invitation.html b/modules/referralprogram/mails/en/referralprogram-invitation.html index 6f47b8c84..7d413cef7 100644 --- a/modules/referralprogram/mails/en/referralprogram-invitation.html +++ b/modules/referralprogram/mails/en/referralprogram-invitation.html @@ -32,7 +32,7 @@   -It's very easy to sign up. Just click here! +It's very easy to sign up. Just click here!   diff --git a/modules/referralprogram/mails/es/referralprogram-invitation.html b/modules/referralprogram/mails/es/referralprogram-invitation.html index 989b041ad..53f643317 100755 --- a/modules/referralprogram/mails/es/referralprogram-invitation.html +++ b/modules/referralprogram/mails/es/referralprogram-invitation.html @@ -32,7 +32,7 @@   -¡Para nosotros, nada más simple, haga clic aquí! +¡Para nosotros, nada más simple, haga clic aquí!   diff --git a/modules/referralprogram/mails/fr/referralprogram-invitation.html b/modules/referralprogram/mails/fr/referralprogram-invitation.html index d7e1d7306..ea5d3394b 100644 --- a/modules/referralprogram/mails/fr/referralprogram-invitation.html +++ b/modules/referralprogram/mails/fr/referralprogram-invitation.html @@ -32,7 +32,7 @@   -Pour nous rejoindre, rien de plus simple, cliquez-ici ! +Pour nous rejoindre, rien de plus simple, cliquez-ici !   diff --git a/modules/referralprogram/mails/it/referralprogram-invitation.html b/modules/referralprogram/mails/it/referralprogram-invitation.html index 394a69c35..fae5335f9 100644 --- a/modules/referralprogram/mails/it/referralprogram-invitation.html +++ b/modules/referralprogram/mails/it/referralprogram-invitation.html @@ -32,7 +32,7 @@   -E' facilissimo iscriversi. Basta cliccare qui! +E' facilissimo iscriversi. Basta cliccare qui!   From 21fd4d5eaab5fc14ba03cc2565f0f08b6da169f5 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Tue, 27 Nov 2012 17:07:59 +0100 Subject: [PATCH 126/316] [-] FO : fixed bug #PSCFV-5871 - URL rewrite with layered disabled --- classes/Link.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Link.php b/classes/Link.php index 0d1eb1455..0c7e56951 100644 --- a/classes/Link.php +++ b/classes/Link.php @@ -169,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'; From e555e679eb127c1c9487ef2fa3e437025656377d Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Tue, 27 Nov 2012 18:39:32 +0100 Subject: [PATCH 127/316] //added modules/statssales/config.xml --- modules/statssales/config.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 modules/statssales/config.xml diff --git a/modules/statssales/config.xml b/modules/statssales/config.xml new file mode 100644 index 000000000..f0ee70025 --- /dev/null +++ b/modules/statssales/config.xml @@ -0,0 +1,12 @@ + + + statssales + + + + + + 0 + 0 + + \ No newline at end of file From d16cd5a3bffee038830cb867fefaf7502f8cbf19 Mon Sep 17 00:00:00 2001 From: PrestaEdit Date: Tue, 27 Nov 2012 22:55:57 +0100 Subject: [PATCH 128/316] [-] FO : show mobile theme if you have click "Broswe the mobile site" on a PC --- classes/Context.php | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/classes/Context.php b/classes/Context.php index 7790dc27c..e33a91dd9 100644 --- a/classes/Context.php +++ b/classes/Context.php @@ -111,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(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; + } } } } From 905e6ce611f575a9bf7ad1e631fc0099048be669 Mon Sep 17 00:00:00 2001 From: PrestaEdit Date: Wed, 28 Nov 2012 01:10:42 +0100 Subject: [PATCH 129/316] [+] BO: add posibility to set a Mobile Header logo --- controllers/admin/AdminThemesController.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 029f43503..478d94fac 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -127,6 +127,14 @@ class AdminThemesControllerCore extends AdminController 'type' => 'file', 'thumb' => _PS_IMG_.Configuration::get('PS_LOGO').'?date='.time() ), + 'PS_LOGO_MOBILE' => array( + 'title' => $this->l('Mobile Header logo'), + 'desc' => + ((Configuration::get('PS_LOGO_MOBILE') === false) ? ''.$this->l('Warning: No mobile logo defined, the header logo is used instead.').'
    ' : ''). + $this->l('Will appear on mobile main page. If undefined, the Header logo will be used'), + 'type' => 'file', + 'thumb' => (Configuration::get('PS_LOGO_MOBILE') !== false && file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO_MOBILE'))) ? _PS_IMG_.Configuration::get('PS_LOGO_MOBILE').'?date='.time() : _PS_IMG_.Configuration::get('PS_LOGO').'?date='.time() + ), 'PS_LOGO_MAIL' => array( 'title' => $this->l('Mail logo'), 'desc' => From 238475c097f64b254c50cb0b3f4ff35cdfd7c978 Mon Sep 17 00:00:00 2001 From: PrestaEdit Date: Wed, 28 Nov 2012 01:19:45 +0100 Subject: [PATCH 130/316] [+] BO: add updateOptionPsLogoMobile() --- controllers/admin/AdminThemesController.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 478d94fac..0ac54ff05 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -547,6 +547,14 @@ class AdminThemesControllerCore extends AdminController { $this->updateLogo('PS_LOGO', 'logo'); } + + /** + * Update PS_LOGO_MOBILE + */ + public function updateOptionPsLogoMobile() + { + $this->updateLogo('PS_LOGO_MOBILE', 'logo_mobile'); + } /** * Update PS_LOGO_MAIL From d6cf7278cf58bb6eb8dc152a052d468a833d8232 Mon Sep 17 00:00:00 2001 From: PrestaEdit Date: Wed, 28 Nov 2012 01:23:24 +0100 Subject: [PATCH 131/316] [+] BO: modifiy smarty var $logo_url to have the mobile logo image if mobile version --- classes/controller/FrontController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index 1b02797d6..6814fb31a 100755 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -608,7 +608,7 @@ class FrontControllerCore extends Controller 'favicon_url' => _PS_IMG_.Configuration::get('PS_FAVICON'), 'logo_image_width' => Configuration::get('SHOP_LOGO_WIDTH'), 'logo_image_height' => Configuration::get('SHOP_LOGO_HEIGHT'), - 'logo_url' => _PS_IMG_.Configuration::get('PS_LOGO').'?'.Configuration::get('PS_IMG_UPDATE_TIME') + 'logo_url' => ($this->context->getMobileDevice() == false ? _PS_IMG_.Configuration::get('PS_LOGO').'?'.Configuration::get('PS_IMG_UPDATE_TIME') : _PS_IMG_.Configuration::get('PS_LOGO_MOBILE').'?'.Configuration::get('PS_IMG_UPDATE_TIME')) )); $template_dir = ($this->context->getMobileDevice() == true ? _PS_THEME_MOBILE_DIR_ : _PS_THEME_DIR_); From 9c51161cfa995d71e953ccc47fb3b1abb28e94ee Mon Sep 17 00:00:00 2001 From: PrestaEdit Date: Wed, 28 Nov 2012 01:26:53 +0100 Subject: [PATCH 132/316] [+] BO: modifiy width and height configuration for the mobile logo --- controllers/admin/AdminThemesController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 0ac54ff05..eaa87e60c 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -408,6 +408,12 @@ class AdminThemesControllerCore extends AdminController Configuration::updateValue('SHOP_LOGO_HEIGHT', (int)round($height)); Configuration::updateValue('SHOP_LOGO_WIDTH', (int)round($width)); } + if (file_exists(_PS_IMG_DIR_.'logo_mobile.jpg')) + { + list($width, $height, $type, $attr) = getimagesize(_PS_IMG_DIR_.Configuration::get('PS_LOGO_MOBILE')); + Configuration::updateValue('SHOP_LOGO_MOBILE_HEIGHT', (int)round($height)); + Configuration::updateValue('SHOP_LOGO_MOBILE_WIDTH', (int)round($width)); + } $this->content .= $content; return parent::initContent(); From 06ca6d2576e5bf6db8922eaa28cd6ec785db5f9f Mon Sep 17 00:00:00 2001 From: PrestaEdit Date: Wed, 28 Nov 2012 01:31:43 +0100 Subject: [PATCH 133/316] [+] FO: modifiy width and height smarty vars for the mobile logo --- classes/controller/FrontController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index 6814fb31a..3a08d7efe 100755 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -606,8 +606,8 @@ class FrontControllerCore extends Controller header('HTTP/1.1 503 temporarily overloaded'); $this->context->smarty->assign(array( 'favicon_url' => _PS_IMG_.Configuration::get('PS_FAVICON'), - 'logo_image_width' => Configuration::get('SHOP_LOGO_WIDTH'), - 'logo_image_height' => Configuration::get('SHOP_LOGO_HEIGHT'), + 'logo_image_width' => ($this->context->getMobileDevice() == false ? Configuration::get('SHOP_LOGO_WIDTH') : Configuration::get('SHOP_LOGO_MOBILE_WIDTH')), + 'logo_image_height' => ($this->context->getMobileDevice() == false ? Configuration::get('SHOP_LOGO_HEIGHT') : Configuration::get('SHOP_LOGO_MOBILE_HEIGHT')), 'logo_url' => ($this->context->getMobileDevice() == false ? _PS_IMG_.Configuration::get('PS_LOGO').'?'.Configuration::get('PS_IMG_UPDATE_TIME') : _PS_IMG_.Configuration::get('PS_LOGO_MOBILE').'?'.Configuration::get('PS_IMG_UPDATE_TIME')) )); From d8bd1f7ca6ba7dc213e985d566f7039b4fec981e Mon Sep 17 00:00:00 2001 From: Damon Skelhorn Date: Wed, 28 Nov 2012 09:35:23 +0000 Subject: [PATCH 134/316] Removed ID from repeating product rows in shopping cart table. --- themes/default/shopping-cart.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/shopping-cart.tpl b/themes/default/shopping-cart.tpl index 6c2cef4ed..16f58aecf 100644 --- a/themes/default/shopping-cart.tpl +++ b/themes/default/shopping-cart.tpl @@ -260,7 +260,7 @@ {if isset($cannotModify) AND $cannotModify == 1} {if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if} {else} -
    +
    {l s='Add'}
    {if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1} From 358c0c168f34cfa451ee8fa0de52e2ea37a8991b Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Wed, 28 Nov 2012 10:56:43 +0100 Subject: [PATCH 135/316] [-] BO : fixed bug #PSCFV-5610 Credit slip reference is too short [*] BO : added prefix on credit slip reference --- .../template/controllers/orders/_documents.tpl | 2 +- classes/pdf/HTMLTemplateOrderSlip.php | 5 ++--- controllers/admin/AdminSlipController.php | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/orders/_documents.tpl b/admin-dev/themes/default/template/controllers/orders/_documents.tpl index b1ca81630..cff383826 100644 --- a/admin-dev/themes/default/template/controllers/orders/_documents.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_documents.tpl @@ -73,7 +73,7 @@ {$document->getInvoiceNumberFormatted($current_id_lang)} {/if} {elseif get_class($document) eq 'OrderSlip'} - {l s='#%d' sprintf=$document->id} + #{Configuration::get('PS_CREDIT_SLIP_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->id} {/if} {l s='See the document'} {if get_class($document) eq 'OrderInvoice'} diff --git a/classes/pdf/HTMLTemplateOrderSlip.php b/classes/pdf/HTMLTemplateOrderSlip.php index f0aa42af0..71d0a6020 100644 --- a/classes/pdf/HTMLTemplateOrderSlip.php +++ b/classes/pdf/HTMLTemplateOrderSlip.php @@ -47,7 +47,7 @@ class HTMLTemplateOrderSlipCore extends HTMLTemplateInvoice // header informations $this->date = Tools::displayDate($this->order->invoice_date, (int)$this->order->id_lang); - $this->title = HTMLTemplateOrderSlip::l('Slip #').sprintf('%06d', (int)$this->order_slip->id); + $this->title = HTMLTemplateOrderSlip::l('Slip #').Configuration::get('PS_CREDIT_SLIP_PREFIX', Context::getContext()->language->id).sprintf('%06d', (int)$this->order_slip->id); // footer informations $this->shop = new Shop((int)$this->order->id_shop); @@ -195,10 +195,9 @@ class HTMLTemplateOrderSlipCore extends HTMLTemplateInvoice } else { + $tax_rate = 0; foreach ($tax_amount as $tax_id => $amount) { - $tax_rate = 0; - $tax = new Tax((int)$tax_id); $tax_rate = $tax->rate; $infos['total_price_tax_excl'] += (float)Tools::ps_round($order_slip_details['amount_tax_excl'], 2); diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php index ed6e86087..324788952 100644 --- a/controllers/admin/AdminSlipController.php +++ b/controllers/admin/AdminSlipController.php @@ -59,6 +59,21 @@ class AdminSlipControllerCore extends AdminController $this->_select = 'a.id_order_slip AS id_pdf'; $this->optionTitle = $this->l('Slip'); + $this->fields_options = array( + 'general' => array( + 'title' => $this->l('Credit slip options'), + 'fields' => array( + 'PS_CREDIT_SLIP_PREFIX' => array( + 'title' => $this->l('Credit slips prefix:'), + 'desc' => $this->l('Prefix used for credit slips'), + 'size' => 6, + 'type' => 'textLang' + ) + ), + 'submit' => array() + ) + ); + parent::__construct(); } @@ -130,6 +145,7 @@ class AdminSlipControllerCore extends AdminController $this->initToolbar(); $this->content .= $this->renderList(); $this->content .= $this->renderForm(); + $this->content .= '
    '.$this->renderOptions(); $this->context->smarty->assign(array( 'content' => $this->content, From 34200851130c07f2531f392d933f31ebfb5e3521 Mon Sep 17 00:00:00 2001 From: Damon Skelhorn Date: Wed, 28 Nov 2012 10:33:25 +0000 Subject: [PATCH 136/316] Another instance of cart_quantity_button set as ID --- themes/default/shopping-cart-product-line.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/shopping-cart-product-line.tpl b/themes/default/shopping-cart-product-line.tpl index a71e0714b..745801c4c 100644 --- a/themes/default/shopping-cart-product-line.tpl +++ b/themes/default/shopping-cart-product-line.tpl @@ -61,7 +61,7 @@ {$product.customizationQuantityTotal} {/if} {if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0} -
    +
    {l s='Add'}
    {if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1} From 6d0d0bab1f5046731d68e453f7a522122928d12c Mon Sep 17 00:00:00 2001 From: oleacorner Date: Wed, 28 Nov 2012 13:55:08 +0100 Subject: [PATCH 137/316] Update classes/pdf/PDFGenerator.php Proposal to enhance the $display parameter. The proposal supports the true/false value, but also the 'D', 'I' and 'S' of fpdf. The behavior of the true value is changed to 'D' instead of 'I'. So, in fornt or back office, while cliking on a button to retrieve a PDF, the download windows is proposed instead of displaying the PDF inside the navigator. --- classes/pdf/PDFGenerator.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/classes/pdf/PDFGenerator.php b/classes/pdf/PDFGenerator.php index d9e840364..9bf30d3d6 100755 --- a/classes/pdf/PDFGenerator.php +++ b/classes/pdf/PDFGenerator.php @@ -132,7 +132,17 @@ class PDFGeneratorCore extends TCPDF $this->lastPage(); - $output = $display ? 'I' : 'S'; + if ($display === true) + $output = 'D'; + elseif ($display === false) + $output = 'S'; + elseif (display == 'D') + $output = 'D'; + elseif (display == 'S') + $output = 'S'; + else + $output = 'I'; + return $this->output($filename, $output); } From 86bbb063606d620d8f447c4e7fa0f9af5c2a1108 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Wed, 28 Nov 2012 14:38:19 +0100 Subject: [PATCH 138/316] //bad link in CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f9c682fca..c442c8273 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,5 +8,5 @@ All core files you commit in your pull request must have Open Software License ( All modules files you commit in your pull request must have Academic Free License (AFL 3.0) [1]: https://help.github.com/articles/using-pull-requests -[2]: http://docs.prestashop.com/display/PS15/Coding+Standard +[2]: http://docs.prestashop.com/display/PS15/How+to+write+a+commit+message [3]: http://docs.prestashop.com/display/PS15/Commit+norme \ No newline at end of file From 585841909fd3c4bc57f7a246a5fd3b41ff37b287 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Wed, 28 Nov 2012 14:45:52 +0100 Subject: [PATCH 139/316] //bad link in CONTRIBUTING.md :p --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c442c8273..944062c4e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,5 +8,5 @@ All core files you commit in your pull request must have Open Software License ( All modules files you commit in your pull request must have Academic Free License (AFL 3.0) [1]: https://help.github.com/articles/using-pull-requests -[2]: http://docs.prestashop.com/display/PS15/How+to+write+a+commit+message -[3]: http://docs.prestashop.com/display/PS15/Commit+norme \ No newline at end of file +[2]: http://docs.prestashop.com/display/PS15/Coding+Standard +[3]: http://docs.prestashop.com/display/PS15/How+to+write+a+commit+message \ No newline at end of file From bb3ede3aedeae8fe46f20767cb4e60264fe240e6 Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Wed, 28 Nov 2012 15:13:14 +0100 Subject: [PATCH 140/316] [-] FO: added border-right on product-comparison table --- themes/default/css/comparator.css | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/default/css/comparator.css b/themes/default/css/comparator.css index d2a5c611e..3290e86e0 100644 --- a/themes/default/css/comparator.css +++ b/themes/default/css/comparator.css @@ -8,6 +8,7 @@ table#product_comparison { padding:6px; border-top:1px solid #ccc; border-left:1px solid #ccc; + border-right:1px solid #ccc; vertical-align:top } #product_comparison td.td_empty{ From f9fb4b7f8d8cda11f6107528aab1363db4a595ac Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Wed, 28 Nov 2012 16:07:36 +0100 Subject: [PATCH 141/316] [-] FO: fix #product_list li span.new: IE 6,7,8 bug: New product badge not correct position - #PSCFV-5898 --- modules/homefeatured/homefeatured.css | 140 +++++++++++++------------- themes/default/css/product_list.css | 5 +- 2 files changed, 74 insertions(+), 71 deletions(-) diff --git a/modules/homefeatured/homefeatured.css b/modules/homefeatured/homefeatured.css index fa8c75598..b63a563e5 100644 --- a/modules/homefeatured/homefeatured.css +++ b/modules/homefeatured/homefeatured.css @@ -1,69 +1,71 @@ -#featured-products_block_center li { - margin-right:10px; - padding:10px 0; - width:126px; - height:240px -} -#featured-products_block_center li.last_item_of_line {margin-right:0;} -#featured-products_block_center h5 { - padding-top:5px; - height:30px; - font-size:12px; - color:#222 -} - -#featured-products_block_center .product_image { - display:block; - position:relative; - overflow:hidden -} -#featured-products_block_center .product_image span.new { - display: block; - position: absolute; - top: 15px; - right:-30px; - padding: 1px 4px; - width: 101px; - font-size:10px; - color: #fff; - text-align: center; - text-transform: uppercase; - -moz-transform: rotate(45deg); - -webkit-transform: rotate(45deg); - -o-transform:rotate(45deg); - -ms-transform: rotate(45deg); - background-color: #990000; - transform: rotate(45deg); /* Newer browsers */ - filter: progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476); /* IE6,IE7 */ - -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"; /* IE8 */ -} - -.ie8 #featured-products_block_center .product_image span.new {top:-17px;} -.ie7 #featured-products_block_center .product_image span.new {top:-30px;right:-25px} -.lt-ie6 #featured-products_block_center .product_image span.new {top:-30px;right:-25px} - -#featured-products_block_center .product_desc {height:45px;} -#featured-products_block_center .product_desc, -#featured-products_block_center .product_desc a { - color:#666 -} -#featured-products_block_center .lnk_more { - display:inline; - padding-right:10px; - font-weight:bold; - font-size:10px; - color:#0088cc; - background:url(img/arrow_right_1.png) no-repeat 100% 3px; -} -#featured-products_block_center .price_container { - margin-top:10px; - padding:0; -} -#featured-products_block_center .price { - font-weight:bold; - font-size:14px; - color:#990000 -} -#featured-products_block_center li .ajax_add_to_cart_button {display:none;} -#featured-products_block_center li span.exclusive {display:none;} - +#featured-products_block_center li { + margin-right:10px; + padding:10px 0; + width:126px; + height:240px +} +#featured-products_block_center li.last_item_of_line {margin-right:0;} +#featured-products_block_center h5 { + padding-top:5px; + height:30px; + font-size:12px; + color:#222 +} + +#featured-products_block_center .product_image { + display:block; + position:relative; + overflow:hidden +} +#featured-products_block_center .product_image span.new { + display: block; + position: absolute; + top: 15px; + right:-30px; + padding: 1px 4px; + width: 101px; + font-size:10px; + color: #fff; + text-align: center; + text-transform: uppercase; + -moz-transform: rotate(45deg); + -webkit-transform: rotate(45deg); + -o-transform:rotate(45deg); + /*-ms-transform: rotate(45deg);*/ + background-color: #990000; + transform: rotate(45deg); /* Newer browsers */ + filter: progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476); /* IE6,IE7 */ + -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"; /* IE8 */ +} + +.ie9 #featured-products_block_center .product_image span.new{top:-18px;right:-38px} +.ie8 #featured-products_block_center .product_image span.new{top:-18px;right:-38px} +.ie8 #featured-products_block_center .product_image span.new {top:-17px;} +.ie7 #featured-products_block_center .product_image span.new {top:-30px;right:-25px} +.lt-ie6 #featured-products_block_center .product_image span.new {top:-30px;right:-25px} + +#featured-products_block_center .product_desc {height:45px;} +#featured-products_block_center .product_desc, +#featured-products_block_center .product_desc a { + color:#666 +} +#featured-products_block_center .lnk_more { + display:inline; + padding-right:10px; + font-weight:bold; + font-size:10px; + color:#0088cc; + background:url(img/arrow_right_1.png) no-repeat 100% 3px; +} +#featured-products_block_center .price_container { + margin-top:10px; + padding:0; +} +#featured-products_block_center .price { + font-weight:bold; + font-size:14px; + color:#990000 +} +#featured-products_block_center li .ajax_add_to_cart_button {display:none;} +#featured-products_block_center li span.exclusive {display:none;} + diff --git a/themes/default/css/product_list.css b/themes/default/css/product_list.css index ca49575c4..1cd807eca 100644 --- a/themes/default/css/product_list.css +++ b/themes/default/css/product_list.css @@ -57,14 +57,15 @@ ul#product_list { -moz-transform: rotate(45deg); -webkit-transform: rotate(45deg); -o-transform:rotate(45deg); - -ms-transform: rotate(45deg); + /*-ms-transform: rotate(45deg);*/ background-color: #990000; transform: rotate(45deg); /* Newer browsers */ filter: progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476); /* IE6,IE7 */ -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"; /* IE8 */ } - .ie8 #product_list li span.new{top:-17px;} + .ie9 #product_list li span.new{top:-18px;right:-38px} + .ie8 #product_list li span.new{top:-18px;right:-38px} .ie7 #product_list li span.new {top:-30px;right:-25px} .lt-ie6 #featured-products_block_center .product_image span.new {top:-30px;right:-25px} #product_list li h3 { From 0b104281249a3d45053a54f048074d68fe8fa8bc Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Wed, 28 Nov 2012 16:27:21 +0100 Subject: [PATCH 142/316] //remove useless comment --- themes/default/mobile/category.tpl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/themes/default/mobile/category.tpl b/themes/default/mobile/category.tpl index 2494f0571..5d0fc8954 100644 --- a/themes/default/mobile/category.tpl +++ b/themes/default/mobile/category.tpl @@ -51,11 +51,6 @@ {include file="./category-product-sort.tpl" container_class="container-sort"}

    {include file="$tpl_dir./category-count.tpl"}

    - - {* layered ? *} - {* ===================================== *} - {*

    Affiner la recherche

    *} - {* ===================================== *}
    {include file="./pagination.tpl"} From eb65e76252a8fae46c1b6a248466a47d6561d688 Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Wed, 28 Nov 2012 17:01:56 +0100 Subject: [PATCH 143/316] [-] FO: Bug CSS on SAFARI with iphone or ipad - #PSCFV-5704 --- themes/default/css/authentication.css | 2 +- themes/default/css/global.css | 4147 +++++++++++++------------ 2 files changed, 2080 insertions(+), 2069 deletions(-) diff --git a/themes/default/css/authentication.css b/themes/default/css/authentication.css index 6f15cab23..46f5ceb4f 100644 --- a/themes/default/css/authentication.css +++ b/themes/default/css/authentication.css @@ -1,7 +1,7 @@ /* create account ****************************************************************************** */ #account-creation_form {} - #account-creation_form fieldset { + #account-creation_form fieldset, fieldset.account_creation { padding:0 0 15px 0; border:1px solid #ccc; background:#f8f8f8 diff --git a/themes/default/css/global.css b/themes/default/css/global.css index aa9278ae3..5cf18567b 100644 --- a/themes/default/css/global.css +++ b/themes/default/css/global.css @@ -1,2068 +1,2079 @@ -/* ################################################################################################## - PRESTASHOP CSS -################################################################################################## */ - -@import url("grid_prestashop.css"); - -/* **************************************************************************** - reset -**************************************************************************** */ -html{color:#000;background:#FFF;} -body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0} -table{border-collapse:collapse;border-spacing:0} -fieldset,img{border:0} -address,caption,cite,code,dfn,em,th,var,optgroup{font-style:inherit;font-weight:inherit} -del,ins{text-decoration:none} -caption,th{text-align:left} -h1,h2,h3,h4,h5,h6{font-size:100%} -q:before,q:after{content:''} -abbr,acronym{border:0;font-variant:normal} -sup{vertical-align:baseline} -sub{vertical-align:baseline} -legend{color:#000} -input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit} -input,button,textarea,select{font-size:100%} -a {cursor:pointer} - -.clearfix:before, -.clearfix:after { - content: "."; - display: block; - height: 0; - overflow: hidden -} -.clearfix:after {clear: both} -.clearfix {zoom: 1} - - -/* ************************************************************************************************ - struture -************************************************************************************************ */ -#page {} - #header {z-index:10} - #columns {z-index:1} - #left_column {} - #center_column {} - #right_column {} - #footer {} - - -/* ************************************************************************************************ - generic style -************************************************************************************************ */ -body{ - font:normal 11px/14px Arial, Verdana, sans-serif; - color:#222; - background:#fff -} -body.content_only { - background: #FFF; -} - -/* positionnement ****************************************************************************** */ -.hidden {display:none} -.f_right {float:right} -p.center {text-align:center} -.clearBoth {clear:both} - -/* title *************************************************************************************** */ -h1 { - margin-bottom:20px; - font-size:24px; - line-height: 22px -} -h2 { - padding-bottom:20px; - font-size:18px -} -h3 { - padding-bottom:20px; - font-size:16px -} -h4 { - padding-bottom:20px; - font-size:14px -} - -.hide-left-column #left_column {display:none} -.hide-left-column #center_column {width:757px} - -/* text **************************************************************************************** */ -p {padding-bottom:20px} - -p em {font-style:italic} - -.warning { - margin:0 0 10px 0; - padding:10px; - border:1px solid #e6db55; - font-size:13px; - background:#ffffe0 -} -.success { - margin:0 0 10px 0; - padding:10px; - border:1px solid #5cff74; - font-size:13px; - background: #d3ffab -} -.error { - margin:0 0 10px 0; - padding:10px; - border:1px solid #990000; - font-size:13px; - background:#ffcccc -} -.error ol {margin-left:20px} -.error p.lnk { - margin-top:20px; - padding:0; - font-size:11px -} -.required {color:#990000} - -/* link **************************************************************************************** */ -a, a:active, a:visited { - color:#333; - text-decoration:none; - outline: medium none -} - a:hover {text-decoration:underline} - -/*buttons ************************************************************************************** */ -input.button_mini, input.button_small, input.button, input.button_large, -input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled, -input.exclusive_mini, input.exclusive_small, input.exclusive, input.exclusive_large, -input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled, -a.button_mini, a.button_small, a.button, a.button_large, -a.exclusive_mini, a.exclusive_small, a.exclusive, a.exclusive_large, -span.button_mini, span.button_small, span.button, span.button_large, -span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, span.exclusive_large_disabled { - position:relative; - display:inline-block; - padding:5px 7px; - border:1px solid #cc9900; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - font-weight:bold; - color:#000; - background:url(../img/bg_bt.gif) repeat-x 0 0 #f4b61b; - cursor: pointer; -} -*:first-child+html input.button_mini, *:first-child+html input.button_small, *:first-child+html input.button, *:first-child+html input.button_large, -*:first-child+html input.button_mini_disabled, *:first-child+html input.button_small_disabled, *:first-child+html input.button_disabled, *:first-child+html input.button_large_disabled, -*:first-child+html input.exclusive_mini, *:first-child+html input.exclusive_small, *:first-child+html input.exclusive, *:first-child+html input.exclusive_large, -*:first-child+html input.exclusive_mini_disabled, *:first-child+html input.exclusive_small_disabled, *:first-child+html input.exclusive_disabled, *:first-child+html input.exclusive_large_disabled { - border:none -} - - -/* input button */ -input.button_mini, input.button_small, input.button, input.button_large, -input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled, -input.exclusive_mini, input.exclusive_small, input.exclusive, input.exclusive_large, -input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled { - /*padding-bottom: 2px*/ -} - -/* disabled button */ -input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled, -input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled, -span.button_mini, span.button_small, span.button, span.button_large, -span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, span.exclusive_large_disabled { - /*background-position: left -36px; - cursor: default; - color: #888!important*/ -} - -/* exclusive button */ -input.exclusive_mini, input.exclusive_small, input.exclusive, input.exclusive_large, -input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled, -a.exclusive_mini, a.exclusive_small, a.exclusive, a.exclusive_large, -span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, span.exclusive_large_disabled { - /*color: white!important*/ -} - -/* exclusive disabled button */ -input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled, span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large { - /*color: #488c40!important*/ -} - -/* hover button */ -input.button_mini:hover, input.button_small:hover, input.button:hover, input.button_large:hover, -input.exclusive_mini:hover, input.exclusive_small:hover, input.exclusive:hover, input.exclusive_large:hover, -a.button_mini:hover, a.button_small:hover, a.button:hover, a.button_large:hover, -a.exclusive_mini:hover, a.exclusive_small:hover, a.exclusive:hover, a.exclusive_large:hover { - text-decoration:none; - background-position: left -50px -} - -/* exclusive hover button */ -input.exclusive_mini:hover, input.exclusive_small:hover, input.exclusive:hover, input.exclusive_large:hover, a.exclusive_mini:hover, a.exclusive_small:hover, a.exclusive:hover, a.exclusive_large:hover { - /*color: white!important*/ -} - -/* active button */ -input.button_mini:active, input.button_small:active, input.button:active, input.button_large:active, -input.exclusive_mini:active, input.exclusive_small:active, input.exclusive:active, input.exclusive_large:active, -a.button_mini:active, a.button_small:active, a.button:active, a.button_large:active, -a.exclusive_mini:active, a.exclusive_small:active, a.exclusive:active, a.exclusive_large:active { - background-position: left -100px -} - -/* classic buttons */ -input.button_mini, input.button_mini_disabled, input.exclusive_mini, input.exclusive_mini_disabled, a.button_mini, a.exclusive_mini, span.button_mini, span.exclusive_mini { - /*width: 30px; - background-image: url('../img/button-mini.png')*/ -} -input.button_small, input.button_small_disabled, input.exclusive_small, input.exclusive_small_disabled, a.button_small, a.exclusive_small, span.button_small, span.exclusive_small { - /*width: 60px; - background-image: url('../img/button-small.png')*/ -} -input.button_disabled, input.exclusive_disabled, span.exclusive { - border:1px solid #ccc; - color:#999; - background:url(../img/bg_bt_2.gif) repeat-x 0 0 #f4b61b; - cursor:default; -} -input.button_large, input.button_large_disabled, input.exclusive_large, input.exclusive_large_disabled, a.button_large, a.exclusive_large, span.button_large, span.exclusive_large, span.exclusive_large_disabled { - /*width: 180px; - background-image: url('../img/button-large.png')*/ -} - -/* exclusive button */ -/*input.exclusive, input.exclusive_disabled, a.exclusive, span.exclusive { background-image: url('../img/button-medium_exclusive.png') } -input.exclusive_mini, input.exclusive_mini_disabled, a.exclusive_mini, span.exclusive_mini { background-image: url('../img/button-mini_exclusive.gif') } -input.exclusive_small, input.exclusive_small_disabled, a.exclusive_small, span.exclusive_small { background-image: url('../img/button-small_exclusive.gif') } -input.exclusive_large, input.exclusive_large_disabled, a.exclusive_large, span.exclusive_large, span.exclusive_large_disabled { background-image: url('../img/button-large_exclusive.gif') }*/ - -/* form **************************************************************************************** */ -form.std fieldset { - margin:20px 0; - border:1px solid #ccc -} - -/* table *************************************************************************************** */ -table.std, -table.table_block { - margin-bottom:20px; - width:100%; - border:1px solid #999; - border-bottom:none; - background:white; -} -table.std th, -table.table_block th { - padding:14px 12px; - font-size:12px; - color:#fff; - font-weight:bold; - text-transform:uppercase; - text-shadow:0 1px 0 #000; - background:url(../img/bg_table_th.png) repeat-x 0 0 #999 -} -table.std tr.alternate_item, -table.table_block tr.alternate_item {background-color: #f3f3f3} -table.std td, -table.table_block td { - padding:12px; - border-right:1px solid #e9e9e9; - border-bottom:1px solid #e9e9e9; - font-size:12px; - vertical-align:top -} - -/* BLOCK .block ******************************************************************************** */ -.block {margin-bottom:20px} -#footer .block {margin-bottom:0} - .block h4 { - padding:6px 11px; - font-size:12px; - color:#fff; - text-shadow:0 1px 0 #000; - text-transform:uppercase; - background:#383838 - } - .block h4 a {color:#fff} - .block ul {list-style-type:none} - .block li.last { border:none} - .block li a { - display:block; - color:#333 - } - -/* BLOCK .products_block *********************************************************************** */ -.products_block {} - .products_block li {float:left -} - .products_block li img {border:1px solid #d1d1d1} - -/* BLOCK customer privacy ******************************************************************* */ -.account_creation label{ - float:left; - padding-top:5px; - width:80%; - text-align:left; - cursor:pointer -} - -/* BLOCK .footer_links (cms pages) ************************************************************* */ -ul.footer_links { - list-style-type:none; - margin-bottom:20px -} -ul.footer_links li {float:left} -ul.footer_links li.f_right {float:right} -ul.footer_links li .icon { - position:relative; - top:6px; - left:0 -} - -/* barre comparaison / tri ********************************************************************* */ -.content_sortPagiBar {margin:20px 0;} -#center_column .sortPagiBar { - padding:10px; - font:normal 11px Arial, Verdana, sans-serif; - color:#666; - background:#eee; -} - #center_column .sortPagiBar strong {color:#000;} -#center_column .sortPagiBar p {padding:0;} -#center_column .sortPagiBar form {display:inline-block;} - -.sortPagiBar #productsSortForm {float:right;} - .sortPagiBar select#selectPrductSort { - margin:0 0 0 10px; - color:#000; - border:1px solid #ccc - } - -.sortPagiBar #bt_compare { - padding:3px 7px; - border:none; - color:#fff; - text-shadow:0 1px 0 #000; - background:url(../img/bg_bt_compare.gif) repeat-x 0 0 #111; -} - -.sortPagiBar .nbrItemPage {margin-left:40px;} - -.sortPagiBar .PrductSort {float:left;} - -.sortPagiBar .nbrProduct { - display:inline-block; - padding:0 10px; -} - -.sortPagiBar #nb_item {border:1px solid #ccc} - -/* pagination ********************************************************************************** */ -form.pagination {display:none;} - -div.pagination { - margin:10px 0; - text-align: center -} -ul.pagination {list-style-type:none} -ul.pagination li {display: inline;} -ul.pagination a, ul.pagination span { - display:inline-block; - height:24px; - width:24px; - border:1px solid #eee; - -moz-border-radius:2px; - -webkit-border-radius:2px; - border-radius:2px; - font:11px/24px Arial,Verdana,sans-serif; - color:#999 -} -ul.pagination a { - text-align:center; -} -ul.pagination a:hover { - color:#333; - border:1px solid #333 -} -ul.pagination .current span { - color:#000; - border:1px solid #fff -} -ul.pagination li.disabled span {color:#ccc} - -#pagination_previous {float:left} -#pagination_next {float:right} -#pagination_previous a, #pagination_previous span, -#pagination_next a, #pagination_next span { - padding:0 8px; - width:auto; -} -#pagination_previous span, -#pagination_next span { - color:#ccc; - border:1px solid #eee -} - -/* CART steps *********************************************************************** */ -ul#order_step { background-color: white;} -ul.step { - list-style-type:none; - margin-bottom:30px; - height:52px; - width:757px -} -ul.step li { - float:left; - height:52px; - width:151px; - text-align:center; - text-transform:uppercase; - background:url(../img/step_standard.gif) no-repeat center bottom transparent -} -ul.step li a, ul.step li.step_current span, ul.step li.step_current_end span { - display:inline-block; - padding:8px 10px 12px; - color:#000; - background:url(../img/step_current_span.gif) no-repeat center bottom transparent -} -ul.step li.step_current { - font-weight:bold; - background:url(../img/step_current.gif) no-repeat center bottom transparent -} - -ul.step li.step_current_end { - font-weight:bold; - background:url(../img/step_end_current.gif) no-repeat center bottom transparent -} -ul.step li.step_todo span { - display:inline-block; - padding:8px 10px 6px; - color:#999; - text-shadow:0 1px 0 #fff; - background:#eee -} -ul.step li.step_done { - font-weight:bold; - background:url(../img/step_done.gif) no-repeat center bottom transparent -} -/*ul.step li#step_end {background:url(../img/step_end.gif) no-repeat center bottom transparent}*/ - -/* module productcomments ********************************************************************** */ -.rating { - clear: both; - display: block; - margin: 2em; - cursor: pointer; -} -.rating:after { - content: '.'; - display: block; - height: 0; - width: 0; - clear: both; - visibility: hidden -} -.cancel, .star { - overflow: hidden; - float: left; - margin:0 1px 0 0; - width: 16px; - height: 16px; - text-indent: -999em; - cursor: pointer -} -.cancel, .cancel a { background: url(../../../modules/productcomments/img/delete.gif) no-repeat 0 -16px !important } -.star, .star a { background: url(../../../modules/productcomments/img/star.gif) no-repeat 0 0 } -.cancel a, .star a { - display: block; - width: 100%; - height: 100%; - background-position: 0 0 -} -div.star_on a { background-position: 0 -16px } -div.star_hover a, div.star a:hover { background-position: 0 -32px } -.pack_content { margin: 10px 0 10px 0 } -.pack_price { - float: right; - margin-right: 3px; - font-size: 12px -} -.confirmation { - margin: 0 0 10px; - padding: 10px; - border: 1px solid #e6db55; - font-size: 13px; - background: none repeat scroll 0 0 #ffffe0; -} -#page .rte { background: transparent none repeat scroll 0 0 } - -.listcomment { - list-style-type:none; - margin:0 0 20px 0 !important; -} -.listcomment li { - padding:10px 0; - border-bottom:1px dotted #ccc; - color:#666 -} -.listcomment .titlecomment { - display:block; - font-weight:bold; - font-size:12px; - color:#333 -} -.listcomment .txtcomment { - display:block; - padding:5px 0; - color:#333 -} -.listcomment .authorcomment {} - - -/* ************************************************************************************************ - HEADER -************************************************************************************************ */ -#header {position:relative} -#header_logo { - float:left; - display:block; - margin-top:30px; -} - -#header_right { - position:relative; - float: right -} - - -/* ************************************************************************************************ - BREADCRUMB -************************************************************************************************ */ -.breadcrumb { - margin-bottom:10px; - font-size:12px -} -.breadcrumb .navigation-pipe {margin:0 3px 0 5px} -.breadcrumb img { - position:relative; - top:5px -} - - -/* ************************************************************************************************ - FOOTER -************************************************************************************************ */ -#footer { - color:#fff; - background:#333 -} - .blockcategories_footer, - #footer .myaccount , - #block_various_links_footer, - #social_block, - #block_contact_infos { - float:left; - width:175px - } - .blockcategories_footer {margin-left:0} -#footer h4 { - padding-bottom: 10px; - text-transform:uppercase -} -#footer h4, -#footer h4 a { - font-weight:normal; - font-size:14px; - color:#fff -} -#footer a {color:#fff} -#footer a:hover {text-decoration:underline} -#footer ul {list-style-type:none} -#footer li {padding:7px 0} -#footer li a {color:#fff} - -#footer .myaccount {padding: 15px 10px} -#footer .myaccount h4 { - padding:0 0 10px 0; - background:none; - text-shadow:none -} -#footer .myaccount .favoriteproducts img, -#footer .myaccount .lnk_wishlist img {display:none} - -/* ************************************************************************************************ - PRODUCT PAGE -************************************************************************************************ */ - -/* BLOCK idTabs ******************************************************************************** */ -.idTabs { - list-style-type: none; - margin-top: 20px; - padding:0 5px; - border-bottom: 8px solid #f7b900 -} -ul.idTabs li { - float: left; - margin-right: 1px -} -.idTabs a { - display:block; - padding:10px 10px 7px 10px; - font-weight:bold; - text-decoration:none; - color:#fff; - background:#000 -} -.idTabs .selected { - color:#000; - background: url(../img/bg_li_idTabs.png) repeat-x 0 0 -} - -#more_info_sheets {padding-top:10px} -#more_info_sheets ul, -#more_info_sheets ol, -#more_info_sheets dl {margin-left:20px} -#more_info_sheets em {font-style:italic} - -#more_info_sheets .product_desc{ - margin-top:5px -} - -#more_info_sheets .product_desc .product_image{ - float:left -} - -#more_info_sheets .product_desc .block_description{ - float:left; - margin-left:10px; - width:420px -} -#more_info_sheets .product_desc .clear_product_desc{ - clear:both; - height:0px; - line-height:0px -} - -/* Make sure lists are correctly displayed in tinyMCE BO edition mode too */ -#short_description_content ul, -#short_description_content ol, -#short_description_content dl, -#tinymce ul, -#tinymce ol, -#tinymce dl {margin-left:20px} - -.block_hidden_only_for_screen {display:none} - - -/* ************************************************************************************************ - PAGE AUTHENTIFICATION -************************************************************************************************ */ -#authentication #left_column {display:none} -#authentication #center_column{width:757px} - - -/* ************************************************************************************************ - PAIMENT - PAGE ORDER -************************************************************************************************ */ - -/* nav bottom ********************************************************************************** */ -#order #left_column , #order-confirmation #left_column {display:none} -#order #center_column, #order-confirmation #center_column{width:757px} - -.cart_navigation {margin:20px 0} -.cart_navigation .exclusive, -.cart_navigation .exclusive_large { - float:right -} -.cart_navigation .button, -.cart_navigation .button_large { - border-color:#ccc; - background-image:url(../img/bg_bt_2.gif) -} - - -/* step 1 - cart ******************************************************************************* */ -.cart_last_product {display:none} - -/*p.cart_navigation .multishipping-button { margin-right: 10px }*/ - -#order-detail-content {margin-bottom:20px} - -table#cart_summary th { - padding:14px 12px; - color:#fff; - font-weight:bold; - text-transform:uppercase; - text-shadow:0 1px 0 #666; - background:url(../img/bg_table_th.png) repeat-x 0 -15px #999 -} -table#cart_summary th.cart_product {text-align:center} -table#cart_summary td { - padding:12px; - border-right:1px solid #e9e9e9; - border-bottom:1px solid #e9e9e9; - font-weight:bold; - font-size:12px; - vertical-align:top -} -table#cart_summary td.cart_delete, -table#cart_summary td.price_discount_del {border-right:none;text-align: center} -table#cart_summary .last_item td {border-bottom:1px solid #999} - - -table#cart_summary tr.cart_item.odd, -table#cart_summary tr.cart_total_delivery, -table#cart_summary tr.cart_total_price, -table#cart_summary tr.cart_total_voucher{ - background-color: #fff -} -table#cart_summary tr.cart_item.even { - background-color: #f3f3f3 -} - -table#cart_summary tr.customization.odd { - background-color: #fff -} -table#cart_summary tr.customization.even { - background-color: #f3f3f3 -} - -table#cart_summary tr ul { - list-style: none; -} -table#cart_summary .cart_product { - width:80px; - text-align:center -}table#cart_summary tbody tr:last-child td { - border-bottom: 1px solid #999; -} -table#cart_summary .cart_product img {border:1px solid #ccc} -table#cart_summary .cart_description { - width:230px; -} -table#cart_summary .cart_unit {width:130px;text-align: center} -table#cart_summary td.cart_unit {text-align: right} -table#cart_summary .cart_quantity {width:130px} -table#cart_summary .customization .cart_quantity {padding: 8px 12px 0;} -.cart_quantity .cart_quantity_input { - float:left; - margin-left: 5px; - width: 20px; - border:1px solid #fff -} -.cart_quantity .cart_quantity_button { - float:left; - position: relative; - top: -5px -} -table#cart_summary .cart_total {width:120px;text-align: center} -table#cart_summary td.cart_total {text-align: right} -table#cart_summary .cart_delete { - width:64px; - text-align:center -} -table#cart_summary .cart_discount_price {text-align: right} -.cart_delete a.cart_quantity_delete, -a.price_discount_delete { - display:inline-block; - padding:1px 2px; - font-size:8px; - color:#666; - text-transform:uppercase; - text-shadow:0 1px 0 #fff; - background:#ccc; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px -} - -.cart_total_price .total_price_container { - border-right:none; -} - -table#cart_summary .cart_total_price td.cart_voucher { - border-bottom:1px solid #999; - vertical-align:middle -} - -table#cart_summary #total_price_container { - border-bottom:1px solid #999; -} - -.cart_voucher h4, -.cart_voucher p {float:left;} -.cart_voucher h4 { - margin-right:12px; - padding:5px 0; - font-size:13px -} -.cart_voucher p {padding-bottom:0;} -.cart_voucher #display_cart_vouchers { - clear:both; - line-height: 16px; - color:#666; - font-weight:normal; - border-top:1px dotted #ccc -} -.cart_voucher .title_offers {margin-top:10px} -.cart_voucher #display_cart_vouchers span {font-weight:bold} -.cart_voucher input.discount_name { - padding:0 5px; - height:22px; - width:170px;/* 180 */ - border:1px solid #ccc; - font-weight:normal; - background:url(../img/bg_discount_name.png) repeat-x 0 0 #fff -} -.cart_voucher .submit input.button { - margin-left:2px; - padding:2px; - height:24px; - border:1px solid #000; - -moz-border-radius:0; - -webkit-border-radius:0; - border-radius:0; - color:#fff; - text-transform:uppercase; - text-shadow:0 -1px 0 #333; - background:url(../img/bg_cart_voucher_submit.png) repeat-x 0 0 #000 -} - -#cart_summary .price { - border-right:none; - text-align: right; - white-space: nowrap; -} -.total_price_container p {text-align: left} - -table#cart_summary .cart_total_price .total_price_container { - padding:0; - border-bottom:1px solid #999; - border-right:1px solid #999; -} -.cart_total_price .total_price_container p { - display:block; - padding:8px; - font-weight:bold; - color:#fff; - text-transform:uppercase; - background:#333 -} -.cart_total_price .total_price_container span { - display:block; - padding:15px; - font-weight:bold; - font-size:18px; - text-align:center -} - -#order_carrier { - clear:both; - margin-top:20px; - border:1px solid #999; - background:#fff -} -#order_carrier h4 { - padding:0 15px; - height: 29px; - font-weight: bold; - line-height:29px; - color:#fff; - font-weight:bold; - text-transform:uppercase; - background:url(../img/bg_table_th.png) repeat-x 0 -10px #999 -} -#order_carrier span { - display:block; - padding:15px; - font-weight:bold -} - -.order_delivery .first_item {margin-right:35px;} - -.multishipping_close_container { - text-align: center; -} - -table#cart_summary .gift-icon { - color: white; - background: #0088CC; - line-height: 20px; - padding: 2px 5px; - border-radius: 5px; -} - -/* step 2 - authentification ******************************************************************* */ -#create-account_form, #authentication #login_form { - clear: none; - float: left; - height: 20em; - width: 49%; -} -#create-account_form {margin-right: 11px;} - -#authentication #create-account_form fieldset, -#authentication #login_form fieldset { - height: 200px -} - -#authentication #create-account_form .form_content, -#authentication #login_form .form_content { - padding:15px 10px -} - -#create-account_form h3, -#authentication #login_form h3 { - padding:8px; - border-bottom:1px solid #ccc; - font-weight:bold; - font-size:12px; - color:#fff; - text-transform:uppercase; - background:url(../img/bg_form_h3.png) repeat-x 0 0 #989898 -} -#create-account_form h4 { - padding-bottom:22px; - font-size:11px; - color:#333 -} - -#create-account_form label, -#login_form label { - display:inline-block; - width:110px; - color:#666 -} - -#order-opc #login_form_content label { - display:block; - margin:0 0 10px 0 -} - -#create-account_form #email_create, -#login_form #email, -#login_form #passwd, -#login_form #login_email, -#login_form #login_passwd { - padding:0 5px; - height:20px; - width:220px;/* 230 */ - border:1px solid #ccc; - color:#666; - background:url(../img/bg_discount_name.png) repeat-x 0 0 #fff -} - -#create-account_form #SubmitCreate, -#login_form #SubmitLogin { - float:right -} - -.lost_password { - float:left; - width:200px -} -.lost_password a {color:#666} - -#order-opc .lost_password { - display:block; - float:none; - margin:5px 0 10px; - width:auto; - font-size:11px; - color:#666 -} - -#ordermsg p {padding-bottom:0} -#ordermsg p.txt { - float:left; - margin-right:25px; - width:220px -} -/*#ordermsg .textarea {float:right}*/ -#ordermsg .textarea textarea { - height:90px; - width:475px; - border:1px solid #ccc -} - -/* step 3 - address ************************************************************************** */ - -.address-form-multishipping { padding: 10px 0px; } -#multishipping_mode_box { - border: 1px solid #D0D3D8; - background: url("../img/form_bg.jpg") repeat-x scroll left top #D0D1D5; - margin-bottom: 10px; - padding: 5px; -} -#multishipping_mode_checkbox { - vertical-align: middle; - margin-right: 5px; -} -#multishipping_mode_box.on { - border: 1px solid #ddd; -} -#multishipping_mode_box .title { - padding: 5px; - font-weight: bold; -} -#multishipping_mode_box .description, #multishipping_mode_box .description_off { - padding: 5px; -} -#multishipping_mode_box .description_off { - display: none; - padding: 5px; -} -#multishipping_mode_box .description_off div { - margin-bottom: 10px; -} -#multishipping_mode_box .description_off a, #multishipping_mode_box .description a { - display: block; - text-align: center; - text-decoration: none; - padding: 5px 10px; - margin: 0 160px; - border: 1px solid #ccc; - background: #ddd; -} -#multishipping_mode_box .description_off a:hover, #multishipping_mode_box .description a:hover { - background: #f3f3f3; - border: 1px solid #ccc; -} -#multishipping_mode_box.on .description_off { - display: block; -} - - -/* step 4 - paiement ************************************************************************** */ - -.delivery_options { - border: 1px solid #BDC2C9; - border-top: 0; -} - -#order .delivery_options_address h3, #order-opc .delivery_options_address h3 { -/*background: url("../img/table_header.gif") no-repeat; -color: #374853; -font-weight: bold; -height: 14px; -padding: 5px 10px; -margin: 10px 0 0 0;*/ - padding: 6px 11px; - font-size: 12px; - color: #fff; - text-shadow: 0 1px 0 #000; - text-transform: uppercase; - background: none repeat scroll 0 0 #383838; -} -#order .delivery_option_radio, #order-opc .delivery_option_radio { - float: left; - margin: 21px 12px; -} -#order .delivery_option label, #order-opc .delivery_option label { - display: block; - padding-bottom: 5px; - padding-top: 5px; -} -#order .delivery_option label > table.resume, #order-opc .delivery_option label > table.resume { - height: 46px; - width: 685px; -} -#order .delivery_option.item, #order-opc .delivery_option.item { - background: #fafafa; -} -#order .delivery_option.alternate_item, #order-opc .delivery_option.alternate_item { - border-top: 1px solid #bdc2c9; - background: #f1f2f4; - border-bottom: 1px solid #bdc2c9; -} -#order .delivery_option label > table.resume td, #order-opc .delivery_option label > table.resume td { - padding: 0 8px; -} -#order .delivery_option label > table.resume td + td, #order-opc .delivery_option label > table.resume td + td { - width: 300px; -} -#order .delivery_option label > table.resume td + td + td, #order-opc .delivery_option label > table.resume td + td + td { - width: 100px; - text-align: right; -} -#order .delivery_option_carrier td {width:200px} -#order .delivery_option_carrier td + td {width:280px;} -#order .delivery_option_carrier td + td + td {width:200px} -#order .delivery_options_address .delivery_option_logo, #order .delivery_option_carrier .delivery_option_logo, #order-opc .delivery_options_address .delivery_option_logo { - padding-left:10px; - width: 160px; -} -#order .delivery_options_address .delivery_option_logo img, #order-opc .delivery_options_address .delivery_option_logo img { /*height: 40px;*/ } -#order .delivery_option_carrier .first_item, #order-opc .delivery_option_carrier .first_item { - padding: 3px 5px 3px 12px; - background:url(../img/arrow_right_2.png) no-repeat 3px 7px -} - -.order_carrier_content { - padding:15px; - border:1px solid #ccc; - font-size:12px; - color:#000; - background:#f8f8f8 -} -.order_carrier_content h3 { - padding:15px 0 10px 0; - font-size:13px; - color:#000 -} -.order_carrier_content h3.carrier_title {padding-top:0} -.order_carrier_content input { - position:relative; - top:1px -} - -#carrierTable { - border:1px solid #999; - border-bottom:none; - background:#fff -} - -#carrierTable tbody{ - border-bottom:1px solid #999; -} -#carrierTable th { - padding:0 15px; - height: 29px; - font-weight: bold; - line-height:29px; - color:#fff; - text-transform:uppercase; - background:url(../img/bg_table_th.png) repeat-x 0 -10px #999 -} -#carrierTable td { - padding:15px; - font-weight:bold; - border-right:1px solid #e9e9e9 -} -#carrierTable td.carrier_price {border:none} - -#gift_div { - display:none; - padding-bottom:10px -} -#gift_div label { - display:block; - margin-bottom:5px -} -#gift_div #gift_message { - height:50px; - width:720px; - border:1px solid #999 -} - -a.iframe {font-weight:bold} - -.hook_extracarrier { - margin-top: 5px; - padding: 5px; -} - -/* step 5 - paiement ************************************************************************** */ -.paiement_block { - padding:15px; - border:1px solid #ccc; - font-size:12px; - color:#000; - background:#f8f8f8 -} - -.payment_module { - position:relative; - padding-top:20px; - border-top:1px dotted #ccc; - text-transform:uppercase; -} -.payment_module a {display:block;} -.payment_module img { - float:left; - margin-right:10px -} -/*.payment_module span { - position:absolute; - top:50px; - left:145px -}*/ - -.payment_module:before, -.payment_module:after { - content: "."; - display: block; - height: 0; - overflow: hidden -} -.payment_module:after {clear: both} -.payment_module {zoom: 1} - - -/* ************************************************************************************************ - PAGE ORDER-OPC -************************************************************************************************ */ -#order-opc #left_column {display:none} -#order-opc #center_column{width:757px} - - -#order-opc h2 {} -#order-opc h2 span { - display:inline-block; - padding:5px 7px; - color:#fff; - background:#333; -} - -#order-opc #login_form fieldset { - background: none repeat scroll 0 0 #FFFFE0; - border: 1px solid #E6DB55; - font-size: 13px; - margin: 0 0 10px; - padding: 10px; -} -#order-opc #login_form fieldset p {padding:0} -#order-opc #login_form fieldset p a {padding:0} - -#order-opc #new_account_form p.submit { - margin-right: 120px; - text-align:right -} -#order-opc #new_account_form p.opc-required {margin-left:20px} - -#order-opc .addresses {margin-bottom:20px} - -#order-opc #opc_delivery_methods h3 {margin-top:20px;} -#order-opc #opc_delivery_methods textarea { - height:60px; - width:755px; - border:1px solid #ccc -} - -#order-opc #opc_payment_methods {margin-bottom:20px} -#order-opc #opc_payment_methods #opc_payment_methods-content p{margin:0} - -.delivery_option_carrier td {width:200px} -.delivery_option_carrier td + td {width:280px;} -.delivery_option_carrier td + td + td {width:200px} -.delivery_option_carrier { - margin: 5px 0 0 45px; - width: 670px; - display: none; -} - .delivery_option_carrier tr td { - padding: 5px; -} -.delivery_option_carrier.selected { - display: table; -} -.delivery_option_carrier.not-displayable { - display: none; -} -.delivery_option_title { - font-weight: bold; -} - - -/* ************************************************************************************************ - express checkout -************************************************************************************************ */ -#new_account_form {clear:both;margin-bottom: 20px} -#new_account_form h3 { - margin-bottom:20px; - padding:8px; - border-bottom:1px solid #ccc; - font-weight:bold; - font-size:12px; - color:#fff; - text-transform:uppercase; - background:url(../img/bg_form_h3.png) repeat-x 0 0 #989898 -} -#center_column #new_account_form p { - margin:0; - padding:0 0 10px 0 -} -#new_account_form p.required {color:#222} -#new_account_form p.required sup {color:#990000} -#new_account_form p.radio span, -#new_account_form p.text label, -#new_account_form p.password label, -#new_account_form p.select label, -#new_account_form p.select span, -#new_account_form p.textarea label { - display: inline-block; - padding: 6px 15px; - width: 230px; - font-size: 14px; - text-align: right -} -#new_account_form p.radio label { - float:none; - padding-right:10px; - width:auto; - font-size:14px; -} -#new_account_form p.checkbox label { - float: none; - width: auto; - font-size: 12px; -} -#new_account_form p.text input, -#new_account_form p.password input, -#new_account_form p.select input { - height:22px; - padding:0 5px; - width:360px; - border:1px solid #ccc; - font-size:12px; - color:#666 -} -#new_account_form p.checkbox input {margin-left: 260px;} - -#new_account_form #submitGuestAccount {float: right} - -/* ************************************************************************************************ */ - -/* ************************************************************************************************ - paiment - CONFIRMATION -************************************************************************************************ */ -#orderconfirmation #left_column {display:none} -#orderconfirmation #center_column{width:757px} - - -/* ************************************************************************************************ - PAGE PASSWORD -************************************************************************************************ */ -#form_forgotpassword fieldset { - padding: 10px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background: #eee -} -#form_forgotpassword p.text label { - display: inline-block; - padding-right: 10px; - width: 174px; - font-weight: bold; - font-size: 12px; - text-align: right -} -#form_forgotpassword p.text input { - padding: 0 5px; - height: 20px; - width: 288px; - border: 1px solid #ccc; - background: url(../img/bg_input.png) repeat-x 0 0 #fff -} -#form_forgotpassword p.submit { - margin-right:25px; - padding-bottom:5px; - text-align:right -} - -#password .icon { - position:relative; - top:6px; -} - - -/* ************************************************************************************************ - PAGE ADRESSES -************************************************************************************************ */ -#addresses #left_column {display:none} -#addresses #center_column{width:757px} - -#address p.inline-infos { - margin:0 0 0 100px !important; - font-size:12px; - color:#666; -} - - -/* ************************************************************************************************ - PAGE ADD ADRESS -************************************************************************************************ */ -#address #left_column {display:none} -#address #center_column{width:757px} - -form#add_adress {} -#add_adress fieldset { - margin:0; - border:1px solid #ccc; - background:#F8F8F8 -} -#add_adress h3 { - margin:0 0 15px 0; - padding:8px; - font-size:14px; - color:#fff; - text-transform:uppercase; - background:url(../img/bg_form_h3.png) repeat-x 0 0 #989898 -} -#center_column #add_adress p {margin:0; padding:0 0 10px 0} -#add_adress p.required {color:#222} -#add_adress p.required sup {color:#990000} - -#add_adress p.text label, -#add_adress p.password label, -#add_adress p.select label, -#add_adress p.select span, -#add_adress p.textarea label { - display:inline-block; - padding:6px 15px; - width:230px;/* 260 */ - font-size:14px; - text-align:right -} -#add_adress p.text input, -#add_adress p.password input, -#add_adress p.select input { - padding:0 5px; - height:22px; - width:360px;/* 370 */ - border:1px solid #ccc; - font-size: 12px; - color:#666 -} -#add_adress p.checkbox input { - margin-left:260px; -} -#add_adress p.select select { - margin-right:10px; - border:1px solid #ccc; - font-size: 12px; - color:#666 -} -#add_adress p.textarea label {vertical-align:top} -#add_adress p.textarea textarea { - height:80px; - width:370px; - border:1px solid #ccc; - font-size: 12px; - color:#666 -} -#center_column #add_adress p.submit2 { - margin-top:20px; - text-align:right -} - -#add_adress span.form_info, -#add_adress span.inline-infos { - display:block; - margin:5px 0 0 265px; - color:#666 -} - - -/* ************************************************************************************************ - PAGE ORDER-SPLIP -************************************************************************************************ */ -#order-slip #left_column {display:none} -#order-slip #center_column{width:757px} - -#order-slip #order-list {border-bottom:1px solid #999} -#order-slip #order-list td { - border-top: 1px solid #ccc; - border-bottom:none -} -#order-slip #order-list td.history_invoice {border-right:none} - - -/* ************************************************************************************************ - PAGE DISCOUNT -************************************************************************************************ */ -#discount #left_column {display:none} -#discount #center_column{width:757px} - -#discount .table_block tr.last_item td {border-bottom:1px solid #999} -#discount .table_block td.discount_expiration_date {border-right:1px solid #999} -#discount .table_block td.discount_value {white-space:nowrap} - - -/* ************************************************************************************************ - PAGE ORDER FOLLOW -************************************************************************************************ */ -#order-follow #left_column {display:none} -#order-follow #center_column{width:757px} - - -/* ************************************************************************************************ - PAGE NEW-PRODUCTS -************************************************************************************************ */ -#newproducts .sortPagiBar {margin-bottom:20px} - - -/* ************************************************************************************************ - PAGE BEST SALES -************************************************************************************************ */ -#bestsales .sortPagiBar {margin-bottom:20px} - -/* ************************************************************************************************ - PAGE PRICES DROP SALES -************************************************************************************************ */ -#pricesdrop .sortPagiBar {margin-bottom:20px} - - -/* ************************************************************************************************ - PAGE MANUFACTURER -************************************************************************************************ */ -#manufacturer .nbrmanufacturer { - margin: 15px 0 10px; - padding: 8px 7px; - font-size:12px; - color: #000; - background: none repeat scroll 0 0 #f0f0f0 -} - -#manufacturer #product_list {margin-top:15px} - -ul#manufacturers_list {list-style-type:none} -ul#manufacturers_list li { - margin-bottom: 14px; - padding: 12px 8px; - border: 1px solid #eee; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius:3px; -} -ul#manufacturers_list li a.lnk_img { - display: block; - float: left; -} -ul#manufacturers_list li img { - display: block; - float: left; - margin-right: 14px; - border: 1px solid #ccc; - vertical-align: bottom -} -ul#manufacturers_list li h3 { - padding: 0 0 10px; - font-size: 13px; - color: #000 -} -ul#manufacturers_list li .description { - overflow: hidden; - padding: 0; - font-size:12px; - color:#666 -} -ul#manufacturers_list li .right_side {float:right;} - -.description_box { - border: 1px solid #CCCCCC; - border-radius: 3px 3px 3px 3px; - box-shadow: 0 1px 1px #E2E2E2; - padding: 5px; - margin-bottom: 20px; - font-size: 12px; - line-height: 18px; -} -.description_box p { - margin: 0; - padding: 0 10px 5px; -} -.description_box .hide_desc { - display: none; -} -.description_box .lnk_more { - background: url("../img/arrow_right_1.png") no-repeat scroll 100% 4px transparent; - color: #0088CC; - padding: 0 10px; -} -.description_box ul { - padding-left: 30px; - padding-bottom: 10px; -} - -/* ************************************************************************************************ - PAGE SUPPLIER -************************************************************************************************ */ -#supplier .nbrmanufacturer { - margin: 15px 0 10px; - padding: 8px 7px; - font-size:12px; - color: #000; - background: none repeat scroll 0 0 #f0f0f0 -} -ul#suppliers_list {list-style-type:none} -ul#suppliers_list li { - margin-bottom: 14px; - padding: 12px 8px; - border: 1px solid #eee; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius:3px; -} -ul#suppliers_list li a.lnk_img { - display: block; - float: left; -} -ul#suppliers_list li img { - display: block; - float: left; - margin-right: 14px; - border: 1px solid #ccc; - vertical-align: bottom -} -ul#suppliers_list li h3 { - padding: 0 0 10px; - font-size: 13px; - color: #000 -} -ul#suppliers_list li .description { - overflow: hidden; - padding: 0; - font-size:12px; - color:#666 -} -ul#suppliers_list li .right_side {float:right;} - - -/* ************************************************************************************************ - PAGE SEARCH -************************************************************************************************ */ -#search h3.nbresult { - margin:0 0 10px 0; - padding:10px; - border:1px solid #e6db55; - font-size:13px; - background:#ffffe0 -} -#search .sortPagiBar {margin-bottom:20px} - - -/* ************************************************************************************************ - PAGE 404 -************************************************************************************************ */ -#pagenotfound #left_column, -#pagenotfound #right_column, -#pagenotfound #footer {display:none} - -#pagenotfound #left_column, -#pagenotfound #right_column, -#pagenotfound #footer {display:none} - -#pagenotfound #center_column {width:940px;} - -#pagenotfound .pagenotfound { - padding:30px 300px 0 0; - height:330px; - font-size:14px; - background:url(../img/bg_404.png) no-repeat 100% 0 -} -#pagenotfound h3 { - font-weight:normal; - font-size:14px -} -#pagenotfound fieldset {border:none} -#pagenotfound fieldset label {color:#333} -#pagenotfound #search_query { - -moz-border-bottom-colors: none; - -moz-border-image: none; - -moz-border-left-colors: none; - -moz-border-right-colors: none; - -moz-border-top-colors: none; - border-bottom: 1px solid #666; - border-left: 1px solid #666; - border-right: 1px solid #fff !important; - border-top: 1px solid #666; - padding: 0 5px; - height: 24px; - width: 200px; - color: #ccc; - background: url(../../../modules/blocksearch/img/bg_search_input.png) repeat-x scroll 0 0 #fff -} -#pagenotfound .button_small { - padding: 4px 7px; - border: medium none; - -moz-border-radius:0; - -webkit-border-radius:0; - border-radius:0; - color: #fff; - text-transform: uppercase; - background: url("../../../modules/blocksearch/img/bg_search_submit.png") repeat-x scroll 0 0 #101010 -} -#pagenotfound .pagenotfound a { - font-weight:bold; - color:#333 -} -#pagenotfound .pagenotfound .icon { - position:relative; - top:3px -} - - -/* ************************************************************************************************ - addons payment cheque -************************************************************************************************ */ -#module-cheque-payment #left_column {display:none} -#module-cheque-payment #center_column{width:757px} - - -/* ************************************************************************************************ - addons payment bankwire -************************************************************************************************ */ -#module-bankwire-payment #left_column {display:none} -#module-bankwire-payment #center_column{width:757px} - - -/* ************************************************************************************************ - addons google checkout -************************************************************************************************ */ -#module-gcheckout-payment #left_column {display:none} -#module-gcheckout-payment #center_column{width:757px} - -/* ************************************************************************************************ - addons paypal -************************************************************************************************ */ -#module-payment-submit #left_column {display:none} -#module-payment-submit #center_column{width:757px} - - -/* ************************************************************************************************ - addons cashondelivery validation -************************************************************************************************ */ -#module-cashondelivery-validation #left_column {display:none} -#module-cashondelivery-validation #center_column{width:757px} - - -/* ************************************************************************************************ - addon RerversoForm -************************************************************************************************ */ -#account-creation_form fieldset.reversoform {padding:10px !important} -#account-creation_form fieldset.reversoform .text label{ - display:block; - padding:0 0 10px 0; - width:100%; - text-align:left; -} -#account-creation_form fieldset.reversoform .infos-sup { - padding:0 !important; - font-size:10px; - font-style:italic; - text-align:right -} -/* ************************************************************************************************ - addon customer privacy -************************************************************************************************ */ -#account-creation_form fieldset.customerprivacy label{ - padding-bottom:0; - font-size:14px; - text-align:left; - cursor:pointer -} - -/* ************************************************************************************************ - addon referralprogram -************************************************************************************************ */ -#module-referralprogram-referralprogram-program #left_column {display:none} -#module-referralprogram-referralprogram-program #center_column{width:757px} - -#footer .myaccount li.referralprogram img {display:none} - -#module-referralprogram-referralprogram-program .sheets {padding-top:10px} - -#module-referralprogram-referralprogram-program form p.checkbox {font-weight:bold} -#module-referralprogram-referralprogram-program form p.checkbox a {text-decoration:underline} -#module-referralprogram-referralprogram-program form p.submit {text-align:right} -#module-referralprogram-referralprogram-program form p.see_email { - padding-left:10px; - color: #0088cc; - background:url(../img/arrow_right_1.png) no-repeat 0 4px; -} -#module-referralprogram-referralprogram-program form p.see_email a { - color: #0088cc; - text-decoration:underline -} - -/* ************************************************************************************************ - addon loyalty -************************************************************************************************ */ -#module-loyalty-default #left_column {display:none} -#module-loyalty-default #center_column{width:757px} - -#product p#loyalty { - padding:10px 0 0 20px; - border-top:1px solid #ccc; - background:url(../img/icon/info.png) no-repeat 0 8px; - margin-top: 10px; -} - -#footer .myaccount li.loyalty img {display:none} - - -/* ************************************************************************************************ - addon Livezilla -************************************************************************************************ */ -#livezilla_lnk { - margin:10px 0; - text-align: right -} -#livezilla_lnk a { - display:inline-block; - padding:6px 8px 8px 8px; - -moz-border-radius:3px; - -webkit-border-radius:3px; - border-radius:3px; - font:bold 10px Arial,Verdana,sans-serif; - color:#fff; - text-shadow: 0 -1px 0 #000; - background: url(../img/bg_bt_compare.gif) repeat-x scroll 0 0 #000 -} -#livezilla_lnk a:hover {text-decoration:none} - -/* ************************************************************************************************ - addons comments products -************************************************************************************************ */ -form#sendComment fieldset{ - padding:10px; - border:1px solid #ccc; - background:#eee -} -form#sendComment h3 {font-size:14px;} -#new_comment_form p.text { - margin-bottom: 0; - padding-bottom: 0; -} -#sendComment p.text label, -#sendComment p.textarea label { - display: block; - margin: 12px 0 4px; - font-weight: bold; - font-size: 12px; -} -#sendComment p.text input { - padding: 0 5px; - height: 28px; - width: 498px; - border: 1px solid #ccc; - background: url(../img/bg_input.png) repeat-x 0 0 #fff; -} -#sendComment p.textarea textarea { - height:80px; - width:508px; - border:1px solid #ccc; -} -#sendComment p.submit { - padding:0; - text-align:right -} - -#sendComment p.closeform { - float:right; - padding:0; - height:12px; - width:12px; - text-indent:-5000px; - background:url(../img/icon/delete.gif) no-repeat 0 0 -} - -.star { - position: relative; - top:2px; - float: left; - height: 12px; - width: 12px; - overflow: hidden; - text-indent: -999em; - cursor: pointer -} -.star, .star a { background: url(../../../modules/productcomments/img/star.gif) no-repeat 0 0 } -div.star_on a { background-position: 0 -12px } -div.star_hover a, div.star a:hover { background-position: 0 -12px } - - -/* ************************************************************************************************ - xxxxx -************************************************************************************************ */ - - -/* ************************************************************************************************ - guest tracking -************************************************************************************************ */ - -#guest-tracking fieldset p:first-child { - padding-top: 10px; -} -#guest-tracking fieldset p:last-child { - padding-bottom: 10px; -} - - - -/* ************************************************************************************************ - CSS Modules -************************************************************************************************ */ - -/******* IMPORTANT - Internet Explorer can read 31 CSS files max. Some CSS have been put here and erased from their own module folder.************/ - -/*************** Block ADVERTISING ***************/ -.advertising_block { width: 191px; margin-bottom: 1em; text-align: center } - - - -/*************** Block CATEGORIES ***************/ -#categories_block_left li {border-bottom:1px dotted #ccc} - #categories_block_left li.last { border:none;} - #categories_block_left li a { - display:block; - padding:7px 11px 5px 22px; - color:#333; - background:url(../../../modules/blockcategories/img/arrow_right_2.png) no-repeat 10px 10px transparent - } - - #categories_block_left li ul {margin-left:40px} - #categories_block_left li ul li {border:none} - #categories_block_left li ul li a { - padding-left:0; - background:none - } - -#categories_block_left li .OPEN, -#categories_block_left li .CLOSE { - display:block; - float:right; - margin:10px 10px 0; - height:9px; - width:9px; - background:url(../../../modules/blockcategories/img/icon/open-close.png) no-repeat 0 -9px; - cursor:pointer -} -#categories_block_left li .CLOSE {background-position:0 0} - - -/* footer */ -.blockcategories_footer { - padding:15px 10px; -} -.blockcategories_footer ul ul {display:none !important} - - - -/*************** Block CMS ***************/ -/* footer */ -#footer .block_various_links {padding:15px 10px;} - -/* Block CMS links */ -.informations_block_left li {border-bottom:1px dotted #eee} -.informations_block_left li.last {border:none;} -.informations_block_left li a { - display:block; - padding:7px 11px 5px 22px; - color:#333; - background:url(../../../modules/blockcms/img/arrow_right_2.png) no-repeat 10px 10px transparent; -} - -tr.subitem > td:first-child + td { - padding-left: 10px; -} - - - -/*************** Block CONTACTINFOS ***************/ - -#block_contact_infos {padding:15px 10px;} -#block_contact_infos li { - padding:0 !important; - line-height: 20px; -} -#block_contact_infos li strong { - font-weight:normal; - font-size:13px; -} -#block_contact_infos li pre {font: 11px/20px Arial,Verdana,sans-serif;} - - - -/*************** Block LINK ***************/ -#links_block_left .block_content li {border-bottom:1px dotted #eee} -#links_block_left .block_contentt li.last {border:none;} -#links_block_left .block_content li a { - display:block; - padding:7px 11px 5px 22px; - color:#333; - background:url(../../../modules/blocklink/img/arrow_right_2.png) no-repeat 10px 10px transparent; -} - - - -/*************** Block MANUFACTURER ***************/ -.blockmanufacturer li {border-bottom:1px dotted #ccc} -.blockmanufacturer li.last { border:none;} - .blockmanufacturer li a { - display:block; - padding:7px 11px 5px 22px; - color:#333; - background:url(../../../modules/blockmanufacturer/img/arrow_right_2.png) no-repeat 10px 10px transparent - } - - -.blockmanufacturer form {margin-top:10px;} -.blockmanufacturer p { - padding:0; - text-align:center -} - -/*************** Block LOGO PAYMENT ***************/ - -.paiement_logo_block { width: 191px; text-align: center; margin-bottom: 1.5em } -.paiement_logo_block a { text-decoration: none } -.paiement_logo_block img { margin: 0 0.5em } - - - -/*************** Block RSS ***************/ -#rss_block_left p { - margin:0; - padding:10px; -} - -#rss_block_left li {border-bottom:1px dotted #ccc} -#rss_block_left li.last { border:none;} - #rss_block_left li a { - display:block; - padding:7px 11px 5px 22px; - color:#333; - background:url(../../../modules/blockrss/img/arrow_right_2.png) no-repeat 10px 10px transparent - } - - -/*************** Block SOCIAL ***************/ -#social_block {padding:15px 10px;} -#social_block li {padding-left:22px !important;} -#social_block li.facebook {background:url(../../../modules/blocksocial/img/sprite_pict_social_block.png) no-repeat 0 6px;} -#social_block li.twitter {background:url(../../../modules/blocksocial/img/sprite_pict_social_block.png) no-repeat 0 -26px;} -#social_block li.rss {background:url(../../../modules/blocksocial/img/sprite_pict_social_block.png) no-repeat 0 -56px;} - - -/*************** Block STORE ***************/ -.blockstore img { margin: 10px 0 0 0} -.blockstore p { - padding-bottom:0; - font-weight:bold; - text-align: right -} -.blockstore p.store_image { - padding-bottom:10px; - text-align:center -} - - -/*************** Block SUPPLIER ***************/ -.blocksupplier li {border-bottom:1px dotted #ccc} -.blocksupplier li.last { border:none;} - .blocksupplier li a { - display:block; - padding:7px 11px 5px 22px; - color:#333; - background:url(../../../modules/blocksupplier/img/arrow_right_2.png) no-repeat 10px 10px transparent - } - -.blocksupplier form {margin-top:10px;} -.blocksupplier p { - padding:0; - text-align:center -} +/* ################################################################################################## + PRESTASHOP CSS +################################################################################################## */ + +@import url("grid_prestashop.css"); + +/* **************************************************************************** + reset +**************************************************************************** */ +html{color:#000;background:#FFF;} +body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0} +table{border-collapse:collapse;border-spacing:0} +fieldset,img{border:0} +address,caption,cite,code,dfn,em,th,var,optgroup{font-style:inherit;font-weight:inherit} +del,ins{text-decoration:none} +caption,th{text-align:left} +h1,h2,h3,h4,h5,h6{font-size:100%} +q:before,q:after{content:''} +abbr,acronym{border:0;font-variant:normal} +sup{vertical-align:baseline} +sub{vertical-align:baseline} +legend{color:#000} +input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit} +input,button,textarea,select{font-size:100%} +a {cursor:pointer} + +.clearfix:before, +.clearfix:after { + content: "."; + display: block; + height: 0; + overflow: hidden +} +.clearfix:after {clear: both} +.clearfix {zoom: 1} + + +/* ************************************************************************************************ + struture +************************************************************************************************ */ +#page {} + #header {z-index:10} + #columns {z-index:1} + #left_column {} + #center_column {} + #right_column {} + #footer {} + + +/* ************************************************************************************************ + generic style +************************************************************************************************ */ +body{ + font:normal 11px/14px Arial, Verdana, sans-serif; + color:#222; + background:#fff +} +body.content_only { + background: #FFF; +} + +/* positionnement ****************************************************************************** */ +.hidden {display:none} +.f_right {float:right} +p.center {text-align:center} +.clearBoth {clear:both} + +/* title *************************************************************************************** */ +h1 { + margin-bottom:20px; + font-size:24px; + line-height: 22px +} +h2 { + padding-bottom:20px; + font-size:18px +} +h3 { + padding-bottom:20px; + font-size:16px +} +h4 { + padding-bottom:20px; + font-size:14px +} + +.hide-left-column #left_column {display:none} +.hide-left-column #center_column {width:757px} + +/* text **************************************************************************************** */ +p {padding-bottom:20px} + +p em {font-style:italic} + +.warning { + margin:0 0 10px 0; + padding:10px; + border:1px solid #e6db55; + font-size:13px; + background:#ffffe0 +} +.success { + margin:0 0 10px 0; + padding:10px; + border:1px solid #5cff74; + font-size:13px; + background: #d3ffab +} +.error { + margin:0 0 10px 0; + padding:10px; + border:1px solid #990000; + font-size:13px; + background:#ffcccc +} +.error ol {margin-left:20px} +.error p.lnk { + margin-top:20px; + padding:0; + font-size:11px +} +.required {color:#990000} + +/* link **************************************************************************************** */ +a, a:active, a:visited { + color:#333; + text-decoration:none; + outline: medium none +} + a:hover {text-decoration:underline} + + +/* HACK IOS ipad, iphone */ +input[type="text"], input[type="email"], input[type="search"], input[type="password"], input[type="submit"], input[type="image"] { + -webkit-appearance:none; + -moz-appearance:none; + appearance:none; + -webkit-border-radius:0px !important; + -moz-border-radius:0px !important; + border-radius:0px !important; +} + +/*buttons ************************************************************************************** */ +input.button_mini, input.button_small, input.button, input.button_large, +input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled, +input.exclusive_mini, input.exclusive_small, input.exclusive, input.exclusive_large, +input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled, +a.button_mini, a.button_small, a.button, a.button_large, +a.exclusive_mini, a.exclusive_small, a.exclusive, a.exclusive_large, +span.button_mini, span.button_small, span.button, span.button_large, +span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, span.exclusive_large_disabled { + position:relative; + display:inline-block; + padding:5px 7px; + border:1px solid #cc9900; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + font-weight:bold; + color:#000; + background:url(../img/bg_bt.gif) repeat-x 0 0 #f4b61b; + cursor: pointer; +} +*:first-child+html input.button_mini, *:first-child+html input.button_small, *:first-child+html input.button, *:first-child+html input.button_large, +*:first-child+html input.button_mini_disabled, *:first-child+html input.button_small_disabled, *:first-child+html input.button_disabled, *:first-child+html input.button_large_disabled, +*:first-child+html input.exclusive_mini, *:first-child+html input.exclusive_small, *:first-child+html input.exclusive, *:first-child+html input.exclusive_large, +*:first-child+html input.exclusive_mini_disabled, *:first-child+html input.exclusive_small_disabled, *:first-child+html input.exclusive_disabled, *:first-child+html input.exclusive_large_disabled { + border:none +} + + +/* input button */ +input.button_mini, input.button_small, input.button, input.button_large, +input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled, +input.exclusive_mini, input.exclusive_small, input.exclusive, input.exclusive_large, +input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled { + /*padding-bottom: 2px*/ +} + +/* disabled button */ +input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled, +input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled, +span.button_mini, span.button_small, span.button, span.button_large, +span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, span.exclusive_large_disabled { + /*background-position: left -36px; + cursor: default; + color: #888!important*/ +} + +/* exclusive button */ +input.exclusive_mini, input.exclusive_small, input.exclusive, input.exclusive_large, +input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled, +a.exclusive_mini, a.exclusive_small, a.exclusive, a.exclusive_large, +span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, span.exclusive_large_disabled { + /*color: white!important*/ +} + +/* exclusive disabled button */ +input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled, span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large { + /*color: #488c40!important*/ +} + +/* hover button */ +input.button_mini:hover, input.button_small:hover, input.button:hover, input.button_large:hover, +input.exclusive_mini:hover, input.exclusive_small:hover, input.exclusive:hover, input.exclusive_large:hover, +a.button_mini:hover, a.button_small:hover, a.button:hover, a.button_large:hover, +a.exclusive_mini:hover, a.exclusive_small:hover, a.exclusive:hover, a.exclusive_large:hover { + text-decoration:none; + background-position: left -50px +} + +/* exclusive hover button */ +input.exclusive_mini:hover, input.exclusive_small:hover, input.exclusive:hover, input.exclusive_large:hover, a.exclusive_mini:hover, a.exclusive_small:hover, a.exclusive:hover, a.exclusive_large:hover { + /*color: white!important*/ +} + +/* active button */ +input.button_mini:active, input.button_small:active, input.button:active, input.button_large:active, +input.exclusive_mini:active, input.exclusive_small:active, input.exclusive:active, input.exclusive_large:active, +a.button_mini:active, a.button_small:active, a.button:active, a.button_large:active, +a.exclusive_mini:active, a.exclusive_small:active, a.exclusive:active, a.exclusive_large:active { + background-position: left -100px +} + +/* classic buttons */ +input.button_mini, input.button_mini_disabled, input.exclusive_mini, input.exclusive_mini_disabled, a.button_mini, a.exclusive_mini, span.button_mini, span.exclusive_mini { + /*width: 30px; + background-image: url('../img/button-mini.png')*/ +} +input.button_small, input.button_small_disabled, input.exclusive_small, input.exclusive_small_disabled, a.button_small, a.exclusive_small, span.button_small, span.exclusive_small { + /*width: 60px; + background-image: url('../img/button-small.png')*/ +} +input.button_disabled, input.exclusive_disabled, span.exclusive { + border:1px solid #ccc; + color:#999; + background:url(../img/bg_bt_2.gif) repeat-x 0 0 #f4b61b; + cursor:default; +} +input.button_large, input.button_large_disabled, input.exclusive_large, input.exclusive_large_disabled, a.button_large, a.exclusive_large, span.button_large, span.exclusive_large, span.exclusive_large_disabled { + /*width: 180px; + background-image: url('../img/button-large.png')*/ +} + +/* exclusive button */ +/*input.exclusive, input.exclusive_disabled, a.exclusive, span.exclusive { background-image: url('../img/button-medium_exclusive.png') } +input.exclusive_mini, input.exclusive_mini_disabled, a.exclusive_mini, span.exclusive_mini { background-image: url('../img/button-mini_exclusive.gif') } +input.exclusive_small, input.exclusive_small_disabled, a.exclusive_small, span.exclusive_small { background-image: url('../img/button-small_exclusive.gif') } +input.exclusive_large, input.exclusive_large_disabled, a.exclusive_large, span.exclusive_large, span.exclusive_large_disabled { background-image: url('../img/button-large_exclusive.gif') }*/ + +/* form **************************************************************************************** */ +form.std fieldset { + margin:20px 0; + border:1px solid #ccc +} + +/* table *************************************************************************************** */ +table.std, +table.table_block { + margin-bottom:20px; + width:100%; + border:1px solid #999; + border-bottom:none; + background:white; +} +table.std th, +table.table_block th { + padding:14px 12px; + font-size:12px; + color:#fff; + font-weight:bold; + text-transform:uppercase; + text-shadow:0 1px 0 #000; + background:url(../img/bg_table_th.png) repeat-x 0 0 #999 +} +table.std tr.alternate_item, +table.table_block tr.alternate_item {background-color: #f3f3f3} +table.std td, +table.table_block td { + padding:12px; + border-right:1px solid #e9e9e9; + border-bottom:1px solid #e9e9e9; + font-size:12px; + vertical-align:top +} + +/* BLOCK .block ******************************************************************************** */ +.block {margin-bottom:20px} +#footer .block {margin-bottom:0} + .block h4 { + padding:6px 11px; + font-size:12px; + color:#fff; + text-shadow:0 1px 0 #000; + text-transform:uppercase; + background:#383838 + } + .block h4 a {color:#fff} + .block ul {list-style-type:none} + .block li.last { border:none} + .block li a { + display:block; + color:#333 + } + +/* BLOCK .products_block *********************************************************************** */ +.products_block {} + .products_block li {float:left +} + .products_block li img {border:1px solid #d1d1d1} + +/* BLOCK customer privacy ******************************************************************* */ +.account_creation label{ + float:left; + padding-top:5px; + width:80%; + text-align:left; + cursor:pointer +} + +/* BLOCK .footer_links (cms pages) ************************************************************* */ +ul.footer_links { + list-style-type:none; + margin-bottom:20px +} +ul.footer_links li {float:left} +ul.footer_links li.f_right {float:right} +ul.footer_links li .icon { + position:relative; + top:6px; + left:0 +} + +/* barre comparaison / tri ********************************************************************* */ +.content_sortPagiBar {margin:20px 0;} +#center_column .sortPagiBar { + padding:10px; + font:normal 11px Arial, Verdana, sans-serif; + color:#666; + background:#eee; +} + #center_column .sortPagiBar strong {color:#000;} +#center_column .sortPagiBar p {padding:0;} +#center_column .sortPagiBar form {display:inline-block;} + +.sortPagiBar #productsSortForm {float:right;} + .sortPagiBar select#selectPrductSort { + margin:0 0 0 10px; + color:#000; + border:1px solid #ccc + } + +.sortPagiBar #bt_compare { + padding:3px 7px; + border:none; + color:#fff; + text-shadow:0 1px 0 #000; + background:url(../img/bg_bt_compare.gif) repeat-x 0 0 #111; +} + +.sortPagiBar .nbrItemPage {margin-left:40px;} + +.sortPagiBar .PrductSort {float:left;} + +.sortPagiBar .nbrProduct { + display:inline-block; + padding:0 10px; +} + +.sortPagiBar #nb_item {border:1px solid #ccc} + +/* pagination ********************************************************************************** */ +form.pagination {display:none;} + +div.pagination { + margin:10px 0; + text-align: center +} +ul.pagination {list-style-type:none} +ul.pagination li {display: inline;} +ul.pagination a, ul.pagination span { + display:inline-block; + height:24px; + width:24px; + border:1px solid #eee; + -moz-border-radius:2px; + -webkit-border-radius:2px; + border-radius:2px; + font:11px/24px Arial,Verdana,sans-serif; + color:#999 +} +ul.pagination a { + text-align:center; +} +ul.pagination a:hover { + color:#333; + border:1px solid #333 +} +ul.pagination .current span { + color:#000; + border:1px solid #fff +} +ul.pagination li.disabled span {color:#ccc} + +#pagination_previous {float:left} +#pagination_next {float:right} +#pagination_previous a, #pagination_previous span, +#pagination_next a, #pagination_next span { + padding:0 8px; + width:auto; +} +#pagination_previous span, +#pagination_next span { + color:#ccc; + border:1px solid #eee +} + +/* CART steps *********************************************************************** */ +ul#order_step { background-color: white;} +ul.step { + list-style-type:none; + margin-bottom:30px; + height:52px; + width:757px +} +ul.step li { + float:left; + height:52px; + width:151px; + text-align:center; + text-transform:uppercase; + background:url(../img/step_standard.gif) no-repeat center bottom transparent +} +ul.step li a, ul.step li.step_current span, ul.step li.step_current_end span { + display:inline-block; + padding:8px 10px 12px; + color:#000; + background:url(../img/step_current_span.gif) no-repeat center bottom transparent +} +ul.step li.step_current { + font-weight:bold; + background:url(../img/step_current.gif) no-repeat center bottom transparent +} + +ul.step li.step_current_end { + font-weight:bold; + background:url(../img/step_end_current.gif) no-repeat center bottom transparent +} +ul.step li.step_todo span { + display:inline-block; + padding:8px 10px 6px; + color:#999; + text-shadow:0 1px 0 #fff; + background:#eee +} +ul.step li.step_done { + font-weight:bold; + background:url(../img/step_done.gif) no-repeat center bottom transparent +} +/*ul.step li#step_end {background:url(../img/step_end.gif) no-repeat center bottom transparent}*/ + +/* module productcomments ********************************************************************** */ +.rating { + clear: both; + display: block; + margin: 2em; + cursor: pointer; +} +.rating:after { + content: '.'; + display: block; + height: 0; + width: 0; + clear: both; + visibility: hidden +} +.cancel, .star { + overflow: hidden; + float: left; + margin:0 1px 0 0; + width: 16px; + height: 16px; + text-indent: -999em; + cursor: pointer +} +.cancel, .cancel a { background: url(../../../modules/productcomments/img/delete.gif) no-repeat 0 -16px !important } +.star, .star a { background: url(../../../modules/productcomments/img/star.gif) no-repeat 0 0 } +.cancel a, .star a { + display: block; + width: 100%; + height: 100%; + background-position: 0 0 +} +div.star_on a { background-position: 0 -16px } +div.star_hover a, div.star a:hover { background-position: 0 -32px } +.pack_content { margin: 10px 0 10px 0 } +.pack_price { + float: right; + margin-right: 3px; + font-size: 12px +} +.confirmation { + margin: 0 0 10px; + padding: 10px; + border: 1px solid #e6db55; + font-size: 13px; + background: none repeat scroll 0 0 #ffffe0; +} +#page .rte { background: transparent none repeat scroll 0 0 } + +.listcomment { + list-style-type:none; + margin:0 0 20px 0 !important; +} +.listcomment li { + padding:10px 0; + border-bottom:1px dotted #ccc; + color:#666 +} +.listcomment .titlecomment { + display:block; + font-weight:bold; + font-size:12px; + color:#333 +} +.listcomment .txtcomment { + display:block; + padding:5px 0; + color:#333 +} +.listcomment .authorcomment {} + + +/* ************************************************************************************************ + HEADER +************************************************************************************************ */ +#header {position:relative} +#header_logo { + float:left; + display:block; + margin-top:30px; +} + +#header_right { + position:relative; + float: right +} + + +/* ************************************************************************************************ + BREADCRUMB +************************************************************************************************ */ +.breadcrumb { + margin-bottom:10px; + font-size:12px +} +.breadcrumb .navigation-pipe {margin:0 3px 0 5px} +.breadcrumb img { + position:relative; + top:5px +} + + +/* ************************************************************************************************ + FOOTER +************************************************************************************************ */ +#footer { + color:#fff; + background:#333 +} + .blockcategories_footer, + #footer .myaccount , + #block_various_links_footer, + #social_block, + #block_contact_infos { + float:left; + width:175px + } + .blockcategories_footer {margin-left:0} +#footer h4 { + padding-bottom: 10px; + text-transform:uppercase +} +#footer h4, +#footer h4 a { + font-weight:normal; + font-size:14px; + color:#fff +} +#footer a {color:#fff} +#footer a:hover {text-decoration:underline} +#footer ul {list-style-type:none} +#footer li {padding:7px 0} +#footer li a {color:#fff} + +#footer .myaccount {padding: 15px 10px} +#footer .myaccount h4 { + padding:0 0 10px 0; + background:none; + text-shadow:none +} +#footer .myaccount .favoriteproducts img, +#footer .myaccount .lnk_wishlist img {display:none} + +/* ************************************************************************************************ + PRODUCT PAGE +************************************************************************************************ */ + +/* BLOCK idTabs ******************************************************************************** */ +.idTabs { + list-style-type: none; + margin-top: 20px; + padding:0 5px; + border-bottom: 8px solid #f7b900 +} +ul.idTabs li { + float: left; + margin-right: 1px +} +.idTabs a { + display:block; + padding:10px 10px 7px 10px; + font-weight:bold; + text-decoration:none; + color:#fff; + background:#000 +} +.idTabs .selected { + color:#000; + background: url(../img/bg_li_idTabs.png) repeat-x 0 0 +} + +#more_info_sheets {padding-top:10px} +#more_info_sheets ul, +#more_info_sheets ol, +#more_info_sheets dl {margin-left:20px} +#more_info_sheets em {font-style:italic} + +#more_info_sheets .product_desc{ + margin-top:5px +} + +#more_info_sheets .product_desc .product_image{ + float:left +} + +#more_info_sheets .product_desc .block_description{ + float:left; + margin-left:10px; + width:420px +} +#more_info_sheets .product_desc .clear_product_desc{ + clear:both; + height:0px; + line-height:0px +} + +/* Make sure lists are correctly displayed in tinyMCE BO edition mode too */ +#short_description_content ul, +#short_description_content ol, +#short_description_content dl, +#tinymce ul, +#tinymce ol, +#tinymce dl {margin-left:20px} + +.block_hidden_only_for_screen {display:none} + + +/* ************************************************************************************************ + PAGE AUTHENTIFICATION +************************************************************************************************ */ +#authentication #left_column {display:none} +#authentication #center_column{width:757px} + + +/* ************************************************************************************************ + PAIMENT - PAGE ORDER +************************************************************************************************ */ + +/* nav bottom ********************************************************************************** */ +#order #left_column , #order-confirmation #left_column {display:none} +#order #center_column, #order-confirmation #center_column{width:757px} + +.cart_navigation {margin:20px 0} +.cart_navigation .exclusive, +.cart_navigation .exclusive_large { + float:right +} +.cart_navigation .button, +.cart_navigation .button_large { + border-color:#ccc; + background-image:url(../img/bg_bt_2.gif) +} + + +/* step 1 - cart ******************************************************************************* */ +.cart_last_product {display:none} + +/*p.cart_navigation .multishipping-button { margin-right: 10px }*/ + +#order-detail-content {margin-bottom:20px} + +table#cart_summary th { + padding:14px 12px; + color:#fff; + font-weight:bold; + text-transform:uppercase; + text-shadow:0 1px 0 #666; + background:url(../img/bg_table_th.png) repeat-x 0 -15px #999 +} +table#cart_summary th.cart_product {text-align:center} +table#cart_summary td { + padding:12px; + border-right:1px solid #e9e9e9; + border-bottom:1px solid #e9e9e9; + font-weight:bold; + font-size:12px; + vertical-align:top +} +table#cart_summary td.cart_delete, +table#cart_summary td.price_discount_del {border-right:none;text-align: center} +table#cart_summary .last_item td {border-bottom:1px solid #999} + + +table#cart_summary tr.cart_item.odd, +table#cart_summary tr.cart_total_delivery, +table#cart_summary tr.cart_total_price, +table#cart_summary tr.cart_total_voucher{ + background-color: #fff +} +table#cart_summary tr.cart_item.even { + background-color: #f3f3f3 +} + +table#cart_summary tr.customization.odd { + background-color: #fff +} +table#cart_summary tr.customization.even { + background-color: #f3f3f3 +} + +table#cart_summary tr ul { + list-style: none; +} +table#cart_summary .cart_product { + width:80px; + text-align:center +}table#cart_summary tbody tr:last-child td { + border-bottom: 1px solid #999; +} +table#cart_summary .cart_product img {border:1px solid #ccc} +table#cart_summary .cart_description { + width:230px; +} +table#cart_summary .cart_unit {width:130px;text-align: center} +table#cart_summary td.cart_unit {text-align: right} +table#cart_summary .cart_quantity {width:130px} +table#cart_summary .customization .cart_quantity {padding: 8px 12px 0;} +.cart_quantity .cart_quantity_input { + float:left; + margin-left: 5px; + width: 20px; + border:1px solid #fff +} +.cart_quantity .cart_quantity_button { + float:left; + position: relative; + top: -5px +} +table#cart_summary .cart_total {width:120px;text-align: center} +table#cart_summary td.cart_total {text-align: right} +table#cart_summary .cart_delete { + width:64px; + text-align:center +} +table#cart_summary .cart_discount_price {text-align: right} +.cart_delete a.cart_quantity_delete, +a.price_discount_delete { + display:inline-block; + padding:1px 2px; + font-size:8px; + color:#666; + text-transform:uppercase; + text-shadow:0 1px 0 #fff; + background:#ccc; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px +} + +.cart_total_price .total_price_container { + border-right:none; +} + +table#cart_summary .cart_total_price td.cart_voucher { + border-bottom:1px solid #999; + vertical-align:middle +} + +table#cart_summary #total_price_container { + border-bottom:1px solid #999; +} + +.cart_voucher h4, +.cart_voucher p {float:left;} +.cart_voucher h4 { + margin-right:12px; + padding:5px 0; + font-size:13px +} +.cart_voucher p {padding-bottom:0;} +.cart_voucher #display_cart_vouchers { + clear:both; + line-height: 16px; + color:#666; + font-weight:normal; + border-top:1px dotted #ccc +} +.cart_voucher .title_offers {margin-top:10px} +.cart_voucher #display_cart_vouchers span {font-weight:bold} +.cart_voucher input.discount_name { + padding:0 5px; + height:22px; + width:170px;/* 180 */ + border:1px solid #ccc; + font-weight:normal; + background:url(../img/bg_discount_name.png) repeat-x 0 0 #fff +} +.cart_voucher .submit input.button { + margin-left:2px; + padding:2px; + height:24px; + border:1px solid #000; + -moz-border-radius:0; + -webkit-border-radius:0; + border-radius:0; + color:#fff; + text-transform:uppercase; + text-shadow:0 -1px 0 #333; + background:url(../img/bg_cart_voucher_submit.png) repeat-x 0 0 #000 +} + +#cart_summary .price { + border-right:none; + text-align: right; + white-space: nowrap; +} +.total_price_container p {text-align: left} + +table#cart_summary .cart_total_price .total_price_container { + padding:0; + border-bottom:1px solid #999; + border-right:1px solid #999; +} +.cart_total_price .total_price_container p { + display:block; + padding:8px; + font-weight:bold; + color:#fff; + text-transform:uppercase; + background:#333 +} +.cart_total_price .total_price_container span { + display:block; + padding:15px; + font-weight:bold; + font-size:18px; + text-align:center +} + +#order_carrier { + clear:both; + margin-top:20px; + border:1px solid #999; + background:#fff +} +#order_carrier h4 { + padding:0 15px; + height: 29px; + font-weight: bold; + line-height:29px; + color:#fff; + font-weight:bold; + text-transform:uppercase; + background:url(../img/bg_table_th.png) repeat-x 0 -10px #999 +} +#order_carrier span { + display:block; + padding:15px; + font-weight:bold +} + +.order_delivery .first_item {margin-right:35px;} + +.multishipping_close_container { + text-align: center; +} + +table#cart_summary .gift-icon { + color: white; + background: #0088CC; + line-height: 20px; + padding: 2px 5px; + border-radius: 5px; +} + +/* step 2 - authentification ******************************************************************* */ +#create-account_form, #authentication #login_form { + clear: none; + float: left; + height: 20em; + width: 49%; +} +#create-account_form {margin-right: 11px;} + +#authentication #create-account_form fieldset, +#authentication #login_form fieldset { + height: 200px +} + +#authentication #create-account_form .form_content, +#authentication #login_form .form_content { + padding:15px 10px +} + +#create-account_form h3, +#authentication #login_form h3 { + padding:8px; + border-bottom:1px solid #ccc; + font-weight:bold; + font-size:12px; + color:#fff; + text-transform:uppercase; + background:url(../img/bg_form_h3.png) repeat-x 0 0 #989898 +} +#create-account_form h4 { + padding-bottom:22px; + font-size:11px; + color:#333 +} + +#create-account_form label, +#login_form label { + display:inline-block; + width:110px; + color:#666 +} + +#order-opc #login_form_content label { + display:block; + margin:0 0 10px 0 +} + +#create-account_form #email_create, +#login_form #email, +#login_form #passwd, +#login_form #login_email, +#login_form #login_passwd { + padding:0 5px; + height:20px; + width:220px;/* 230 */ + border:1px solid #ccc; + color:#666; + background:url(../img/bg_discount_name.png) repeat-x 0 0 #fff +} + +#create-account_form #SubmitCreate, +#login_form #SubmitLogin { + float:right +} + +.lost_password { + float:left; + width:200px +} +.lost_password a {color:#666} + +#order-opc .lost_password { + display:block; + float:none; + margin:5px 0 10px; + width:auto; + font-size:11px; + color:#666 +} + +#ordermsg p {padding-bottom:0} +#ordermsg p.txt { + float:left; + margin-right:25px; + width:220px +} +/*#ordermsg .textarea {float:right}*/ +#ordermsg .textarea textarea { + height:90px; + width:475px; + border:1px solid #ccc +} + +/* step 3 - address ************************************************************************** */ + +.address-form-multishipping { padding: 10px 0px; } +#multishipping_mode_box { + border: 1px solid #D0D3D8; + background: url("../img/form_bg.jpg") repeat-x scroll left top #D0D1D5; + margin-bottom: 10px; + padding: 5px; +} +#multishipping_mode_checkbox { + vertical-align: middle; + margin-right: 5px; +} +#multishipping_mode_box.on { + border: 1px solid #ddd; +} +#multishipping_mode_box .title { + padding: 5px; + font-weight: bold; +} +#multishipping_mode_box .description, #multishipping_mode_box .description_off { + padding: 5px; +} +#multishipping_mode_box .description_off { + display: none; + padding: 5px; +} +#multishipping_mode_box .description_off div { + margin-bottom: 10px; +} +#multishipping_mode_box .description_off a, #multishipping_mode_box .description a { + display: block; + text-align: center; + text-decoration: none; + padding: 5px 10px; + margin: 0 160px; + border: 1px solid #ccc; + background: #ddd; +} +#multishipping_mode_box .description_off a:hover, #multishipping_mode_box .description a:hover { + background: #f3f3f3; + border: 1px solid #ccc; +} +#multishipping_mode_box.on .description_off { + display: block; +} + + +/* step 4 - paiement ************************************************************************** */ + +.delivery_options { + border: 1px solid #BDC2C9; + border-top: 0; +} + +#order .delivery_options_address h3, #order-opc .delivery_options_address h3 { +/*background: url("../img/table_header.gif") no-repeat; +color: #374853; +font-weight: bold; +height: 14px; +padding: 5px 10px; +margin: 10px 0 0 0;*/ + padding: 6px 11px; + font-size: 12px; + color: #fff; + text-shadow: 0 1px 0 #000; + text-transform: uppercase; + background: none repeat scroll 0 0 #383838; +} +#order .delivery_option_radio, #order-opc .delivery_option_radio { + float: left; + margin: 21px 12px; +} +#order .delivery_option label, #order-opc .delivery_option label { + display: block; + padding-bottom: 5px; + padding-top: 5px; +} +#order .delivery_option label > table.resume, #order-opc .delivery_option label > table.resume { + height: 46px; + width: 685px; +} +#order .delivery_option.item, #order-opc .delivery_option.item { + background: #fafafa; +} +#order .delivery_option.alternate_item, #order-opc .delivery_option.alternate_item { + border-top: 1px solid #bdc2c9; + background: #f1f2f4; + border-bottom: 1px solid #bdc2c9; +} +#order .delivery_option label > table.resume td, #order-opc .delivery_option label > table.resume td { + padding: 0 8px; +} +#order .delivery_option label > table.resume td + td, #order-opc .delivery_option label > table.resume td + td { + width: 300px; +} +#order .delivery_option label > table.resume td + td + td, #order-opc .delivery_option label > table.resume td + td + td { + width: 100px; + text-align: right; +} +#order .delivery_option_carrier td {width:200px} +#order .delivery_option_carrier td + td {width:280px;} +#order .delivery_option_carrier td + td + td {width:200px} +#order .delivery_options_address .delivery_option_logo, #order .delivery_option_carrier .delivery_option_logo, #order-opc .delivery_options_address .delivery_option_logo { + padding-left:10px; + width: 160px; +} +#order .delivery_options_address .delivery_option_logo img, #order-opc .delivery_options_address .delivery_option_logo img { /*height: 40px;*/ } +#order .delivery_option_carrier .first_item, #order-opc .delivery_option_carrier .first_item { + padding: 3px 5px 3px 12px; + background:url(../img/arrow_right_2.png) no-repeat 3px 7px +} + +.order_carrier_content { + padding:15px; + border:1px solid #ccc; + font-size:12px; + color:#000; + background:#f8f8f8 +} +.order_carrier_content h3 { + padding:15px 0 10px 0; + font-size:13px; + color:#000 +} +.order_carrier_content h3.carrier_title {padding-top:0} +.order_carrier_content input { + position:relative; + top:1px +} + +#carrierTable { + border:1px solid #999; + border-bottom:none; + background:#fff +} + +#carrierTable tbody{ + border-bottom:1px solid #999; +} +#carrierTable th { + padding:0 15px; + height: 29px; + font-weight: bold; + line-height:29px; + color:#fff; + text-transform:uppercase; + background:url(../img/bg_table_th.png) repeat-x 0 -10px #999 +} +#carrierTable td { + padding:15px; + font-weight:bold; + border-right:1px solid #e9e9e9 +} +#carrierTable td.carrier_price {border:none} + +#gift_div { + display:none; + padding-bottom:10px +} +#gift_div label { + display:block; + margin-bottom:5px +} +#gift_div #gift_message { + height:50px; + width:720px; + border:1px solid #999 +} + +a.iframe {font-weight:bold} + +.hook_extracarrier { + margin-top: 5px; + padding: 5px; +} + +/* step 5 - paiement ************************************************************************** */ +.paiement_block { + padding:15px; + border:1px solid #ccc; + font-size:12px; + color:#000; + background:#f8f8f8 +} + +.payment_module { + position:relative; + padding-top:20px; + border-top:1px dotted #ccc; + text-transform:uppercase; +} +.payment_module a {display:block;} +.payment_module img { + float:left; + margin-right:10px +} +/*.payment_module span { + position:absolute; + top:50px; + left:145px +}*/ + +.payment_module:before, +.payment_module:after { + content: "."; + display: block; + height: 0; + overflow: hidden +} +.payment_module:after {clear: both} +.payment_module {zoom: 1} + + +/* ************************************************************************************************ + PAGE ORDER-OPC +************************************************************************************************ */ +#order-opc #left_column {display:none} +#order-opc #center_column{width:757px} + + +#order-opc h2 {} +#order-opc h2 span { + display:inline-block; + padding:5px 7px; + color:#fff; + background:#333; +} + +#order-opc #login_form fieldset { + background: none repeat scroll 0 0 #FFFFE0; + border: 1px solid #E6DB55; + font-size: 13px; + margin: 0 0 10px; + padding: 10px; +} +#order-opc #login_form fieldset p {padding:0} +#order-opc #login_form fieldset p a {padding:0} + +#order-opc #new_account_form p.submit { + margin-right: 120px; + text-align:right +} +#order-opc #new_account_form p.opc-required {margin-left:20px} + +#order-opc .addresses {margin-bottom:20px} + +#order-opc #opc_delivery_methods h3 {margin-top:20px;} +#order-opc #opc_delivery_methods textarea { + height:60px; + width:755px; + border:1px solid #ccc +} + +#order-opc #opc_payment_methods {margin-bottom:20px} +#order-opc #opc_payment_methods #opc_payment_methods-content p{margin:0} + +.delivery_option_carrier td {width:200px} +.delivery_option_carrier td + td {width:280px;} +.delivery_option_carrier td + td + td {width:200px} +.delivery_option_carrier { + margin: 5px 0 0 45px; + width: 670px; + display: none; +} + .delivery_option_carrier tr td { + padding: 5px; +} +.delivery_option_carrier.selected { + display: table; +} +.delivery_option_carrier.not-displayable { + display: none; +} +.delivery_option_title { + font-weight: bold; +} + + +/* ************************************************************************************************ + express checkout +************************************************************************************************ */ +#new_account_form {clear:both;margin-bottom: 20px} +#new_account_form h3 { + margin-bottom:20px; + padding:8px; + border-bottom:1px solid #ccc; + font-weight:bold; + font-size:12px; + color:#fff; + text-transform:uppercase; + background:url(../img/bg_form_h3.png) repeat-x 0 0 #989898 +} +#center_column #new_account_form p { + margin:0; + padding:0 0 10px 0 +} +#new_account_form p.required {color:#222} +#new_account_form p.required sup {color:#990000} +#new_account_form p.radio span, +#new_account_form p.text label, +#new_account_form p.password label, +#new_account_form p.select label, +#new_account_form p.select span, +#new_account_form p.textarea label { + display: inline-block; + padding: 6px 15px; + width: 230px; + font-size: 14px; + text-align: right +} +#new_account_form p.radio label { + float:none; + padding-right:10px; + width:auto; + font-size:14px; +} +#new_account_form p.checkbox label { + float: none; + width: auto; + font-size: 12px; +} +#new_account_form p.text input, +#new_account_form p.password input, +#new_account_form p.select input { + height:22px; + padding:0 5px; + width:360px; + border:1px solid #ccc; + font-size:12px; + color:#666 +} +#new_account_form p.checkbox input {margin-left: 260px;} + +#new_account_form #submitGuestAccount {float: right} + +/* ************************************************************************************************ */ + +/* ************************************************************************************************ + paiment - CONFIRMATION +************************************************************************************************ */ +#orderconfirmation #left_column {display:none} +#orderconfirmation #center_column{width:757px} + + +/* ************************************************************************************************ + PAGE PASSWORD +************************************************************************************************ */ +#form_forgotpassword fieldset { + padding: 10px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background: #eee +} +#form_forgotpassword p.text label { + display: inline-block; + padding-right: 10px; + width: 174px; + font-weight: bold; + font-size: 12px; + text-align: right +} +#form_forgotpassword p.text input { + padding: 0 5px; + height: 20px; + width: 288px; + border: 1px solid #ccc; + background: url(../img/bg_input.png) repeat-x 0 0 #fff +} +#form_forgotpassword p.submit { + margin-right:25px; + padding-bottom:5px; + text-align:right +} + +#password .icon { + position:relative; + top:6px; +} + + +/* ************************************************************************************************ + PAGE ADRESSES +************************************************************************************************ */ +#addresses #left_column {display:none} +#addresses #center_column{width:757px} + +#address p.inline-infos { + margin:0 0 0 100px !important; + font-size:12px; + color:#666; +} + + +/* ************************************************************************************************ + PAGE ADD ADRESS +************************************************************************************************ */ +#address #left_column {display:none} +#address #center_column{width:757px} + +form#add_adress {} +#add_adress fieldset { + margin:0; + border:1px solid #ccc; + background:#F8F8F8 +} +#add_adress h3 { + margin:0 0 15px 0; + padding:8px; + font-size:14px; + color:#fff; + text-transform:uppercase; + background:url(../img/bg_form_h3.png) repeat-x 0 0 #989898 +} +#center_column #add_adress p {margin:0; padding:0 0 10px 0} +#add_adress p.required {color:#222} +#add_adress p.required sup {color:#990000} + +#add_adress p.text label, +#add_adress p.password label, +#add_adress p.select label, +#add_adress p.select span, +#add_adress p.textarea label { + display:inline-block; + padding:6px 15px; + width:230px;/* 260 */ + font-size:14px; + text-align:right +} +#add_adress p.text input, +#add_adress p.password input, +#add_adress p.select input { + padding:0 5px; + height:22px; + width:360px;/* 370 */ + border:1px solid #ccc; + font-size: 12px; + color:#666 +} +#add_adress p.checkbox input { + margin-left:260px; +} +#add_adress p.select select { + margin-right:10px; + border:1px solid #ccc; + font-size: 12px; + color:#666 +} +#add_adress p.textarea label {vertical-align:top} +#add_adress p.textarea textarea { + height:80px; + width:370px; + border:1px solid #ccc; + font-size: 12px; + color:#666 +} +#center_column #add_adress p.submit2 { + margin-top:20px; + text-align:right +} + +#add_adress span.form_info, +#add_adress span.inline-infos { + display:block; + margin:5px 0 0 265px; + color:#666 +} + + +/* ************************************************************************************************ + PAGE ORDER-SPLIP +************************************************************************************************ */ +#order-slip #left_column {display:none} +#order-slip #center_column{width:757px} + +#order-slip #order-list {border-bottom:1px solid #999} +#order-slip #order-list td { + border-top: 1px solid #ccc; + border-bottom:none +} +#order-slip #order-list td.history_invoice {border-right:none} + + +/* ************************************************************************************************ + PAGE DISCOUNT +************************************************************************************************ */ +#discount #left_column {display:none} +#discount #center_column{width:757px} + +#discount .table_block tr.last_item td {border-bottom:1px solid #999} +#discount .table_block td.discount_expiration_date {border-right:1px solid #999} +#discount .table_block td.discount_value {white-space:nowrap} + + +/* ************************************************************************************************ + PAGE ORDER FOLLOW +************************************************************************************************ */ +#order-follow #left_column {display:none} +#order-follow #center_column{width:757px} + + +/* ************************************************************************************************ + PAGE NEW-PRODUCTS +************************************************************************************************ */ +#newproducts .sortPagiBar {margin-bottom:20px} + + +/* ************************************************************************************************ + PAGE BEST SALES +************************************************************************************************ */ +#bestsales .sortPagiBar {margin-bottom:20px} + +/* ************************************************************************************************ + PAGE PRICES DROP SALES +************************************************************************************************ */ +#pricesdrop .sortPagiBar {margin-bottom:20px} + + +/* ************************************************************************************************ + PAGE MANUFACTURER +************************************************************************************************ */ +#manufacturer .nbrmanufacturer { + margin: 15px 0 10px; + padding: 8px 7px; + font-size:12px; + color: #000; + background: none repeat scroll 0 0 #f0f0f0 +} + +#manufacturer #product_list {margin-top:15px} + +ul#manufacturers_list {list-style-type:none} +ul#manufacturers_list li { + margin-bottom: 14px; + padding: 12px 8px; + border: 1px solid #eee; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius:3px; +} +ul#manufacturers_list li a.lnk_img { + display: block; + float: left; +} +ul#manufacturers_list li img { + display: block; + float: left; + margin-right: 14px; + border: 1px solid #ccc; + vertical-align: bottom +} +ul#manufacturers_list li h3 { + padding: 0 0 10px; + font-size: 13px; + color: #000 +} +ul#manufacturers_list li .description { + overflow: hidden; + padding: 0; + font-size:12px; + color:#666 +} +ul#manufacturers_list li .right_side {float:right;} + +.description_box { + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #E2E2E2; + padding: 5px; + margin-bottom: 20px; + font-size: 12px; + line-height: 18px; +} +.description_box p { + margin: 0; + padding: 0 10px 5px; +} +.description_box .hide_desc { + display: none; +} +.description_box .lnk_more { + background: url("../img/arrow_right_1.png") no-repeat scroll 100% 4px transparent; + color: #0088CC; + padding: 0 10px; +} +.description_box ul { + padding-left: 30px; + padding-bottom: 10px; +} + +/* ************************************************************************************************ + PAGE SUPPLIER +************************************************************************************************ */ +#supplier .nbrmanufacturer { + margin: 15px 0 10px; + padding: 8px 7px; + font-size:12px; + color: #000; + background: none repeat scroll 0 0 #f0f0f0 +} +ul#suppliers_list {list-style-type:none} +ul#suppliers_list li { + margin-bottom: 14px; + padding: 12px 8px; + border: 1px solid #eee; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius:3px; +} +ul#suppliers_list li a.lnk_img { + display: block; + float: left; +} +ul#suppliers_list li img { + display: block; + float: left; + margin-right: 14px; + border: 1px solid #ccc; + vertical-align: bottom +} +ul#suppliers_list li h3 { + padding: 0 0 10px; + font-size: 13px; + color: #000 +} +ul#suppliers_list li .description { + overflow: hidden; + padding: 0; + font-size:12px; + color:#666 +} +ul#suppliers_list li .right_side {float:right;} + + +/* ************************************************************************************************ + PAGE SEARCH +************************************************************************************************ */ +#search h3.nbresult { + margin:0 0 10px 0; + padding:10px; + border:1px solid #e6db55; + font-size:13px; + background:#ffffe0 +} +#search .sortPagiBar {margin-bottom:20px} + + +/* ************************************************************************************************ + PAGE 404 +************************************************************************************************ */ +#pagenotfound #left_column, +#pagenotfound #right_column, +#pagenotfound #footer {display:none} + +#pagenotfound #left_column, +#pagenotfound #right_column, +#pagenotfound #footer {display:none} + +#pagenotfound #center_column {width:940px;} + +#pagenotfound .pagenotfound { + padding:30px 300px 0 0; + height:330px; + font-size:14px; + background:url(../img/bg_404.png) no-repeat 100% 0 +} +#pagenotfound h3 { + font-weight:normal; + font-size:14px +} +#pagenotfound fieldset {border:none} +#pagenotfound fieldset label {color:#333} +#pagenotfound #search_query { + -moz-border-bottom-colors: none; + -moz-border-image: none; + -moz-border-left-colors: none; + -moz-border-right-colors: none; + -moz-border-top-colors: none; + border-bottom: 1px solid #666; + border-left: 1px solid #666; + border-right: 1px solid #fff !important; + border-top: 1px solid #666; + padding: 0 5px; + height: 24px; + width: 200px; + color: #ccc; + background: url(../../../modules/blocksearch/img/bg_search_input.png) repeat-x scroll 0 0 #fff +} +#pagenotfound .button_small { + padding: 4px 7px; + border: medium none; + -moz-border-radius:0; + -webkit-border-radius:0; + border-radius:0; + color: #fff; + text-transform: uppercase; + background: url("../../../modules/blocksearch/img/bg_search_submit.png") repeat-x scroll 0 0 #101010 +} +#pagenotfound .pagenotfound a { + font-weight:bold; + color:#333 +} +#pagenotfound .pagenotfound .icon { + position:relative; + top:3px +} + + +/* ************************************************************************************************ + addons payment cheque +************************************************************************************************ */ +#module-cheque-payment #left_column {display:none} +#module-cheque-payment #center_column{width:757px} + + +/* ************************************************************************************************ + addons payment bankwire +************************************************************************************************ */ +#module-bankwire-payment #left_column {display:none} +#module-bankwire-payment #center_column{width:757px} + + +/* ************************************************************************************************ + addons google checkout +************************************************************************************************ */ +#module-gcheckout-payment #left_column {display:none} +#module-gcheckout-payment #center_column{width:757px} + +/* ************************************************************************************************ + addons paypal +************************************************************************************************ */ +#module-payment-submit #left_column {display:none} +#module-payment-submit #center_column{width:757px} + + +/* ************************************************************************************************ + addons cashondelivery validation +************************************************************************************************ */ +#module-cashondelivery-validation #left_column {display:none} +#module-cashondelivery-validation #center_column{width:757px} + + +/* ************************************************************************************************ + addon RerversoForm +************************************************************************************************ */ +#account-creation_form fieldset.reversoform {padding:10px !important} +#account-creation_form fieldset.reversoform .text label{ + display:block; + padding:0 0 10px 0; + width:100%; + text-align:left; +} +#account-creation_form fieldset.reversoform .infos-sup { + padding:0 !important; + font-size:10px; + font-style:italic; + text-align:right +} +/* ************************************************************************************************ + addon customer privacy +************************************************************************************************ */ +#account-creation_form fieldset.customerprivacy label, fieldset.customerprivacy label{ + padding-bottom:0; + font-size:14px; + text-align:left; + cursor:pointer +} + +/* ************************************************************************************************ + addon referralprogram +************************************************************************************************ */ +#module-referralprogram-referralprogram-program #left_column {display:none} +#module-referralprogram-referralprogram-program #center_column{width:757px} + +#footer .myaccount li.referralprogram img {display:none} + +#module-referralprogram-referralprogram-program .sheets {padding-top:10px} + +#module-referralprogram-referralprogram-program form p.checkbox {font-weight:bold} +#module-referralprogram-referralprogram-program form p.checkbox a {text-decoration:underline} +#module-referralprogram-referralprogram-program form p.submit {text-align:right} +#module-referralprogram-referralprogram-program form p.see_email { + padding-left:10px; + color: #0088cc; + background:url(../img/arrow_right_1.png) no-repeat 0 4px; +} +#module-referralprogram-referralprogram-program form p.see_email a { + color: #0088cc; + text-decoration:underline +} + +/* ************************************************************************************************ + addon loyalty +************************************************************************************************ */ +#module-loyalty-default #left_column {display:none} +#module-loyalty-default #center_column{width:757px} + +#product p#loyalty { + padding:10px 0 0 20px; + border-top:1px solid #ccc; + background:url(../img/icon/info.png) no-repeat 0 8px; + margin-top: 10px; +} + +#footer .myaccount li.loyalty img {display:none} + + +/* ************************************************************************************************ + addon Livezilla +************************************************************************************************ */ +#livezilla_lnk { + margin:10px 0; + text-align: right +} +#livezilla_lnk a { + display:inline-block; + padding:6px 8px 8px 8px; + -moz-border-radius:3px; + -webkit-border-radius:3px; + border-radius:3px; + font:bold 10px Arial,Verdana,sans-serif; + color:#fff; + text-shadow: 0 -1px 0 #000; + background: url(../img/bg_bt_compare.gif) repeat-x scroll 0 0 #000 +} +#livezilla_lnk a:hover {text-decoration:none} + +/* ************************************************************************************************ + addons comments products +************************************************************************************************ */ +form#sendComment fieldset{ + padding:10px; + border:1px solid #ccc; + background:#eee +} +form#sendComment h3 {font-size:14px;} +#new_comment_form p.text { + margin-bottom: 0; + padding-bottom: 0; +} +#sendComment p.text label, +#sendComment p.textarea label { + display: block; + margin: 12px 0 4px; + font-weight: bold; + font-size: 12px; +} +#sendComment p.text input { + padding: 0 5px; + height: 28px; + width: 498px; + border: 1px solid #ccc; + background: url(../img/bg_input.png) repeat-x 0 0 #fff; +} +#sendComment p.textarea textarea { + height:80px; + width:508px; + border:1px solid #ccc; +} +#sendComment p.submit { + padding:0; + text-align:right +} + +#sendComment p.closeform { + float:right; + padding:0; + height:12px; + width:12px; + text-indent:-5000px; + background:url(../img/icon/delete.gif) no-repeat 0 0 +} + +.star { + position: relative; + top:2px; + float: left; + height: 12px; + width: 12px; + overflow: hidden; + text-indent: -999em; + cursor: pointer +} +.star, .star a { background: url(../../../modules/productcomments/img/star.gif) no-repeat 0 0 } +div.star_on a { background-position: 0 -12px } +div.star_hover a, div.star a:hover { background-position: 0 -12px } + + +/* ************************************************************************************************ + xxxxx +************************************************************************************************ */ + + +/* ************************************************************************************************ + guest tracking +************************************************************************************************ */ + +#guest-tracking fieldset p:first-child { + padding-top: 10px; +} +#guest-tracking fieldset p:last-child { + padding-bottom: 10px; +} + + + +/* ************************************************************************************************ + CSS Modules +************************************************************************************************ */ + +/******* IMPORTANT - Internet Explorer can read 31 CSS files max. Some CSS have been put here and erased from their own module folder.************/ + +/*************** Block ADVERTISING ***************/ +.advertising_block { width: 191px; margin-bottom: 1em; text-align: center } + + + +/*************** Block CATEGORIES ***************/ +#categories_block_left li {border-bottom:1px dotted #ccc} + #categories_block_left li.last { border:none;} + #categories_block_left li a { + display:block; + padding:7px 11px 5px 22px; + color:#333; + background:url(../../../modules/blockcategories/img/arrow_right_2.png) no-repeat 10px 10px transparent + } + + #categories_block_left li ul {margin-left:40px} + #categories_block_left li ul li {border:none} + #categories_block_left li ul li a { + padding-left:0; + background:none + } + +#categories_block_left li .OPEN, +#categories_block_left li .CLOSE { + display:block; + float:right; + margin:10px 10px 0; + height:9px; + width:9px; + background:url(../../../modules/blockcategories/img/icon/open-close.png) no-repeat 0 -9px; + cursor:pointer +} +#categories_block_left li .CLOSE {background-position:0 0} + + +/* footer */ +.blockcategories_footer { + padding:15px 10px; +} +.blockcategories_footer ul ul {display:none !important} + + + +/*************** Block CMS ***************/ +/* footer */ +#footer .block_various_links {padding:15px 10px;} + +/* Block CMS links */ +.informations_block_left li {border-bottom:1px dotted #eee} +.informations_block_left li.last {border:none;} +.informations_block_left li a { + display:block; + padding:7px 11px 5px 22px; + color:#333; + background:url(../../../modules/blockcms/img/arrow_right_2.png) no-repeat 10px 10px transparent; +} + +tr.subitem > td:first-child + td { + padding-left: 10px; +} + + + +/*************** Block CONTACTINFOS ***************/ + +#block_contact_infos {padding:15px 10px;} +#block_contact_infos li { + padding:0 !important; + line-height: 20px; +} +#block_contact_infos li strong { + font-weight:normal; + font-size:13px; +} +#block_contact_infos li pre {font: 11px/20px Arial,Verdana,sans-serif;} + + + +/*************** Block LINK ***************/ +#links_block_left .block_content li {border-bottom:1px dotted #eee} +#links_block_left .block_contentt li.last {border:none;} +#links_block_left .block_content li a { + display:block; + padding:7px 11px 5px 22px; + color:#333; + background:url(../../../modules/blocklink/img/arrow_right_2.png) no-repeat 10px 10px transparent; +} + + + +/*************** Block MANUFACTURER ***************/ +.blockmanufacturer li {border-bottom:1px dotted #ccc} +.blockmanufacturer li.last { border:none;} + .blockmanufacturer li a { + display:block; + padding:7px 11px 5px 22px; + color:#333; + background:url(../../../modules/blockmanufacturer/img/arrow_right_2.png) no-repeat 10px 10px transparent + } + + +.blockmanufacturer form {margin-top:10px;} +.blockmanufacturer p { + padding:0; + text-align:center +} + +/*************** Block LOGO PAYMENT ***************/ + +.paiement_logo_block { width: 191px; text-align: center; margin-bottom: 1.5em } +.paiement_logo_block a { text-decoration: none } +.paiement_logo_block img { margin: 0 0.5em } + + + +/*************** Block RSS ***************/ +#rss_block_left p { + margin:0; + padding:10px; +} + +#rss_block_left li {border-bottom:1px dotted #ccc} +#rss_block_left li.last { border:none;} + #rss_block_left li a { + display:block; + padding:7px 11px 5px 22px; + color:#333; + background:url(../../../modules/blockrss/img/arrow_right_2.png) no-repeat 10px 10px transparent + } + + +/*************** Block SOCIAL ***************/ +#social_block {padding:15px 10px;} +#social_block li {padding-left:22px !important;} +#social_block li.facebook {background:url(../../../modules/blocksocial/img/sprite_pict_social_block.png) no-repeat 0 6px;} +#social_block li.twitter {background:url(../../../modules/blocksocial/img/sprite_pict_social_block.png) no-repeat 0 -26px;} +#social_block li.rss {background:url(../../../modules/blocksocial/img/sprite_pict_social_block.png) no-repeat 0 -56px;} + + +/*************** Block STORE ***************/ +.blockstore img { margin: 10px 0 0 0} +.blockstore p { + padding-bottom:0; + font-weight:bold; + text-align: right +} +.blockstore p.store_image { + padding-bottom:10px; + text-align:center +} + + +/*************** Block SUPPLIER ***************/ +.blocksupplier li {border-bottom:1px dotted #ccc} +.blocksupplier li.last { border:none;} + .blocksupplier li a { + display:block; + padding:7px 11px 5px 22px; + color:#333; + background:url(../../../modules/blocksupplier/img/arrow_right_2.png) no-repeat 10px 10px transparent + } + +.blocksupplier form {margin-top:10px;} +.blocksupplier p { + padding:0; + text-align:center +} From cff56616905fe5f1faaf72f77c1402b4fc542684 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Wed, 28 Nov 2012 18:52:01 +0100 Subject: [PATCH 144/316] [-] BO : fixed bug #PSCFV-5743 - modify status Preparation in progress and remove the delivery flag --- install-dev/data/xml/order_state.xml | 2 +- install-dev/upgrade/sql/1.5.2.1.sql | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/install-dev/data/xml/order_state.xml b/install-dev/data/xml/order_state.xml index 770e9178e..c4fb9deb2 100644 --- a/install-dev/data/xml/order_state.xml +++ b/install-dev/data/xml/order_state.xml @@ -15,7 +15,7 @@
  • {$cmslink.meta_title|escape:'htmlall':'UTF-8'}
  • {/if} {/foreach} - +
  • {l s='Sitemap' mod='blockcms'}
  • {if $display_poweredby}
  • {l s='Powered by' mod='blockcms'} PrestaShop™
  • {/if}
{$footer_text} From 49e1a536e33bd516b6ac8e6c2feba576bf857352 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Sun, 2 Dec 2012 19:46:09 +0100 Subject: [PATCH 163/316] [*] FO : improve SEO and http error code --- classes/controller/Controller.php | 1 + controllers/admin/AdminCmsController.php | 15 ++++++++++++-- controllers/front/CategoryController.php | 25 +++++++++++++++++++----- controllers/front/CmsController.php | 24 +++++++++++++++++------ themes/default/cms.tpl | 4 +++- 5 files changed, 55 insertions(+), 14 deletions(-) diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php index 06551ff51..669107864 100644 --- a/classes/controller/Controller.php +++ b/classes/controller/Controller.php @@ -150,6 +150,7 @@ abstract class ControllerCore $this->init(); if ($this->checkAccess()) { + // setMedia MUST be called before postProcess if (!$this->content_only && ($this->display_header || (isset($this->className) && $this->className))) $this->setMedia(); diff --git a/controllers/admin/AdminCmsController.php b/controllers/admin/AdminCmsController.php index 8029a1a2b..1e55ede0a 100644 --- a/controllers/admin/AdminCmsController.php +++ b/controllers/admin/AdminCmsController.php @@ -309,9 +309,20 @@ class AdminCmsControllerCore extends AdminController if (!$cms->active) { - $admin_dir = dirname($_SERVER['PHP_SELF']); + $admin_dir = dirname($_SERVER['PHP_SELF']); $admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1); - $preview_url .= $cms->active ? '' : '&adtoken='.Tools::getAdminTokenLite('AdminCmsContent').'&ad='.$admin_dir.'&id_employee='.(int)$this->context->employee->id; + + $params = http_build_query(array( + 'adtoken' => Tools::getAdminTokenLite('AdminCmsContent'), + 'ad' => $admin_dir, + 'id_employee' => (int)$this->context->employee->id) + ); + if (Configuration::get('PS_REWRITING_SETTINGS')) + $params = '?'.$params; + else + $params = '&'.$params; + + $preview_url .= $cms->active ? '' : $params; } Tools::redirectAdmin($preview_url); } diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php index bb498b364..538cb9e4d 100644 --- a/controllers/front/CategoryController.php +++ b/controllers/front/CategoryController.php @@ -28,6 +28,7 @@ class CategoryControllerCore extends FrontController { public $php_self = 'category'; protected $category; + public $customer_access = true; /** * Set default medias for this controller @@ -52,6 +53,7 @@ class CategoryControllerCore extends FrontController public function canonicalRedirection($canonicalURL = '') { + return ; if (!Validate::isLoadedObject($this->category) || !$this->category->inShop() || !$this->category->isAssociatedToShop()) { $this->redirect_after = '404'; @@ -76,14 +78,30 @@ class CategoryControllerCore extends FrontController $this->category = new Category($id_category, $this->context->language->id); parent::init(); - + //check if the category is active and return 404 error if is disable. + if (!$this->category->active) + { + header('HTTP/1.1 404 Not Found'); + header('Status: 404 Not Found'); + } + //check if category can be accessible by current customer and return 403 if not if (!$this->category->checkAccess($this->context->customer->id)) + { + header('HTTP/1.1 403 Forbidden'); + header('Status: 403 Forbidden'); $this->errors[] = Tools::displayError('You do not have access to this category.'); + $this->customer_access = false; + } } - + public function initContent() { parent::initContent(); + + $this->setTemplate(_PS_THEME_DIR_.'category.tpl'); + + if (!$this->customer_access) + return; if (isset($this->context->cookie->id_compare)) $this->context->smarty->assign('compareProducts', CompareProduct::getCompareProducts((int)$this->context->cookie->id_compare)); @@ -111,9 +129,6 @@ class CategoryControllerCore extends FrontController 'comparator_max_item' => (int)Configuration::get('PS_COMPARATOR_MAX_ITEM'), 'suppliers' => Supplier::getSuppliers() )); - - - $this->setTemplate(_PS_THEME_DIR_.'category.tpl'); } /** diff --git a/controllers/front/CmsController.php b/controllers/front/CmsController.php index 8a040d93f..8137396c4 100644 --- a/controllers/front/CmsController.php +++ b/controllers/front/CmsController.php @@ -51,16 +51,28 @@ class CmsControllerCore extends FrontController $this->cms = new CMS($id_cms, $this->context->language->id); else if ($id_cms_category = (int)Tools::getValue('id_cms_category')) $this->cms_category = new CMSCategory($id_cms_category, $this->context->language->id); + $this->canonicalRedirection(); - /* assignCase (1 = CMS page, 2 = CMS category) */ - if (Validate::isLoadedObject($this->cms) - && ($this->cms->isAssociatedToShop() && $this->cms->active || (Tools::getValue('adtoken') == Tools::getAdminToken('AdminCmsContent'.(int)Tab::getIdFromClassName('AdminCmsContent').(int)Tools::getValue('id_employee'))))) - $this->assignCase = 1; + // assignCase (1 = CMS page, 2 = CMS category) + if (Validate::isLoadedObject($this->cms)) + { + $adtoken = Tools::getAdminToken('AdminCmsContent'.(int)Tab::getIdFromClassName('AdminCmsContent').(int)Tools::getValue('id_employee')); + if (!$this->cms->isAssociatedToShop() || !$this->cms->active && Tools::getValue('adtoken') != $adtoken) + { + header('HTTP/1.1 404 Not Found'); + header('Status: 404 Not Found'); + } + else + $this->assignCase = 1; + } else if (Validate::isLoadedObject($this->cms_category)) $this->assignCase = 2; else - Tools::redirect('index.php?controller=404'); + { + header('HTTP/1.1 404 Not Found'); + header('Status: 404 Not Found'); + } } public function setMedia() @@ -87,7 +99,7 @@ class CmsControllerCore extends FrontController $this->context->smarty->assign('cgv_id', Configuration::get('PS_CONDITIONS_CMS_ID')); if (isset($this->cms->id_cms_category) && $this->cms->id_cms_category) $path = Tools::getFullPath($this->cms->id_cms_category, $this->cms->meta_title, 'CMS'); - else + else if (isset($this->cms_category->meta_title)) $path = Tools::getFullPath(1, $this->cms_category->meta_title, 'CMS'); if ($this->assignCase == 1) { diff --git a/themes/default/cms.tpl b/themes/default/cms.tpl index d4c04e2bb..b26a37b2c 100644 --- a/themes/default/cms.tpl +++ b/themes/default/cms.tpl @@ -67,6 +67,8 @@ {/if} {else} - {l s='This page does not exist.'} +
+ {l s='This page does not exist.'} +
{/if}
\ No newline at end of file From 0de7579f583acdefc6849deb88c42fa1c4ddf987 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Sun, 2 Dec 2012 20:05:39 +0100 Subject: [PATCH 164/316] //remove debug --- classes/controller/Controller.php | 1 - controllers/front/CategoryController.php | 1 - 2 files changed, 2 deletions(-) diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php index 669107864..06551ff51 100644 --- a/classes/controller/Controller.php +++ b/classes/controller/Controller.php @@ -150,7 +150,6 @@ abstract class ControllerCore $this->init(); if ($this->checkAccess()) { - // setMedia MUST be called before postProcess if (!$this->content_only && ($this->display_header || (isset($this->className) && $this->className))) $this->setMedia(); diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php index 538cb9e4d..2d6ec41ed 100644 --- a/controllers/front/CategoryController.php +++ b/controllers/front/CategoryController.php @@ -53,7 +53,6 @@ class CategoryControllerCore extends FrontController public function canonicalRedirection($canonicalURL = '') { - return ; if (!Validate::isLoadedObject($this->category) || !$this->category->inShop() || !$this->category->isAssociatedToShop()) { $this->redirect_after = '404'; From 585d7ddbab94808c7cad72ee1d2e047e6b618871 Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Mon, 3 Dec 2012 10:25:35 +0100 Subject: [PATCH 165/316] [-] FO: fix CSS / formatting needed on blocks - #PSCFV-3013 --- modules/blocksearch/blocksearch.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/blocksearch/blocksearch.css b/modules/blocksearch/blocksearch.css index 261b96752..366badad9 100644 --- a/modules/blocksearch/blocksearch.css +++ b/modules/blocksearch/blocksearch.css @@ -26,3 +26,15 @@ height: 25px; } +form#searchbox{padding-top:5px} +form#searchbox label{color:#333;margin-bottom:1px} +form#searchbox input#search_query_block{ + border: 1px solid #CCCCCC; + -webkit-border-radius:3px !important; + -moz-border-radius:3px !important; + border-radius:3px !important; + height: 18px; + margin-top:10px; +} +form#searchbox input#search_button{padding: 1px 4px;} + From 5b9f6dffc97a58b8adbaddf87be1dc7998a7927f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 3 Dec 2012 10:44:32 +0100 Subject: [PATCH 166/316] [-] FO: js was missing on order follow #PSCFV-5441 --- controllers/front/OrderFollowController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/front/OrderFollowController.php b/controllers/front/OrderFollowController.php index 2ac6a39cc..db270da14 100644 --- a/controllers/front/OrderFollowController.php +++ b/controllers/front/OrderFollowController.php @@ -113,7 +113,7 @@ class OrderFollowControllerCore extends FrontController parent::setMedia(); $this->addCSS(array(_THEME_CSS_DIR_.'history.css', _THEME_CSS_DIR_.'addresses.css')); $this->addJqueryPlugin('scrollTo'); - $this->addJS(_THEME_JS_DIR_.'history.js', _THEME_JS_DIR_.'tools.js'); + $this->addJS(array(_THEME_JS_DIR_.'history.js', _THEME_JS_DIR_.'tools.js')); } } From c73be7904a86e27017b9215261f75552a1764d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 3 Dec 2012 11:25:59 +0100 Subject: [PATCH 167/316] [-] BO: Fix category association in global context #PSCFV-5551 --- classes/Product.php | 2 +- controllers/admin/AdminProductsController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Product.php b/classes/Product.php index 8af855564..480757db4 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -798,7 +798,7 @@ class ProductCore extends ObjectModel SELECT c.`id_category` FROM `'._DB_PREFIX_.'category_product` cp LEFT JOIN `'._DB_PREFIX_.'category` c ON (c.`id_category` = cp.`id_category`) - '.Shop::addSqlAssociation('category', 'c', true).' + '.Shop::addSqlAssociation('category', 'c', true, null, true).' WHERE cp.`id_category` NOT IN ('.implode(',', array_map('intval', $categories)).') AND cp.id_product = '.$this->id ); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index ae2b93f8d..13cd6a4db 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1704,7 +1704,7 @@ class AdminProductsControllerCore extends AdminController $this->updateDownloadProduct($object, 1); $this->updateTags(Language::getLanguages(false), $object); - if ($this->isProductFieldUpdated('category_box') && !$object->updateCategories(Tools::getValue('categoryBox'), true)) + if ($this->isProductFieldUpdated('category_box') && !$object->updateCategories(Tools::getValue('categoryBox'))) $this->errors[] = Tools::displayError('An error occurred while linking object.').' '.$this->table.' '.Tools::displayError('To categories'); } From 4a94d54f6d9614ed07ace7d9d15855dd344f9ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 3 Dec 2012 12:26:27 +0100 Subject: [PATCH 168/316] [-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image --- classes/Image.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/classes/Image.php b/classes/Image.php index 0f56d1295..75c0a7f52 100644 --- a/classes/Image.php +++ b/classes/Image.php @@ -409,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 @@ -533,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'); From 2195f9bdcb5a9376981ba924f93967be2b4c62d7 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Mon, 3 Dec 2012 14:13:50 +0100 Subject: [PATCH 169/316] [+] CORE : now you can choose the redirect option when your product is disable --- .../controllers/products/informations.tpl | 45 ++++++++++++++++- classes/Product.php | 10 +++- controllers/admin/AdminProductsController.php | 3 +- controllers/front/ProductController.php | 45 +++++++++++++---- install-dev/data/db_structure.sql | 4 ++ install-dev/fixtures/apple/data/product.xml | 16 +++--- install-dev/upgrade/sql/1.5.2.1.sql | 6 ++- js/admin-products.js | 33 ++++++++++-- js/admin.js | 50 +++++++++++++++++++ translations/br/admin.php | 4 ++ translations/br/errors.php | 4 ++ translations/br/fields.php | 4 ++ translations/br/pdf.php | 4 ++ translations/br/tabs.php | 4 ++ 14 files changed, 206 insertions(+), 26 deletions(-) create mode 100644 translations/br/admin.php create mode 100644 translations/br/errors.php create mode 100644 translations/br/fields.php create mode 100644 translations/br/pdf.php create mode 100644 translations/br/tabs.php diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl index 8e56f4b88..93e92fc18 100644 --- a/admin-dev/themes/default/template/controllers/products/informations.tpl +++ b/admin-dev/themes/default/template/controllers/products/informations.tpl @@ -154,16 +154,57 @@
  • - 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/classes/Product.php b/classes/Product.php index 8af855564..e922dccd2 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -163,7 +163,13 @@ class ProductCore extends ObjectModel /** @var boolean Product statuts */ public $active = true; - + + /** @var boolean Product statuts */ + public $redirect_type = ''; + + /** @var boolean Product statuts */ + public $id_product_redirected = 0; + /** @var boolean Product available for order */ public $available_for_order = true; @@ -272,6 +278,8 @@ class ProductCore extends ObjectModel 'text_fields' => array('type' => self::TYPE_INT, 'shop' => true, 'validate' => 'isUnsignedInt'), 'uploadable_files' => array('type' => self::TYPE_INT, 'shop' => true, 'validate' => 'isUnsignedInt'), 'active' => array('type' => self::TYPE_BOOL, 'shop' => true, 'validate' => 'isBool'), + 'redirect_type' => array('type' => self::TYPE_STRING, 'shop' => true, 'validate' => 'isString'), + 'id_product_redirected' => array('type' => self::TYPE_INT, 'shop' => true, 'validate' => 'isUnsignedId'), 'available_for_order' => array('type' => self::TYPE_BOOL, 'shop' => true, 'validate' => 'isBool'), 'available_date' => array('type' => self::TYPE_DATE, 'shop' => true, 'validate' => 'isDateFormat'), 'condition' => array('type' => self::TYPE_STRING, 'shop' => true, 'validate' => 'isGenericName', 'values' => array('new', 'used', 'refurbished'), 'default' => 'new'), diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index ae2b93f8d..603078137 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3299,8 +3299,7 @@ class AdminProductsControllerCore extends AdminController $data->assign('currency', $currency); $this->object = $product; $this->display = 'edit'; - - + $data->assign('product_name_redirected', Product::getProductName((int)$product->id_product_redirected, null, (int)$this->context->language->id)); /* * Form for adding a virtual product like software, mp3, etc... */ diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index 0a3064a46..9ce391d2e 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -104,16 +104,45 @@ class ProductControllerCore extends FrontController * allow showing the product * In all the others cases => 404 "Product is no longer available" */ - if (!$this->product->isAssociatedToShop() - || ((!$this->product->active && ((Tools::getValue('adtoken') != Tools::getAdminToken('AdminProducts'.(int)Tab::getIdFromClassName('AdminProducts').(int)Tools::getValue('id_employee'))) - || !file_exists(_PS_ROOT_DIR_.'/'.Tools::getValue('ad').'/index.php'))))) + if (!$this->product->isAssociatedToShop() || !$this->product->active) { - header('HTTP/1.1 404 page not found'); - $this->errors[] = Tools::displayError('Product is no longer available.'); + if (Tools::getValue('adtoken') == Tools::getAdminToken('AdminProducts'.(int)Tab::getIdFromClassName('AdminProducts').(int)Tools::getValue('id_employee'))) + { + // If the product is not active, it's the admin preview mode + $this->context->smarty->assign('adminActionDisplay', true); + } + else + { + $this->context->smarty->assign('adminActionDisplay', false); + if ($this->product->id_product_redirected == $this->product->id) + $this->product->redirect_type = '404'; + + switch ($this->product->redirect_type) + { + case '301': + header('HTTP/1.1 301 Moved Permanently'); + header('Location: '.$this->context->link->getProductLink($this->product->id_product_redirected)); + break; + case '302': + header('HTTP/1.1 302 Moved Temporarily'); + header('Cache-Control: no-cache'); + header('Location: '.$this->context->link->getProductLink($this->product->id_product_redirected)); + break; + case '404': + header('HTTP/1.1 404 Not Found'); + header('Status: 404 Not Found'); + $this->errors[] = Tools::displayError('Product is no longer available.'); + break; + } + } } else if (!$this->product->checkAccess(isset($this->context->customer) ? $this->context->customer->id : 0)) + { + header('HTTP/1.1 403 Forbidden'); + header('Status: 403 Forbidden'); $this->errors[] = Tools::displayError('You do not have access to this product.'); - + } + // Load category if (isset($_SERVER['HTTP_REFERER']) && !strstr($_SERVER['HTTP_REFERER'], Tools::getHttpHost()) // Assure us the previous page was one of the shop @@ -150,10 +179,6 @@ class ProductControllerCore extends FrontController // Assign to the template the id of the virtual product. "0" if the product is not downloadable. $this->context->smarty->assign('virtual', ProductDownload::getIdFromIdProduct((int)$this->product->id)); - // If the product is not active, it's the admin preview mode - if (!$this->product->active) - $this->context->smarty->assign('adminActionDisplay', true); - // Product pictures management require_once('images.inc.php'); $this->context->smarty->assign('customizationFormTarget', Tools::safeOutput(urldecode($_SERVER['REQUEST_URI']))); diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql index d07b63842..bf5cbc15c 100644 --- a/install-dev/data/db_structure.sql +++ b/install-dev/data/db_structure.sql @@ -1376,6 +1376,8 @@ CREATE TABLE `PREFIX_product` ( `uploadable_files` tinyint(4) NOT NULL default '0', `text_fields` tinyint(4) NOT NULL default '0', `active` tinyint(1) unsigned NOT NULL default '0', + `redirect_type` ENUM('', '404', '301', '302') NOT NULL DEFAULT '', + `id_product_redirected` int(10) unsigned NOT NULL default '0', `available_for_order` tinyint(1) NOT NULL default '1', `available_date` date NOT NULL, `condition` ENUM('new', 'used', 'refurbished') NOT NULL DEFAULT 'new', @@ -1415,6 +1417,8 @@ CREATE TABLE IF NOT EXISTS `PREFIX_product_shop` ( `uploadable_files` tinyint(4) NOT NULL default '0', `text_fields` tinyint(4) NOT NULL DEFAULT '0', `active` tinyint(1) unsigned NOT NULL DEFAULT '0', + `redirect_type` ENUM('', '404', '301', '302') NOT NULL DEFAULT '', + `id_product_redirected` int(10) unsigned NOT NULL default '0', `available_for_order` tinyint(1) NOT NULL DEFAULT '1', `available_date` date NOT NULL, `condition` enum('new','used','refurbished') NOT NULL DEFAULT 'new', diff --git a/install-dev/fixtures/apple/data/product.xml b/install-dev/fixtures/apple/data/product.xml index 227202823..e04599d94 100644 --- a/install-dev/fixtures/apple/data/product.xml +++ b/install-dev/fixtures/apple/data/product.xml @@ -29,6 +29,8 @@ + + @@ -41,31 +43,31 @@ - + - + - + - + - + - + - + diff --git a/install-dev/upgrade/sql/1.5.2.1.sql b/install-dev/upgrade/sql/1.5.2.1.sql index 7725a0b4a..8dea65958 100644 --- a/install-dev/upgrade/sql/1.5.2.1.sql +++ b/install-dev/upgrade/sql/1.5.2.1.sql @@ -6,4 +6,8 @@ ALTER TABLE `PREFIX_address` CHANGE `outstanding_allow_amount` `outstanding_all /* PHP:block_category_1521(); */; -UPDATE `PREFIX_order_state` SET `delivery` = 0 WHERE `id_order_state` = 3 ; \ No newline at end of file +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` , ADD `available_for_order` tinyint(1) NOT NULL default '1' AFTER `id_product_redirected`; + +ALTER TABLE `PREFIX_product` ADD `id_product_redirected` int(10) unsigned NOT NULL default '0' AFTER `active` , ADD `available_for_order` tinyint(1) NOT NULL default '1' AFTER `id_product_redirected`; \ No newline at end of file diff --git a/js/admin-products.js b/js/admin-products.js index 5701cc586..5b9789f35 100644 --- a/js/admin-products.js +++ b/js/admin-products.js @@ -763,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); @@ -776,6 +775,34 @@ product_tabs['Informations'] = new function(){ $('#show_price').attr('disabled', false); } }); + + if ($('#active_on').prop('checked')) + showRedirectProductOptions(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 (){ diff --git a/js/admin.js b/js/admin.js index e6f85de01..34f6186e2 100644 --- a/js/admin.js +++ b/js/admin.js @@ -571,6 +571,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/translations/br/admin.php b/translations/br/admin.php new file mode 100644 index 000000000..3e9562c2b --- /dev/null +++ b/translations/br/admin.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/translations/br/errors.php b/translations/br/errors.php new file mode 100644 index 000000000..604f75d22 --- /dev/null +++ b/translations/br/errors.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/translations/br/fields.php b/translations/br/fields.php new file mode 100644 index 000000000..03674f89c --- /dev/null +++ b/translations/br/fields.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/translations/br/pdf.php b/translations/br/pdf.php new file mode 100644 index 000000000..9d9d1dac0 --- /dev/null +++ b/translations/br/pdf.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/translations/br/tabs.php b/translations/br/tabs.php new file mode 100644 index 000000000..83db297a2 --- /dev/null +++ b/translations/br/tabs.php @@ -0,0 +1,4 @@ + \ No newline at end of file From 51d8ef576b25cd4691db8767b7d0de2d53d4815a Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Mon, 3 Dec 2012 14:47:38 +0100 Subject: [PATCH 170/316] //small fix with js on product page --- themes/default/js/product.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/themes/default/js/product.js b/themes/default/js/product.js index fd738d6da..8f787e60b 100644 --- a/themes/default/js/product.js +++ b/themes/default/js/product.js @@ -147,7 +147,7 @@ function findCombination(firstTime) //update display of the availability of the product AND the prices of the product function updateDisplay() { - if (!selectedCombination['unavailable'] && quantityAvailable > 0 && productAvailableForOrder === 1) + if (!selectedCombination['unavailable'] && quantityAvailable > 0 && parseInt(productAvailableForOrder) === 1) { //show the choice of quantities $('#quantity_wanted_p:hidden').show('slow'); @@ -165,6 +165,7 @@ function updateDisplay() //availability value management if (availableNowValue !== '') { + //update the availability statut of the product $('#availability_value').removeClass('warning_inline'); $('#availability_value').text(availableNowValue); @@ -689,7 +690,7 @@ function initLocationChange(time) function checkUrl() { - if (original_url !== window.location || first_url_check) + if (original_url != window.url || first_url_check) { first_url_check = false; url = window.location+''; From 769f5e7a64c7a629524f925267e8b8136bf66a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 3 Dec 2012 15:03:32 +0100 Subject: [PATCH 171/316] [-] BO: Fix #PSCFV-5345 quotes in translations of languages packs imported --- controllers/admin/AdminTranslationsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 98cd2748a..86508e22f 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -570,7 +570,7 @@ class AdminTranslationsControllerCore extends AdminController if (isset($tab->class_name) && !empty($tab->class_name)) { $id_lang = Language::getIdByIso($iso_code); - $tab->name[(int)$id_lang] = pSQL($translations); + $tab->name[(int)$id_lang] = $translations; // Update this tab $tab->update(); From c769a2599c9e1662dce6492d11042c35175e9b39 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Mon, 3 Dec 2012 15:23:25 +0100 Subject: [PATCH 172/316] [-] BO : fixed bug when toggle status on product listing, redirect_type was not good --- classes/Product.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/classes/Product.php b/classes/Product.php index 127212156..88d789415 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -658,7 +658,26 @@ class ProductCore extends ObjectModel return parent::validateFieldsLang($die, $error_return); } - + + public function toggleStatus() + { + //test if the product is active and if redirect_type is empty string and set default value to id_product_redirected & redirect_type + // /!\ after parent::toggleStatus() active will be false, that why we set 404 by default :p + if ($this->active) + { + //case where active will be false after parent::toggleStatus() + $this->id_product_redirected = 0; + $this->redirect_type = '404'; + } + else + { + //case where active will be true after parent::toggleStatus() + $this->id_product_redirected = 0; + $this->redirect_type = ''; + } + return parent::toggleStatus(); + } + public function delete() { /* From b1706d47eb7f0589eb662ce220c549e4399a42c2 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Mon, 3 Dec 2012 15:55:46 +0100 Subject: [PATCH 173/316] //small js fix --- js/admin-products.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/admin-products.js b/js/admin-products.js index 5b9789f35..01af4d0a5 100644 --- a/js/admin-products.js +++ b/js/admin-products.js @@ -777,7 +777,10 @@ product_tabs['Informations'] = new function(){ }); if ($('#active_on').prop('checked')) + { showRedirectProductOptions(false); + showRedirectProductSelectOptions(false); + } else showRedirectProductOptions(true); From a88b23b16fb4e09c2a844931631d8250b7ce1e7f Mon Sep 17 00:00:00 2001 From: Jonathan Danse Date: Mon, 3 Dec 2012 16:11:43 +0100 Subject: [PATCH 174/316] [+] Project: add the possibility to change the default color (#db3484) Let the user set the default color in the mail with a color picker (configuration set in Back Office, Themes) --- .../template/helpers/options/options.tpl | 9 ++++++ classes/Mail.php | 1 + classes/helper/HelperOptions.php | 3 ++ controllers/admin/AdminThemesController.php | 8 +++++ install-dev/data/xml/configuration.xml | 3 ++ mails/de/account.html | 8 ++--- mails/de/backoffice_order.html | 26 +++++++-------- mails/de/bankwire.html | 10 +++--- mails/de/cheque.html | 10 +++--- mails/de/contact.html | 4 +-- mails/de/contact_form.html | 6 ++-- mails/de/credit_slip.html | 8 ++--- mails/de/download_product.html | 10 +++--- mails/de/employee_password.html | 6 ++-- mails/de/guest_to_customer.html | 6 ++-- mails/de/in_transit.html | 10 +++--- mails/de/log_alert.html | 4 +-- mails/de/newsletter.html | 4 +-- mails/de/order_canceled.html | 10 +++--- mails/de/order_changed.html | 10 +++--- mails/de/order_conf.html | 14 ++++---- mails/de/order_customer_comment.html | 4 +-- mails/de/order_merchant_comment.html | 6 ++-- mails/de/order_return_state.html | 8 ++--- mails/de/outofstock.html | 10 +++--- mails/de/password.html | 6 ++-- mails/de/password_query.html | 4 +-- mails/de/payment.html | 8 ++--- mails/de/payment_error.html | 10 +++--- mails/de/preparation.html | 10 +++--- mails/de/refund.html | 10 +++--- mails/de/shipped.html | 10 +++--- mails/de/voucher.html | 6 ++-- mails/de/voucher_new.html | 22 ++++++------- mails/en/account.html | 8 ++--- mails/en/backoffice_order.html | 8 ++--- mails/en/bankwire.html | 10 +++--- mails/en/cheque.html | 10 +++--- mails/en/contact.html | 4 +-- mails/en/contact_form.html | 4 +-- mails/en/credit_slip.html | 8 ++--- mails/en/download_product.html | 10 +++--- mails/en/employee_password.html | 6 ++-- mails/en/forward_msg.html | 4 +-- mails/en/guest_to_customer.html | 6 ++-- mails/en/in_transit.html | 10 +++--- mails/en/log_alert.html | 4 +-- mails/en/newsletter.html | 4 +-- mails/en/order_canceled.html | 10 +++--- mails/en/order_changed.html | 10 +++--- mails/en/order_conf.html | 14 ++++---- mails/en/order_customer_comment.html | 4 +-- mails/en/order_merchant_comment.html | 6 ++-- mails/en/order_return_state.html | 8 ++--- mails/en/outofstock.html | 10 +++--- mails/en/password.html | 6 ++-- mails/en/password_query.html | 6 ++-- mails/en/payment.html | 10 +++--- mails/en/payment_error.html | 10 +++--- mails/en/preparation.html | 10 +++--- mails/en/refund.html | 10 +++--- mails/en/shipped.html | 10 +++--- mails/en/test.html | 2 +- mails/en/voucher.html | 6 ++-- mails/en/voucher_new.html | 4 +-- mails/es/account.html | 26 +++++++-------- mails/es/backoffice_order.html | 26 +++++++-------- mails/es/bankwire.html | 10 +++--- mails/es/cheque.html | 10 +++--- mails/es/contact.html | 22 ++++++------- mails/es/contact_form.html | 24 +++++++------- mails/es/credit_slip.html | 8 ++--- mails/es/download_product.html | 10 +++--- mails/es/guest_to_customer.html | 24 +++++++------- mails/es/in_transit.html | 10 +++--- mails/es/log_alert.html | 22 ++++++------- mails/es/newsletter.html | 22 ++++++------- mails/es/order_canceled.html | 10 +++--- mails/es/order_changed.html | 10 +++--- mails/es/order_conf.html | 14 ++++---- mails/es/order_customer_comment.html | 4 +-- mails/es/order_merchant_comment.html | 24 +++++++------- mails/es/order_return_state.html | 8 ++--- mails/es/outofstock.html | 10 +++--- mails/es/password.html | 24 +++++++------- mails/es/password_query.html | 22 ++++++------- mails/es/payment.html | 10 +++--- mails/es/payment_error.html | 10 +++--- mails/es/preparation.html | 10 +++--- mails/es/refund.html | 10 +++--- mails/es/shipped.html | 10 +++--- mails/es/voucher.html | 24 +++++++------- mails/es/voucher_new.html | 22 ++++++------- mails/fr/account.html | 26 +++++++-------- mails/fr/backoffice_order.html | 26 +++++++-------- mails/fr/bankwire.html | 10 +++--- mails/fr/cheque.html | 10 +++--- mails/fr/contact.html | 22 ++++++------- mails/fr/contact_form.html | 6 ++-- mails/fr/credit_slip.html | 8 ++--- mails/fr/download_product.html | 10 +++--- mails/fr/employee_password.html | 24 +++++++------- mails/fr/guest_to_customer.html | 24 +++++++------- mails/fr/in_transit.html | 28 ++++++++-------- mails/fr/log_alert.html | 22 ++++++------- mails/fr/newsletter.html | 22 ++++++------- mails/fr/order_canceled.html | 28 ++++++++-------- mails/fr/order_changed.html | 28 ++++++++-------- mails/fr/order_conf.html | 32 +++++++++---------- mails/fr/order_customer_comment.html | 22 ++++++------- mails/fr/order_merchant_comment.html | 24 +++++++------- mails/fr/order_return_state.html | 20 ++++++------ mails/fr/outofstock.html | 28 ++++++++-------- mails/fr/password.html | 24 +++++++------- mails/fr/password_query.html | 22 ++++++------- mails/fr/payment.html | 28 ++++++++-------- mails/fr/payment_error.html | 28 ++++++++-------- mails/fr/preparation.html | 28 ++++++++-------- mails/fr/refund.html | 28 ++++++++-------- mails/fr/shipped.html | 28 ++++++++-------- mails/fr/voucher.html | 24 +++++++------- mails/fr/voucher_new.html | 22 ++++++------- mails/it/account.html | 26 +++++++-------- mails/it/backoffice_order.html | 26 +++++++-------- mails/it/bankwire.html | 10 +++--- mails/it/cheque.html | 10 +++--- mails/it/contact.html | 22 ++++++------- mails/it/contact_form.html | 24 +++++++------- mails/it/credit_slip.html | 8 ++--- mails/it/download_product.html | 10 +++--- mails/it/employee_password.html | 24 +++++++------- mails/it/guest_to_customer.html | 24 +++++++------- mails/it/in_transit.html | 10 +++--- mails/it/log_alert.html | 22 ++++++------- mails/it/newsletter.html | 22 ++++++------- mails/it/order_canceled.html | 10 +++--- mails/it/order_changed.html | 10 +++--- mails/it/order_conf.html | 14 ++++---- mails/it/order_customer_comment.html | 22 ++++++------- mails/it/order_merchant_comment.html | 24 +++++++------- mails/it/order_return_state.html | 8 ++--- mails/it/outofstock.html | 10 +++--- mails/it/password.html | 24 +++++++------- mails/it/password_query.html | 22 ++++++------- mails/it/payment.html | 8 ++--- mails/it/payment_error.html | 10 +++--- mails/it/preparation.html | 10 +++--- mails/it/refund.html | 10 +++--- mails/it/shipped.html | 10 +++--- mails/it/voucher.html | 24 +++++++------- mails/it/voucher_new.html | 22 ++++++------- 151 files changed, 1052 insertions(+), 1028 deletions(-) diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl index dc270ac08..efbc3e0d4 100644 --- a/admin-dev/themes/default/template/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/helpers/options/options.tpl @@ -123,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/classes/Mail.php b/classes/Mail.php index 5296db846..6d3ec96e1 100644 --- a/classes/Mail.php +++ b/classes/Mail.php @@ -236,6 +236,7 @@ class MailCore $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')); diff --git a/classes/helper/HelperOptions.php b/classes/helper/HelperOptions.php index a8900c36c..48bb8183b 100644 --- a/classes/helper/HelperOptions.php +++ b/classes/helper/HelperOptions.php @@ -90,6 +90,9 @@ class HelperOptionsCore extends Helper $field['required'] = isset($field['required']) ? $field['required'] : $this->required; + if ($field['type'] == 'color') + $this->context->controller->addJS(_PS_JS_DIR_.'jquery/plugins/jquery.colorpicker.js'); + // Cast options values if specified if ($field['type'] == 'select' && isset($field['cast'])) foreach ($field['list'] as $option_key => $option) diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 029f43503..5b6695913 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -176,6 +176,14 @@ class AdminThemesControllerCore extends AdminController 2 => $this->l('I want to enable it only on touchpads'), 3 => $this->l('I want to enable it on mobile and touchpad devices') ) + ), + 'PS_MAIL_COLOR' => array( + 'title' => $this->l('Mail color'), + 'desc' => $this->l('Mail will be highlighted in this color. HTML colors only (e.g.').' "lightblue", "#CC6600")', + 'type' => 'color', + 'name' => 'PS_MAIL_COLOR', + 'size' => 30, + 'value' => Configuration::get('PS_MAIL_COLOR') ) ), 'submit' => array('title' => $this->l('Save'), 'class' => 'button') diff --git a/install-dev/data/xml/configuration.xml b/install-dev/data/xml/configuration.xml index eb37f9b3a..eed4af504 100644 --- a/install-dev/data/xml/configuration.xml +++ b/install-dev/data/xml/configuration.xml @@ -748,6 +748,9 @@ Country 25 + + #db3484 + nK4KJP7jOsnzWMpo 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 @@   -Hallo {firstname} {lastname}, +Hallo {firstname} {lastname},   -Ihre Konto-Login-Details +Ihre Konto-Login-Details   -E-Mail-Adresse: {email}
Kennwort: {passwd} +E-Mail-Adresse: {email}
Kennwort: {passwd}   @@ -44,7 +44,7 @@   -{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.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/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/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 b633150ed..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}   @@ -83,7 +83,7 @@   -Shipping +Shipping   @@ -111,16 +111,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_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..3d91e9e72 100644 --- a/mails/es/credit_slip.html +++ b/mails/es/credit_slip.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, +Hola {firstname} {lastname},   -Histórico del Pedido #{id_order} +Histórico del Pedido #{id_order}   @@ -32,13 +32,13 @@   -Puedes revisar este pedido y descargar la factura desde la sección "Seguimiento de Pedido" de tu cuenta "Mi Cuenta" en nuestra web. +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™ +{shop_name} desarrollado por PrestaShop™ diff --git a/mails/es/download_product.html b/mails/es/download_product.html index 40eba5b90..47f04e092 100644 --- a/mails/es/download_product.html +++ b/mails/es/download_product.html @@ -14,13 +14,13 @@   -Hola {firstname} {lastname}, gracias por comprar en {shop_name}. +Hola {firstname} {lastname}, gracias por comprar en {shop_name}.   -Producto(s) para descargar +Producto(s) para descargar   @@ -38,16 +38,16 @@   -Puedes revisar este pedido y descargar su factura desde la sección "Seguimiento de Pedido" de tu cuenta "Mi Cuenta" en nuestra web. +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. +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/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/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..dfd58d8e9 100644 --- a/mails/es/order_changed.html +++ b/mails/es/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/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..c84ababb9 100644 --- a/mails/es/order_merchant_comment.html +++ b/mails/es/order_merchant_comment.html @@ -1,10 +1,10 @@ - - - - - Mensaje de {shop_name} - - + + + + + Mensaje de {shop_name} + + @@ -14,13 +14,13 @@ - + - + @@ -32,9 +32,9 @@ - + -
 
Hola {firstname} {lastname},Hola {firstname} {lastname},
 
Mensaje de {shop_name}Mensaje 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_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.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/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..682f9987b 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} + + @@ -38,9 +38,9 @@ - + -
 
{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/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.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/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 From a3c28f3ace50a736c95ceb8f91131a4a9e1c7c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 3 Dec 2012 16:12:08 +0100 Subject: [PATCH 175/316] [-] Core: Fix date validator #PSCFV-5797 --- classes/Validate.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Validate.php b/classes/Validate.php index 2aa05df0c..942a0574a 100644 --- a/classes/Validate.php +++ b/classes/Validate.php @@ -487,9 +487,9 @@ class ValidateCore { if (empty($date) || $date == '0000-00-00') return true; - if (preg_match('/^([0-9]{4})-((0?[1-9])|(1[0-2]))-((0?[1-9])|([1-2][0-9])|(3[01]))( [0-9]{2}:[0-9]{2}:[0-9]{2})?$/', $date, $birth_date)) + if (preg_match('/^([0-9]{4})-((?:0?[1-9])|(?:1[0-2]))-((?:0?[1-9])|(?:[1-2][0-9])|(?:3[01]))([0-9]{2}:[0-9]{2}:[0-9]{2})?$/', $date, $birth_date)) { - if ($birth_date[1] > date('Y') || $birth_date[2] > date('m') || $birth_date[3] > date('d')) + if ($birth_date[1] > date('Y') && $birth_date[2] > date('m') && $birth_date[3] > date('d')) return false; return true; } From f8365220e2686ba7a30fa5e0ebe4ed5f431a101c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 3 Dec 2012 16:52:22 +0100 Subject: [PATCH 176/316] [-] Core: Fix isDate validator --- classes/Validate.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Validate.php b/classes/Validate.php index 942a0574a..a3e564f1b 100644 --- a/classes/Validate.php +++ b/classes/Validate.php @@ -472,9 +472,9 @@ class ValidateCore */ public static function isDate($date) { - if (!preg_match('/^([0-9]{4})-((0?[0-9])|(1[0-2]))-((0?[0-9])|([1-2][0-9])|(3[01]))( [0-9]{2}:[0-9]{2}:[0-9]{2})?$/', $date, $matches)) + if (!preg_match('/^([0-9]{4})-((?:0?[0-9])|(?:1[0-2]))-((?:0?[0-9])|(?:[1-2][0-9])|(?:3[01]))( [0-9]{2}:[0-9]{2}:[0-9]{2})?$/', $date, $matches)) return false; - return checkdate((int)$matches[2], (int)$matches[5], (int)$matches[0]); + return checkdate((int)$matches[2], (int)$matches[3], (int)$matches[1]); } /** From 627125e1de3cc0ebcb7b3435a08de2b617eebc81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 3 Dec 2012 17:53:47 +0100 Subject: [PATCH 177/316] [-] BO: Fix #PSCFV-5706 save of product availability on global context --- .../template/controllers/products/quantities.tpl | 15 +++++++++++---- js/admin-products.js | 11 +++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/products/quantities.tpl b/admin-dev/themes/default/template/controllers/products/quantities.tpl index 1fce35216..852c15a66 100644 --- a/admin-dev/themes/default/template/controllers/products/quantities.tpl +++ b/admin-dev/themes/default/template/controllers/products/quantities.tpl @@ -26,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.'}

@@ -206,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 @@ -216,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/js/admin-products.js b/js/admin-products.js index 01af4d0a5..997e8c776 100644 --- a/js/admin-products.js +++ b/js/admin-products.js @@ -1226,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(); }; @@ -1574,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() { From 1091d825466b2edb1d2a476f6103a1738e095bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 3 Dec 2012 19:11:37 +0100 Subject: [PATCH 178/316] // Fix PHP warning --- controllers/admin/AdminEmailsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php index 8fcbbaddf..20b5affd3 100644 --- a/controllers/admin/AdminEmailsController.php +++ b/controllers/admin/AdminEmailsController.php @@ -202,7 +202,7 @@ class AdminEmailsControllerCore extends AdminController if (isset($_POST['PS_SHOP_EMAIL'])) $_POST['PS_SHOP_EMAIL'] = Configuration::get('PS_SHOP_EMAIL'); - if ($_POST['PS_MAIL_METHOD'] == 2 && (empty($_POST['PS_MAIL_SERVER']) || empty($_POST['PS_MAIL_SMTP_PORT']))) + if (isset($_POST['PS_MAIL_METHOD']) && $_POST['PS_MAIL_METHOD'] == 2 && (empty($_POST['PS_MAIL_SERVER']) || empty($_POST['PS_MAIL_SMTP_PORT']))) $this->errors[] = Tools::displayError('You must define an SMTP server and an SMTP port. If you do not know, use the PHP mail() function instead.'); } From 8baa2b34b88ed5e3150806b144efbabe0e78cabb Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Tue, 4 Dec 2012 11:07:56 +0100 Subject: [PATCH 179/316] //small html fix --- themes/default/mobile/product.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/mobile/product.tpl b/themes/default/mobile/product.tpl index 47fd5f021..ec1536694 100644 --- a/themes/default/mobile/product.tpl +++ b/themes/default/mobile/product.tpl @@ -72,7 +72,7 @@
reference}style="display: none;"{/if}>
- + {$product->reference|escape:'htmlall':'UTF-8'}
From 6e87020ddff5f2b264783102a5e73c92623d8ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 4 Dec 2012 11:13:06 +0100 Subject: [PATCH 180/316] [-] BO: Add display of modules errors on reset #PSCFV-2077 --- controllers/admin/AdminModulesController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 400c5176c..354d01a04 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -462,6 +462,7 @@ class AdminModulesControllerCore extends AdminController } else $this->errors[] = Tools::displayError('Cannot load module object'); + $this->errors = array_merge($this->errors, $module->getErrors()); } else $this->errors[] = Tools::displayError('You do not have permission to add here.'); @@ -688,6 +689,7 @@ class AdminModulesControllerCore extends AdminController } elseif ($echo === false) $module_errors[] = array('name' => $name, 'message' => $module->getErrors()); + if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL && isset(Context::getContext()->tmpOldShop)) { Context::getContext()->shop = clone(Context::getContext()->tmpOldShop); From 69fbd79eee4c7894a40f9dd619d21ba89ee6d708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 4 Dec 2012 11:38:47 +0100 Subject: [PATCH 181/316] [-] BO: Fix #PSCFV-4889 don't delete product if physical stock > 0 --- controllers/admin/AdminProductsController.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 651987711..f826f226d 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -536,13 +536,17 @@ class AdminProductsControllerCore extends AdminController $this->errors[] = Tools::displayError('You cannot delete the product because there is physical stock left or supply orders in progress.'); } - if ($object->delete()) + if (!count($this->errors)) { - $id_category = (int)Tools::getValue('id_category'); - $category_url = empty($id_category) ? '' : '&id_category='.(int)$id_category; - $this->redirect_after = self::$currentIndex.'&conf=1&token='.$this->token.$category_url; + if ($object->delete()) + { + $id_category = (int)Tools::getValue('id_category'); + $category_url = empty($id_category) ? '' : '&id_category='.(int)$id_category; + $this->redirect_after = self::$currentIndex.'&conf=1&token='.$this->token.$category_url; + } + else + $this->errors[] = Tools::displayError('An error occurred during deletion.'); } - $this->errors[] = Tools::displayError('An error occurred during deletion.'); } } else @@ -632,10 +636,8 @@ class AdminProductsControllerCore extends AdminController $real_quantity = $stock_manager->getProductRealQuantities($product->id, 0); if ($physical_quantity > 0 || $real_quantity > $physical_quantity) $this->errors[] = sprintf(Tools::displayError('You cannot delete the product #%d because there is physical stock left or supply orders in progress.'), $product->id); - else - $success &= $product->delete(); } - else + if (!count($this->errors)) $success &= $product->delete(); } } From aac0500c7248ab4efb5f1d41a7bc7a0cc0bb76f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 4 Dec 2012 11:52:04 +0100 Subject: [PATCH 182/316] [-] WS: Fix #PSCFV-5981 logo path --- classes/webservice/WebserviceSpecificManagementImages.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/webservice/WebserviceSpecificManagementImages.php b/classes/webservice/WebserviceSpecificManagementImages.php index 7901617bc..ce4518046 100755 --- a/classes/webservice/WebserviceSpecificManagementImages.php +++ b/classes/webservice/WebserviceSpecificManagementImages.php @@ -323,7 +323,7 @@ class WebserviceSpecificManagementImagesCore implements WebserviceSpecificManage // Set the image path on display in relation to the header image case 'header': if (in_array($this->wsObject->method, array('GET','HEAD','PUT'))) - $path = _PS_IMG_DIR_.'logo.jpg'; + $path = _PS_IMG_DIR_.Configuration::get('PS_LOGO'); else throw new WebserviceException('This method is not allowed with general image resources.', array(49, 405)); break; From e70069bdfad5143fcd38d75a9c47e730c46e2fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 4 Dec 2012 11:56:17 +0100 Subject: [PATCH 183/316] [-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists --- classes/webservice/WebserviceSpecificManagementImages.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/webservice/WebserviceSpecificManagementImages.php b/classes/webservice/WebserviceSpecificManagementImages.php index ce4518046..96a9bc63d 100755 --- a/classes/webservice/WebserviceSpecificManagementImages.php +++ b/classes/webservice/WebserviceSpecificManagementImages.php @@ -387,7 +387,7 @@ class WebserviceSpecificManagementImagesCore implements WebserviceSpecificManage { case 'GET': case 'HEAD': - $this->imgToDisplay = ($path != '' && file_exists($path)) ? $path : $alternative_path; + $this->imgToDisplay = ($path != '' && file_exists($path) && is_file($path)) ? $path : $alternative_path; return true; break; case 'PUT': From a4b6594f9c929554179070870089a43f95d878bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 4 Dec 2012 14:33:12 +0100 Subject: [PATCH 184/316] // Fix PHP notice #PSCFV-5967 --- controllers/admin/AdminHomeController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index dee062dfb..dc38db107 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -95,7 +95,6 @@ class AdminHomeControllerCore extends AdminController $opti_list = array(); if ($rewrite + $htaccessOptimized + $smartyOptimized + $cccOptimized + $shopEnabled + $htaccessAfterUpdate + $indexRebuiltAfterUpdate != 14) { - $this->context->smarty->assign('hide_tips', Configuration::get('PS_HIDE_OPTIMIZATION_TIPS')); $opti_list[] = array( 'title' => $this->l('URL rewriting'), 'href' => $link->getAdminLink('AdminMeta'), @@ -145,8 +144,12 @@ class AdminHomeControllerCore extends AdminController 'image' => $lights[$htaccessAfterUpdate]['image'], ); } - $this->context->smarty->assign('opti_list', $opti_list); - $this->context->smarty->assign('content', $content); + $this->context->smarty->assign(array( + 'opti_list' => $opti_list, + 'content' => $content, + 'hide_tips' => Configuration::get('PS_HIDE_OPTIMIZATION_TIPS')) + ); + $template = $this->createTemplate('optimizationTips.tpl'); return $template->fetch(); } From b414bd06a4c08493b2273453116a757bf81488a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 4 Dec 2012 15:09:41 +0100 Subject: [PATCH 185/316] [-] Core: Fix #PSCFV-5966 the tax rate applied to shipping cost for the visitors was the product tax rate --- classes/Address.php | 14 ++++++++------ classes/Cart.php | 8 +++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/classes/Address.php b/classes/Address.php index bd2daea0e..616b44dac 100644 --- a/classes/Address.php +++ b/classes/Address.php @@ -337,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) { @@ -351,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/Cart.php b/classes/Cart.php index 11641a80f..c821ffe58 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -1509,9 +1509,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); @@ -2600,7 +2599,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', From 52803b40b99ee388686eadef46f5e19b70eff804 Mon Sep 17 00:00:00 2001 From: sLorenzini Date: Tue, 4 Dec 2012 15:27:43 +0100 Subject: [PATCH 186/316] // fixed FO bugs --- themes/default/best-sales.tpl | 26 +++++++++++++++++++------- themes/default/new-products.tpl | 24 ++++++++++++++++++------ themes/default/prices-drop.tpl | 24 ++++++++++++++++++------ 3 files changed, 55 insertions(+), 19 deletions(-) diff --git a/themes/default/best-sales.tpl b/themes/default/best-sales.tpl index c732ad25e..08895bb52 100644 --- a/themes/default/best-sales.tpl +++ b/themes/default/best-sales.tpl @@ -29,13 +29,25 @@

{l s='Top sellers'}

{if $products} -
- {include file="$tpl_dir./product-sort.tpl"} +
+ {include file="$tpl_dir./pagination.tpl"} + +
+ {include file="./product-sort.tpl"} + {include file="./product-compare.tpl"} + {include file="./nbr-product-page.tpl"} +
- {include file="./product-compare.tpl"} - {include file="$tpl_dir./product-list.tpl" products=$products} - {include file="$tpl_dir./pagination.tpl"} - {include file="./product-compare.tpl"} -{else} + + {include file="./product-list.tpl" products=$products} + +
+
+ {include file="./product-sort.tpl"} {include file="./product-compare.tpl"} {include file="./nbr-product-page.tpl"} + +
+ {include file="./pagination.tpl"} +
+ {else}

{l s='No top sellers.'}

{/if} diff --git a/themes/default/new-products.tpl b/themes/default/new-products.tpl index 0802317f4..ed98eba7a 100644 --- a/themes/default/new-products.tpl +++ b/themes/default/new-products.tpl @@ -29,13 +29,25 @@

{l s='New products'}

{if $products} -
- {include file="./product-sort.tpl"} +
+ {include file="$tpl_dir./pagination.tpl"} + +
+ {include file="./product-sort.tpl"} + {include file="./product-compare.tpl"} + {include file="./nbr-product-page.tpl"} +
- {include file="./product-compare.tpl"} + {include file="./product-list.tpl" products=$products} - {include file="./pagination.tpl"} - {include file="./product-compare.tpl"} -{else} + +
+
+ {include file="./product-sort.tpl"} {include file="./product-compare.tpl"} {include file="./nbr-product-page.tpl"} + +
+ {include file="./pagination.tpl"} +
+ {else}

{l s='No new products.'}

{/if} diff --git a/themes/default/prices-drop.tpl b/themes/default/prices-drop.tpl index 1fe7359b1..f730dac34 100644 --- a/themes/default/prices-drop.tpl +++ b/themes/default/prices-drop.tpl @@ -29,13 +29,25 @@

{l s='Price drop'}

{if $products} -
- {include file="./product-sort.tpl"} +
+ {include file="$tpl_dir./pagination.tpl"} + +
+ {include file="./product-sort.tpl"} + {include file="./product-compare.tpl"} + {include file="./nbr-product-page.tpl"} +
- {include file="./product-compare.tpl"} + {include file="./product-list.tpl" products=$products} - {include file="./pagination.tpl"} - {include file="./product-compare.tpl"} -{else} + +
+
+ {include file="./product-sort.tpl"} {include file="./product-compare.tpl"} {include file="./nbr-product-page.tpl"} + +
+ {include file="./pagination.tpl"} +
+ {else}

{l s='No price drop.'}

{/if} From a1e91bcfa94652376d4c16770c6cfa243d74fd14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 4 Dec 2012 15:32:06 +0100 Subject: [PATCH 187/316] [-] Core: Fix #PSCFV-5948 id_warehouse was sometime set to null on validateorder with stock management disabled --- classes/PaymentModule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 95cefa218..86b505d69 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -186,7 +186,7 @@ abstract class PaymentModuleCore extends Module foreach ($data['package_list'] as $id_package) { // Rewrite the id_warehouse - $package_list[$id_address][$id_package]['id_warehouse'] = $this->context->cart->getPackageIdWarehouse($package_list[$id_address][$id_package], (int)$id_carrier); + $package_list[$id_address][$id_package]['id_warehouse'] = (int)$this->context->cart->getPackageIdWarehouse($package_list[$id_address][$id_package], (int)$id_carrier); $package_list[$id_address][$id_package]['id_carrier'] = $id_carrier; } // Make sure CarRule caches are empty From 4e9c534f1b712b903d57990b64be6e26f449a5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 4 Dec 2012 15:40:17 +0100 Subject: [PATCH 188/316] [-] Core: Locales should be setted anywhere #PSCFV-5953 --- classes/controller/FrontController.php | 14 ++++---------- config/config.inc.php | 11 +++++++++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index bd1d3feab..d866f0654 100755 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -252,12 +252,6 @@ class FrontControllerCore extends Controller CartRule::autoAddToCart($this->context); } - $locale = strtolower(Configuration::get('PS_LOCALE_LANGUAGE')).'_'.strtoupper(Configuration::get('PS_LOCALE_COUNTRY').'.UTF-8'); - setlocale(LC_COLLATE, $locale); - setlocale(LC_CTYPE, $locale); - setlocale(LC_TIME, $locale); - setlocale(LC_NUMERIC, 'en_US.UTF-8'); - /* get page name to display it in body id */ // Are we in a payment module @@ -1144,12 +1138,12 @@ class FrontControllerCore extends Controller * @return array */ public function initLogoAndFavicon() - { - return array( - 'favicon_url' => _PS_IMG_.Configuration::get('PS_FAVICON'), + { + return array( + 'favicon_url' => _PS_IMG_.Configuration::get('PS_FAVICON'), 'logo_image_width' => ($this->context->getMobileDevice() == false ? Configuration::get('SHOP_LOGO_WIDTH') : Configuration::get('SHOP_LOGO_MOBILE_WIDTH')), 'logo_image_height' => ($this->context->getMobileDevice() == false ? Configuration::get('SHOP_LOGO_HEIGHT') : Configuration::get('SHOP_LOGO_MOBILE_HEIGHT')), 'logo_url' => ($this->context->getMobileDevice() == false ? _PS_IMG_.Configuration::get('PS_LOGO').'?'.Configuration::get('PS_IMG_UPDATE_TIME') : _PS_IMG_.Configuration::get('PS_LOGO_MOBILE').'?'.Configuration::get('PS_IMG_UPDATE_TIME')) ); - } + } } diff --git a/config/config.inc.php b/config/config.inc.php index 568a8f90a..fb9e98a74 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -107,6 +107,13 @@ Context::getContext()->country = $defaultCountry; /* It is not safe to rely on the system's timezone settings, and this would generate a PHP Strict Standards notice. */ @date_default_timezone_set(Configuration::get('PS_TIMEZONE')); +/* Set locales */ +$locale = strtolower(Configuration::get('PS_LOCALE_LANGUAGE')).'_'.strtoupper(Configuration::get('PS_LOCALE_COUNTRY').'.UTF-8'); +setlocale(LC_COLLATE, $locale); +setlocale(LC_CTYPE, $locale); +setlocale(LC_TIME, $locale); +setlocale(LC_NUMERIC, 'en_US.UTF-8'); + /* Instantiate cookie */ @@ -122,7 +129,7 @@ else else { $domains = null; - if(Context::getContext()->shop->domain != Context::getContext()->shop->domain_ssl) + if (Context::getContext()->shop->domain != Context::getContext()->shop->domain_ssl) $domains = array(Context::getContext()->shop->domain_ssl, Context::getContext()->shop->domain); $cookie = new Cookie('ps-s'.Context::getContext()->shop->id, '', $cookie_lifetime, $domains); @@ -153,7 +160,7 @@ else { $customer = new Customer(); - // Change the default group + // Change the default group if (Group::isFeatureActive()) $customer->id_default_group = Configuration::get('PS_UNIDENTIFIED_GROUP'); } From 31efb947abcde64890305df62bcc63c0c67a5672 Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Tue, 4 Dec 2012 17:15:49 +0100 Subject: [PATCH 189/316] // change h4, h5 --- modules/bankwire/config.xml | 6 ++--- modules/blockadvertising/config.xml | 4 +-- .../blockbestsellers-home.tpl | 4 +-- modules/blockbestsellers/blockbestsellers.tpl | 2 +- modules/blockbestsellers/config.xml | 4 +-- modules/blockcart/blockcart.css | 4 +-- modules/blockcart/blockcart.tpl | 4 +-- modules/blockcart/config.xml | 4 +-- modules/blockcategories/blockcategories.tpl | 2 +- .../blockcategories_footer.tpl | 2 +- modules/blockcategories/config.xml | 4 +-- modules/blockcms/blockcms.tpl | 4 +-- modules/blockcontact/blockcontact.tpl | 2 +- modules/blockcontact/config.xml | 4 +-- .../blockcontactinfos/blockcontactinfos.tpl | 2 +- modules/blockcontactinfos/config.xml | 4 +-- modules/blockcurrencies/config.xml | 4 +-- modules/blockcustomerprivacy/config.xml | 4 +-- modules/blocklanguages/config.xml | 4 +-- modules/blocklayered/blocklayered.tpl | 2 +- modules/blocklayered/config.xml | 4 +-- modules/blocklink/blocklink.tpl | 4 +-- modules/blocklink/config.xml | 6 ++--- .../blockmanufacturer/blockmanufacturer.tpl | 2 +- modules/blockmanufacturer/config.xml | 4 +-- modules/blockmyaccount/blockmyaccount.tpl | 2 +- modules/blockmyaccount/config.xml | 4 +-- .../blockmyaccountfooter/blockmyaccount.css | 4 +-- .../blockmyaccountfooter.tpl | 2 +- modules/blockmyaccountfooter/config.xml | 4 +-- modules/blocknewproducts/blocknewproducts.tpl | 2 +- modules/blocknewproducts/config.xml | 4 +-- modules/blocknewsletter/blocknewsletter.css | 2 +- modules/blocknewsletter/config.xml | 6 ++--- .../views/templates/hook/blocknewsletter.tpl | 2 +- modules/blockpaymentlogo/config.xml | 4 +-- modules/blockpermanentlinks/config.xml | 4 +-- modules/blockreinsurance/config.xml | 4 +-- modules/blockrss/blockrss.tpl | 2 +- modules/blockrss/config.xml | 4 +-- modules/blocksearch/blocksearch.tpl | 2 +- modules/blocksearch/config.xml | 4 +-- modules/blocksharefb/config.xml | 4 +-- modules/blocksocial/blocksocial.tpl | 2 +- modules/blocksocial/config.xml | 4 +-- modules/blockspecials/blockspecials.css | 5 ++-- modules/blockspecials/blockspecials.tpl | 4 +-- modules/blockspecials/config.xml | 4 +-- modules/blockstore/blockstore.tpl | 2 +- modules/blockstore/config.xml | 4 +-- modules/blocksupplier/blocksupplier.tpl | 2 +- modules/blocksupplier/config.xml | 4 +-- modules/blocktags/blocktags.tpl | 2 +- modules/blocktags/config.xml | 4 +-- modules/blocktopmenu/config.xml | 4 +-- modules/blockuserinfo/config.xml | 4 +-- modules/blockviewed/blockviewed.css | 7 ++++- modules/blockviewed/blockviewed.tpl | 4 +-- modules/blockviewed/config.xml | 4 +-- modules/blockwishlist/blockwishlist.css | 2 +- modules/blockwishlist/blockwishlist.tpl | 4 +-- modules/blockwishlist/config.xml | 4 +-- modules/blockwishlist/managewishlist.tpl | 2 +- modules/carriercompare/config.xml | 4 +-- modules/cashondelivery/config.xml | 4 +-- modules/cheque/config.xml | 6 ++--- modules/crossselling/config.xml | 4 +-- modules/dateofdelivery/config.xml | 4 +-- modules/editorial/config.xml | 4 +-- modules/favoriteproducts/config.xml | 4 +-- modules/feeder/config.xml | 4 +-- modules/followup/config.xml | 6 ++--- modules/graphartichow/config.xml | 2 +- modules/graphgooglechart/config.xml | 2 +- modules/graphvisifire/config.xml | 2 +- modules/graphxmlswfcharts/config.xml | 2 +- modules/gridhtml/config.xml | 2 +- modules/gsitemap/config.xml | 2 +- modules/homefeatured/config.xml | 4 +-- modules/homefeatured/homefeatured.css | 6 +++-- modules/homefeatured/homefeatured.tpl | 4 +-- modules/homeslider/config.xml | 4 +-- modules/loyalty/config.xml | 6 ++--- modules/mailalerts/config.xml | 6 ++--- modules/newsletter/config.xml | 4 +-- modules/pagesnotfound/config.xml | 4 +-- modules/productcomments/config.xml | 4 +-- modules/productcomments/productcomments.css | 2 +- modules/productcomments/productcomments.tpl | 2 +- modules/productscategory/config.xml | 4 +-- modules/producttooltip/config.xml | 4 +-- modules/referralprogram/config.xml | 8 +++--- modules/sekeywords/config.xml | 4 +-- modules/sendtoafriend/config.xml | 4 +-- modules/statsbestcategories/config.xml | 4 +-- modules/statsbestcustomers/config.xml | 4 +-- modules/statsbestmanufacturers/config.xml | 4 +-- modules/statsbestproducts/config.xml | 4 +-- modules/statsbestsuppliers/config.xml | 4 +-- modules/statsbestvouchers/config.xml | 4 +-- modules/statscarrier/config.xml | 4 +-- modules/statscatalog/config.xml | 4 +-- modules/statscheckup/config.xml | 4 +-- modules/statsdata/config.xml | 4 +-- modules/statsequipment/config.xml | 4 +-- modules/statsforecast/config.xml | 2 +- modules/statsgeolocation/config.xml | 4 +-- modules/statslive/config.xml | 4 +-- modules/statsnewsletter/config.xml | 2 +- modules/statsorigin/config.xml | 4 +-- modules/statspersonalinfos/config.xml | 4 +-- modules/statsproduct/config.xml | 4 +-- modules/statsregistrations/config.xml | 4 +-- modules/statssearch/config.xml | 4 +-- modules/statsstock/config.xml | 2 +- modules/statsvisits/config.xml | 4 +-- modules/trackingfront/config.xml | 4 +-- modules/vatnumber/config.xml | 4 +-- modules/watermark/config.xml | 8 +++--- themes/default/authentication.tpl | 2 +- themes/default/best-sales.tpl | 26 ++++++++++++++----- themes/default/cms.tpl | 4 +-- themes/default/css/comparator.css | 6 +++-- themes/default/css/global.css | 26 ++++++++++--------- themes/default/css/history.css | 4 +-- themes/default/css/my-account.css | 2 +- themes/default/css/product.css | 6 ++++- themes/default/css/scenes.css | 2 +- themes/default/mobile/addresses.tpl | 2 +- .../default/mobile/authentication-choice.tpl | 2 +- themes/default/mobile/css/global.css | 4 +-- .../default/mobile/product-desc-features.tpl | 2 +- themes/default/my-account.tpl | 2 +- themes/default/new-products.tpl | 24 ++++++++++++----- themes/default/order-address-product-line.tpl | 2 +- themes/default/order-detail.tpl | 4 +-- themes/default/order-opc-new-account.tpl | 4 +-- themes/default/order-payment.tpl | 4 +-- themes/default/order-return.tpl | 2 +- themes/default/prices-drop.tpl | 24 ++++++++++++----- themes/default/product.tpl | 4 +-- themes/default/products-comparison.tpl | 2 +- themes/default/scenes.tpl | 2 +- themes/default/shopping-cart-product-line.tpl | 2 +- themes/default/shopping-cart.tpl | 6 ++--- 145 files changed, 332 insertions(+), 280 deletions(-) diff --git a/modules/bankwire/config.xml b/modules/bankwire/config.xml index 08550b4b3..919e6ac6b 100755 --- a/modules/bankwire/config.xml +++ b/modules/bankwire/config.xml @@ -1,12 +1,12 @@ bankwire - + - + - Are you sure you want to delete your details? + Êtes-vous certain de vouloir effacer vos données ? 1 1 diff --git a/modules/blockadvertising/config.xml b/modules/blockadvertising/config.xml index 9830b4ea6..62b227aae 100755 --- a/modules/blockadvertising/config.xml +++ b/modules/blockadvertising/config.xml @@ -1,9 +1,9 @@ blockadvertising - + - + 1 diff --git a/modules/blockbestsellers/blockbestsellers-home.tpl b/modules/blockbestsellers/blockbestsellers-home.tpl index d1b6ada44..bb6d488d5 100644 --- a/modules/blockbestsellers/blockbestsellers-home.tpl +++ b/modules/blockbestsellers/blockbestsellers-home.tpl @@ -25,7 +25,7 @@
-

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

+

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

{if isset($best_sellers) AND $best_sellers}
{assign var='liHeight' value=320} @@ -36,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.name|escape:html:'UTF-8'}
    diff --git a/modules/blockbestsellers/blockbestsellers.tpl b/modules/blockbestsellers/blockbestsellers.tpl index 59a4df44a..31ebabe06 100644 --- a/modules/blockbestsellers/blockbestsellers.tpl +++ b/modules/blockbestsellers/blockbestsellers.tpl @@ -25,7 +25,7 @@
    -

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

    +

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

    {if $best_sellers|@count > 0}
      diff --git a/modules/blockbestsellers/config.xml b/modules/blockbestsellers/config.xml index 9bf0a39be..756a5282a 100755 --- a/modules/blockbestsellers/config.xml +++ b/modules/blockbestsellers/config.xml @@ -1,9 +1,9 @@ blockbestsellers - + - + 1 diff --git a/modules/blockcart/blockcart.css b/modules/blockcart/blockcart.css index 1e0fac942..7d92153f6 100644 --- a/modules/blockcart/blockcart.css +++ b/modules/blockcart/blockcart.css @@ -1,7 +1,7 @@ /* Special style for block cart*/ #left_column #cart_block, #right_column #cart_block { } -#header #cart_block h4 { +#header #cart_block #title { display: none; } #header #cart_block { @@ -22,7 +22,7 @@ background:#eee } #cart_block.cart_block_hover {display:block} -#cart_block h4 span { +#cart_block #title span { float: right; padding-left: 10px; text-transform: none; diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl index 32574a6f1..4563387d0 100644 --- a/modules/blockcart/blockcart.tpl +++ b/modules/blockcart/blockcart.tpl @@ -43,13 +43,13 @@ var delete_txt = '{l s='Delete' mod='blockcart'}';
      -

      +

      {l s='Cart' mod='blockcart'} {if $ajax_allowed}     {/if} -

      +

      diff --git a/modules/blockcart/config.xml b/modules/blockcart/config.xml index cb1badd0e..3647d19d7 100755 --- a/modules/blockcart/config.xml +++ b/modules/blockcart/config.xml @@ -1,9 +1,9 @@ blockcart - + - + 1 diff --git a/modules/blockcategories/blockcategories.tpl b/modules/blockcategories/blockcategories.tpl index 11f574448..0e4fbcaec 100644 --- a/modules/blockcategories/blockcategories.tpl +++ b/modules/blockcategories/blockcategories.tpl @@ -25,7 +25,7 @@
      -

      {l s='Categories' mod='blockcategories'}

      +

      {l s='Categories' mod='blockcategories'}

        {foreach from=$blockCategTree.children item=child name=blockCategTree} diff --git a/modules/blockcategories/blockcategories_footer.tpl b/modules/blockcategories/blockcategories_footer.tpl index 439b1e49e..400b2ed07 100644 --- a/modules/blockcategories/blockcategories_footer.tpl +++ b/modules/blockcategories/blockcategories_footer.tpl @@ -25,7 +25,7 @@