From 1dc629a949e3577de311125015c862076231e771 Mon Sep 17 00:00:00 2001 From: rMalie Date: Thu, 23 Feb 2012 16:33:10 +0000 Subject: [PATCH] =?UTF-8?q?//=20Welcome=202012=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 404.php | 4 +- address.php | 4 +- addresses.php | 4 +- admin-dev/ajax-tab.php | 2 +- admin-dev/ajax.php | 2 +- admin-dev/ajax_products_list.php | 4 +- admin-dev/ajax_send_mail_test.php | 4 +- admin-dev/ajaxfilemanager/inc/index.php | 4 +- admin-dev/ajaxfilemanager/index.php | 4 +- .../jscripts/edit_area/images/index.php | 4 +- .../jscripts/edit_area/index.php | 4 +- .../jscripts/edit_area/langs/index.php | 4 +- .../jscripts/edit_area/reg_syntax/index.php | 4 +- admin-dev/ajaxfilemanager/jscripts/index.php | 4 +- admin-dev/ajaxfilemanager/langs/index.php | 4 +- admin-dev/ajaxfilemanager/session/index.php | 4 +- .../theme/default/css/index.php | 4 +- .../theme/default/images/action/index.php | 4 +- .../theme/default/images/big_icon/index.php | 4 +- .../theme/default/images/file_type/index.php | 4 +- .../theme/default/images/index.php | 4 +- .../theme/default/images/pagination/index.php | 4 +- .../theme/default/images/standard/index.php | 4 +- .../ajaxfilemanager/theme/default/index.php | 4 +- admin-dev/ajaxfilemanager/theme/index.php | 4 +- admin-dev/backup.php | 4 +- admin-dev/backups/index.php | 4 +- admin-dev/cron_currency_rates.php | 2 +- admin-dev/csv.php | 2 +- admin-dev/displayImage.php | 4 +- admin-dev/drawer.php | 4 +- admin-dev/export/index.php | 4 +- admin-dev/footer.inc.php | 4 +- admin-dev/functions.php | 4 +- admin-dev/get-file-admin.php | 2 +- admin-dev/grider.php | 4 +- admin-dev/header.inc.php | 4 +- admin-dev/import/index.php | 4 +- admin-dev/index.php | 2 +- admin-dev/init.php | 4 +- admin-dev/login.php | 4 +- admin-dev/password.php | 4 +- admin-dev/pdf.php | 2 +- admin-dev/searchcron.php | 4 +- admin-dev/tabs/index.php | 4 +- admin-dev/themes/default/css/index.php | 4 +- admin-dev/themes/default/img/index.php | 4 +- admin-dev/themes/default/index.php | 4 +- admin-dev/themes/default/template/content.tpl | 4 +- .../controllers/access/helpers/form/form.tpl | 2 +- .../accounting_export/common_form.tpl | 2 +- .../accounting_export/global_export.tpl | 2 +- .../controllers/accounting_export/menu.tpl | 2 +- .../reconciliation_export.tpl | 2 +- .../accounting_management/content.tpl | 2 +- .../controllers/addons_catalog/content.tpl | 2 +- .../controllers/addons_my_account/content.tpl | 2 +- .../addresses/helpers/form/form.tpl | 4 +- .../addresses/helpers/list/list_header.tpl | 2 +- .../attachments/list_action_delete.tpl | 2 +- .../attribute_generator/content.tpl | 4 +- .../attributes/helpers/form/form.tpl | 2 +- .../attributes/helpers/list/list_content.tpl | 2 +- .../attributes_groups/helpers/form/form.tpl | 2 +- .../helpers/list/list_header.tpl | 2 +- .../controllers/backup/download/view.tpl | 2 +- .../backup/helpers/list/list_header.tpl | 2 +- .../controllers/backup/helpers/view/view.tpl | 4 +- .../carriers/helpers/form/form.tpl | 2 +- .../template/controllers/cart_rules/form.js | 2 +- .../controllers/carts/helpers/view/view.tpl | 2 +- .../categories/helpers/form/form.tpl | 2 +- .../categories/helpers/list/list_header.tpl | 2 +- .../controllers/cms/helpers/form/form.tpl | 4 +- .../cms_categories/helpers/form/form.tpl | 4 +- .../controllers/cms_content/content.tpl | 4 +- .../countries/helpers/form/form.tpl | 2 +- .../countries/helpers/list/list_footer.tpl | 2 +- .../helpers/list/list_header.tpl | 2 +- .../helpers/options/options.tpl | 2 +- .../customer_threads/helpers/view/view.tpl | 4 +- .../controllers/customer_threads/message.tpl | 4 +- .../customers/helpers/list/list_header.tpl | 2 +- .../customers/helpers/view/view.tpl | 2 +- .../controllers/db/helpers/form/form.tpl | 2 +- .../template/controllers/emails/content.tpl | 4 +- .../employees/helpers/form/form.tpl | 2 +- .../feature_value/helpers/form/form.tpl | 2 +- .../features/helpers/form/form.tpl | 2 +- .../generator/helpers/options/options.tpl | 2 +- .../geolocation/helpers/options/options.tpl | 4 +- .../group_shop/helpers/form/form.tpl | 2 +- .../controllers/groups/helpers/form/form.tpl | 2 +- .../controllers/groups/helpers/view/view.tpl | 2 +- .../template/controllers/home/content.tpl | 2 +- .../controllers/home/optimizationTips.tpl | 2 +- .../template/controllers/images/content.tpl | 4 +- .../controllers/import/helpers/form/form.tpl | 2 +- .../controllers/import/helpers/view/view.tpl | 2 +- .../information/helpers/view/view.tpl | 4 +- .../invoices/helpers/form/form.tpl | 2 +- .../languages/helpers/form/form.tpl | 2 +- .../template/controllers/login/content.tpl | 4 +- .../logs/helpers/list/list_header.tpl | 2 +- .../manufacturers/helpers/view/view.tpl | 2 +- .../template/controllers/modules/content.tpl | 2 +- .../template/controllers/modules/filters.tpl | 2 +- .../template/controllers/modules/header.tpl | 2 +- .../template/controllers/modules/js.tpl | 2 +- .../template/controllers/modules/list.tpl | 2 +- .../template/controllers/modules/page.tpl | 2 +- .../controllers/modules_positions/form.tpl | 4 +- .../modules_positions/list_modules.tpl | 4 +- .../controllers/not_found/content.tpl | 2 +- .../controllers/orders/_customized_data.tpl | 2 +- .../controllers/orders/_discount_form.tpl | 2 +- .../controllers/orders/_documents.tpl | 2 +- .../controllers/orders/_new_product.tpl | 2 +- .../controllers/orders/_print_pdf_icon.tpl | 2 +- .../controllers/orders/_product_line.tpl | 2 +- .../template/controllers/orders/_shipping.tpl | 2 +- .../template/controllers/orders/form.tpl | 2 +- .../controllers/orders/helpers/view/view.tpl | 10 +-- .../outstanding/_print_pdf_icon.tpl | 2 +- .../controllers/payment/helpers/view/view.tpl | 4 +- .../controllers/payment/restrictions.tpl | 4 +- .../performance/helpers/form/form.tpl | 2 +- .../preferences/helpers/options/options.tpl | 4 +- .../controllers/products/accounting.tpl | 2 +- .../controllers/products/associations.tpl | 2 +- .../controllers/products/attachments.tpl | 2 +- .../combination/helpers/list/list_footer.tpl | 2 +- .../controllers/products/combinations.tpl | 2 +- .../controllers/products/customization.tpl | 2 +- .../controllers/products/features.tpl | 2 +- .../products/helpers/form/form.tpl | 2 +- .../products/helpers/list/list_header.tpl | 2 +- .../template/controllers/products/images.tpl | 2 +- .../controllers/products/informations.tpl | 2 +- .../controllers/products/input_text_lang.tpl | 2 +- .../template/controllers/products/pack.tpl | 2 +- .../template/controllers/products/prices.tpl | 2 +- .../controllers/products/quantities.tpl | 2 +- .../template/controllers/products/seo.tpl | 2 +- .../controllers/products/shipping.tpl | 2 +- .../controllers/products/suppliers.tpl | 2 +- .../controllers/products/textarea_lang.tpl | 2 +- .../controllers/products/virtualproduct.tpl | 2 +- .../controllers/products/warehouses.tpl | 2 +- .../controllers/referrers/calendar.tpl | 2 +- .../controllers/referrers/form_settings.tpl | 2 +- .../referrers/helpers/form/form.tpl | 2 +- .../referrers/helpers/list/list_header.tpl | 2 +- .../referrers/helpers/view/view.tpl | 4 +- .../request_sql/helpers/form/form.tpl | 2 +- .../request_sql/helpers/view/view.tpl | 4 +- .../request_sql/list_action_export.tpl | 2 +- .../controllers/return/helpers/form/form.tpl | 2 +- .../controllers/scenes/helpers/form/form.tpl | 2 +- .../controllers/search/helpers/view/view.tpl | 2 +- .../template/controllers/shipping/content.tpl | 2 +- .../controllers/shop/helpers/form/form.tpl | 2 +- .../shop/helpers/list/list_content.tpl | 2 +- .../shop_url/helpers/form/form.tpl | 2 +- .../controllers/slip/helpers/form/form.tpl | 2 +- .../specific_price_rule/helpers/form/form.tpl | 2 +- .../controllers/states/list_footer.tpl | 2 +- .../template/controllers/stats/calendar.tpl | 2 +- .../template/controllers/stats/engines.tpl | 2 +- .../controllers/stats/helpers/view/view.tpl | 4 +- .../template/controllers/stats/menu.tpl | 2 +- .../template/controllers/stats/stats.tpl | 4 +- .../statuses/helpers/form/form.tpl | 2 +- .../stock_cover/helpers/list/list_header.tpl | 2 +- .../helpers/list/list_header.tpl | 2 +- .../stock_mvt/helpers/list/list_header.tpl | 2 +- .../controllers/stores/helpers/form/form.tpl | 2 +- .../suppliers/helpers/view/view.tpl | 2 +- .../supply_orders/helpers/form/form.tpl | 2 +- .../helpers/list/list_header.tpl | 2 +- .../supply_orders/helpers/view/view.tpl | 2 +- .../helpers/form/form.tpl | 14 +--- .../helpers/list/list_header.tpl | 2 +- .../controllers/tags/helpers/form/form.tpl | 2 +- .../tax_rules/helpers/form/form.tpl | 2 +- .../helpers/list/list_action_edit.tpl | 2 +- .../tax_rules/helpers/list/list_content.tpl | 2 +- .../tax_rules/helpers/list/list_header.tpl | 2 +- .../tax_rules_group/helpers/form/form.tpl | 2 +- .../themes/helpers/options/options.tpl | 2 +- .../tracking/helpers/list/list_header.tpl | 2 +- .../translations/auto_translate.tpl | 4 +- .../translations/helpers/view/main.tpl | 4 +- .../helpers/view/translation_errors.tpl | 4 +- .../helpers/view/translation_form.tpl | 4 +- .../helpers/view/translation_mails.tpl | 4 +- .../helpers/view/translation_modules.tpl | 4 +- .../warehouses/helpers/view/view.tpl | 4 +- .../webservice/helpers/form/form.tpl | 2 +- admin-dev/themes/default/template/footer.tpl | 2 +- .../default/template/form_submit_ajax.tpl | 2 +- admin-dev/themes/default/template/header.tpl | 2 +- .../template/helpers/form/assoshop.tpl | 2 +- .../default/template/helpers/form/form.tpl | 81 +++++++++++-------- .../template/helpers/form/form_category.tpl | 2 +- .../template/helpers/form/form_group.tpl | 2 +- .../default/template/helpers/list/list.tpl | 2 +- .../helpers/list/list_action_addstock.tpl | 2 +- .../helpers/list/list_action_default.tpl | 2 +- .../helpers/list/list_action_delete.tpl | 2 +- .../helpers/list/list_action_details.tpl | 2 +- .../helpers/list/list_action_duplicate.tpl | 2 +- .../helpers/list/list_action_edit.tpl | 2 +- .../helpers/list/list_action_enable.tpl | 2 +- .../helpers/list/list_action_removestock.tpl | 2 +- .../list_action_supplier_order_receipt.tpl | 2 +- .../list_action_supply_order_change_state.tpl | 2 +- ...tion_supply_order_create_from_template.tpl | 2 +- .../list/list_action_supply_order_receipt.tpl | 2 +- .../list/list_action_transferstock.tpl | 2 +- .../helpers/list/list_action_view.tpl | 2 +- .../template/helpers/list/list_content.tpl | 2 +- .../template/helpers/list/list_footer.tpl | 2 +- .../template/helpers/list/list_header.tpl | 2 +- .../template/helpers/options/options.tpl | 2 +- .../template/helpers/required_fields.tpl | 2 +- .../default/template/helpers/view/view.tpl | 2 +- admin-dev/themes/default/template/index.php | 4 +- .../themes/default/template/invalid_token.tpl | 2 +- .../themes/default/template/layout-ajax.tpl | 2 +- admin-dev/themes/default/template/layout.tpl | 2 +- admin-dev/themes/default/template/toolbar.tpl | 2 +- admin-dev/themes/index.php | 4 +- admin-dev/uploadProductFile.php | 4 +- admin-dev/uploadProductFileAttribute.php | 4 +- attachment.php | 4 +- authentication.php | 4 +- best-sales.php | 4 +- cache/cachefs/index.php | 2 +- cache/index.php | 2 +- cart.php | 4 +- category.php | 4 +- changecurrency.php | 4 +- classes/Accounting.php | 4 +- classes/Address.php | 4 +- classes/AddressFormat.php | 4 +- classes/AdminTab.php | 4 +- classes/Alias.php | 4 +- classes/Attachment.php | 4 +- classes/Attribute.php | 4 +- classes/AttributeGroup.php | 4 +- classes/Autoload.php | 4 +- classes/Backup.php | 4 +- classes/Blowfish.php | 4 +- classes/CMS.php | 24 ++---- classes/CMSCategory.php | 4 +- classes/CSV.php | 4 +- classes/Carrier.php | 4 +- classes/CarrierModule.php | 4 +- classes/Cart.php | 4 +- classes/CartRule.php | 4 +- classes/Category.php | 4 +- classes/Chart.php | 4 +- classes/Collection.php | 4 +- classes/Combination.php | 4 +- classes/CompareProduct.php | 4 +- classes/Configuration.php | 4 +- classes/ConfigurationTest.php | 4 +- classes/Connection.php | 4 +- classes/ConnectionsSource.php | 4 +- classes/Contact.php | 4 +- classes/Context.php | 4 +- classes/ControllerFactory.php | 4 +- classes/Cookie.php | 4 +- classes/Country.php | 4 +- classes/County.php | 4 +- classes/Currency.php | 4 +- classes/Customer.php | 4 +- classes/CustomerMessage.php | 4 +- classes/CustomerThread.php | 4 +- classes/Customization.php | 4 +- classes/DateRange.php | 4 +- classes/Delivery.php | 4 +- classes/Discount.php | 4 +- classes/Dispatcher.php | 4 +- classes/Employee.php | 4 +- classes/Feature.php | 4 +- classes/FeatureValue.php | 4 +- classes/FileUploader.php | 4 +- classes/Gender.php | 4 +- classes/Group.php | 4 +- classes/GroupReduction.php | 4 +- classes/Guest.php | 4 +- classes/HelpAccess.php | 4 +- classes/Hook.php | 4 +- classes/Image.php | 4 +- classes/ImageManager.php | 4 +- classes/ImageType.php | 4 +- classes/Language.php | 4 +- classes/Link.php | 4 +- classes/LocalizationPack.php | 4 +- classes/Logger.php | 4 +- classes/Mail.php | 4 +- classes/Manufacturer.php | 4 +- classes/Media.php | 4 +- classes/Message.php | 4 +- classes/Meta.php | 4 +- classes/Module.php | 4 +- classes/ModuleGraph.php | 4 +- classes/ModuleGraphEngine.php | 4 +- classes/ModuleGrid.php | 4 +- classes/ModuleGridEngine.php | 4 +- classes/Notification.php | 4 +- classes/ObjectModel.php | 4 +- classes/Pack.php | 4 +- classes/Page.php | 4 +- classes/PaymentCC.php | 4 +- classes/PaymentModule.php | 4 +- classes/Product.php | 4 +- classes/ProductDownload.php | 4 +- classes/ProductSale.php | 4 +- classes/ProductSupplier.php | 4 +- classes/Profile.php | 4 +- classes/QuickAccess.php | 4 +- classes/RangePrice.php | 4 +- classes/RangeWeight.php | 4 +- classes/Referrer.php | 4 +- classes/RequestSql.php | 4 +- classes/Rijndael.php | 4 +- classes/Risk.php | 4 +- classes/Scene.php | 4 +- classes/Search.php | 4 +- classes/SearchEngine.php | 4 +- classes/SpecificPrice.php | 4 +- classes/SpecificPriceRule.php | 4 +- classes/State.php | 4 +- classes/Store.php | 4 +- classes/SubDomain.php | 4 +- classes/Supplier.php | 4 +- classes/Tab.php | 4 +- classes/Tag.php | 4 +- classes/Theme.php | 4 +- classes/Tools.php | 4 +- classes/Translate.php | 4 +- classes/TranslatedConfiguration.php | 4 +- classes/Upgrader.php | 4 +- classes/Validate.php | 4 +- classes/Zone.php | 4 +- classes/cache/Cache.php | 9 +-- classes/cache/CacheApc.php | 4 +- classes/cache/CacheFs.php | 4 +- classes/cache/CacheMemcache.php | 4 +- classes/cache/CacheXcache.php | 4 +- classes/controller/AdminController.php | 4 +- classes/controller/Controller.php | 4 +- classes/controller/FrontController.php | 4 +- classes/controller/ModuleAdminController.php | 4 +- classes/controller/ModuleFrontController.php | 4 +- classes/db/Db.php | 4 +- classes/db/DbMySQLi.php | 4 +- classes/db/DbPDO.php | 4 +- classes/db/DbQuery.php | 4 +- classes/db/MySQL.php | 4 +- .../exception/PrestaShopDatabaseException.php | 4 +- classes/exception/PrestaShopException.php | 4 +- .../exception/PrestaShopModuleException.php | 4 +- .../exception/PrestaShopPaymentException.php | 4 +- classes/exception/index.php | 4 +- classes/helper/Helper.php | 4 +- classes/helper/HelperForm.php | 4 +- classes/helper/HelperHelpAccess.php | 4 +- classes/helper/HelperList.php | 4 +- classes/helper/HelperOptions.php | 4 +- classes/helper/HelperView.php | 4 +- classes/index.php | 4 +- classes/log/AbstractLogger.php | 4 +- classes/log/FileLogger.php | 4 +- classes/order/Order.php | 4 +- classes/order/OrderCarrier.php | 4 +- classes/order/OrderCartRule.php | 4 +- classes/order/OrderDetail.php | 4 +- classes/order/OrderDiscount.php | 4 +- classes/order/OrderHistory.php | 4 +- classes/order/OrderInvoice.php | 4 +- classes/order/OrderMessage.php | 4 +- classes/order/OrderPayment.php | 4 +- classes/order/OrderReturn.php | 4 +- classes/order/OrderReturnState.php | 4 +- classes/order/OrderSlip.php | 4 +- classes/order/OrderState.php | 4 +- classes/pdf/HTMLTemplate.php | 4 +- classes/pdf/HTMLTemplateDeliverySlip.php | 4 +- classes/pdf/HTMLTemplateInvoice.php | 4 +- classes/pdf/HTMLTemplateOrderReturn.php | 4 +- classes/pdf/HTMLTemplateOrderSlip.php | 4 +- classes/pdf/HTMLTemplateSupplyOrderForm.php | 4 +- classes/pdf/PDF.php | 4 +- classes/pdf/PDFGenerator.php | 4 +- classes/shop/GroupShop.php | 4 +- classes/shop/Shop.php | 4 +- classes/shop/ShopUrl.php | 4 +- classes/stock/Stock.php | 4 +- classes/stock/StockAvailable.php | 4 +- classes/stock/StockManager.php | 4 +- classes/stock/StockManagerFactory.php | 4 +- classes/stock/StockManagerInterface.php | 4 +- classes/stock/StockManagerModule.php | 4 +- classes/stock/StockMvt.php | 4 +- classes/stock/StockMvtReason.php | 4 +- classes/stock/StockMvtWS.php | 4 +- classes/stock/SupplyOrder.php | 4 +- classes/stock/SupplyOrderDetail.php | 4 +- classes/stock/SupplyOrderHistory.php | 4 +- classes/stock/SupplyOrderReceiptHistory.php | 4 +- classes/stock/SupplyOrderState.php | 5 +- classes/stock/Warehouse.php | 4 +- classes/stock/WarehouseProductLocation.php | 4 +- classes/tax/Tax.php | 4 +- classes/tax/TaxCalculator.php | 4 +- classes/tax/TaxManagerFactory.php | 4 +- classes/tax/TaxManagerInterface.php | 4 +- classes/tax/TaxManagerModule.php | 4 +- classes/tax/TaxRule.php | 4 +- classes/tax/TaxRulesGroup.php | 4 +- classes/tax/TaxRulesTaxManager.php | 4 +- classes/webservice/WebserviceException.php | 4 +- classes/webservice/WebserviceKey.php | 4 +- .../webservice/WebserviceOutputBuilder.php | 4 +- .../webservice/WebserviceOutputInterface.php | 4 +- classes/webservice/WebserviceOutputXML.php | 4 +- .../WebserviceSpecificManagementImages.php | 4 +- .../WebserviceSpecificManagementInterface.php | 4 +- .../WebserviceSpecificManagementSearch.php | 4 +- cms.php | 4 +- config/alias.php | 2 +- config/autoload.php | 2 +- config/config.inc.php | 4 +- config/defines.inc.php | 2 +- config/defines_uri.inc.php | 2 +- config/index.php | 4 +- config/smarty.config.inc.php | 2 +- config/smartyadmin.config.inc.php | 2 +- config/smartyfront.config.inc.php | 2 +- config/xml/index.php | 4 +- contact-form.php | 4 +- controllers/admin/AdminAccessController.php | 2 +- .../admin/AdminAccountingExportController.php | 2 +- .../AdminAccountingManagementController.php | 4 +- .../admin/AdminAddonsCatalogController.php | 4 +- .../admin/AdminAddonsMyAccountController.php | 4 +- .../admin/AdminAddressesController.php | 28 +++---- controllers/admin/AdminAliasesController.php | 2 +- .../admin/AdminAttachmentsController.php | 2 +- .../AdminAttributeGeneratorController.php | 2 +- .../admin/AdminAttributesGroupsController.php | 2 +- controllers/admin/AdminBackupController.php | 2 +- controllers/admin/AdminCarriersController.php | 2 +- .../admin/AdminCartRulesController.php | 2 +- controllers/admin/AdminCartsController.php | 2 +- .../admin/AdminCategoriesController.php | 2 +- .../admin/AdminCmsCategoriesController.php | 2 +- .../admin/AdminCmsContentController.php | 13 ++- controllers/admin/AdminCmsController.php | 8 +- controllers/admin/AdminContactController.php | 2 +- controllers/admin/AdminContactsController.php | 2 +- .../admin/AdminCountriesController.php | 2 +- .../admin/AdminCurrenciesController.php | 6 +- .../admin/AdminCustomerThreadsController.php | 13 ++- .../admin/AdminCustomersController.php | 4 +- controllers/admin/AdminDbController.php | 2 +- .../admin/AdminDeliverySlipController.php | 2 +- controllers/admin/AdminEmailsController.php | 2 +- .../admin/AdminEmployeesController.php | 2 +- controllers/admin/AdminFeaturesController.php | 2 +- controllers/admin/AdminGendersController.php | 2 +- .../admin/AdminGeneratorController.php | 2 +- .../admin/AdminGeolocationController.php | 2 +- .../admin/AdminGroupShopController.php | 2 +- controllers/admin/AdminGroupsController.php | 2 +- controllers/admin/AdminHomeController.php | 2 +- controllers/admin/AdminImagesController.php | 2 +- controllers/admin/AdminImportController.php | 2 +- .../admin/AdminInformationController.php | 2 +- controllers/admin/AdminInvoicesController.php | 2 +- .../admin/AdminLanguagesController.php | 2 +- .../admin/AdminLocalizationController.php | 2 +- controllers/admin/AdminLoginController.php | 2 +- controllers/admin/AdminLogsController.php | 2 +- .../admin/AdminManufacturersController.php | 4 +- controllers/admin/AdminMetaController.php | 4 +- controllers/admin/AdminModulesController.php | 2 +- .../admin/AdminModulesPositionsController.php | 4 +- .../admin/AdminOrderMessageController.php | 2 +- controllers/admin/AdminOrdersController.php | 4 +- .../admin/AdminOutstandingController.php | 2 +- .../admin/AdminPPreferencesController.php | 2 +- controllers/admin/AdminPaymentController.php | 4 +- controllers/admin/AdminPdfController.php | 2 +- .../admin/AdminPerformanceController.php | 2 +- .../admin/AdminPreferencesController.php | 2 +- controllers/admin/AdminProductsController.php | 4 +- controllers/admin/AdminProfilesController.php | 2 +- .../admin/AdminQuickAccessesController.php | 2 +- .../admin/AdminRangePriceController.php | 2 +- .../admin/AdminRangeWeightController.php | 2 +- .../admin/AdminReferrersController.php | 2 +- .../admin/AdminRequestSqlController.php | 2 +- controllers/admin/AdminReturnController.php | 2 +- controllers/admin/AdminScenesController.php | 2 +- .../admin/AdminSearchConfController.php | 2 +- controllers/admin/AdminSearchController.php | 2 +- .../admin/AdminSearchEnginesController.php | 2 +- controllers/admin/AdminShippingController.php | 2 +- controllers/admin/AdminShopController.php | 2 +- controllers/admin/AdminShopUrlController.php | 6 +- controllers/admin/AdminSlipController.php | 2 +- .../AdminSpecificPriceRuleController.php | 2 +- controllers/admin/AdminStatesController.php | 4 +- controllers/admin/AdminStatsController.php | 4 +- controllers/admin/AdminStatsTabController.php | 2 +- controllers/admin/AdminStatusesController.php | 2 +- .../AdminStockConfigurationController.php | 5 +- .../admin/AdminStockCoverController.php | 5 +- .../AdminStockInstantStateController.php | 5 +- .../admin/AdminStockManagementController.php | 5 +- controllers/admin/AdminStockMvtController.php | 5 +- controllers/admin/AdminStoresController.php | 4 +- .../admin/AdminSubDomainsController.php | 4 +- .../admin/AdminSuppliersController.php | 4 +- .../admin/AdminSupplyOrdersController.php | 39 ++++----- controllers/admin/AdminTabsController.php | 2 +- controllers/admin/AdminTagsController.php | 2 +- .../admin/AdminTaxRulesGroupController.php | 2 +- controllers/admin/AdminTaxesController.php | 2 +- controllers/admin/AdminThemesController.php | 4 +- controllers/admin/AdminTrackingController.php | 2 +- .../admin/AdminTranslationsController.php | 2 +- .../admin/AdminWarehousesController.php | 4 +- .../admin/AdminWebserviceController.php | 2 +- controllers/admin/AdminZonesController.php | 2 +- controllers/front/AddressController.php | 2 +- controllers/front/AddressesController.php | 2 +- controllers/front/AttachmentController.php | 2 +- controllers/front/AuthController.php | 2 +- controllers/front/BestSalesController.php | 2 +- controllers/front/CartController.php | 2 +- controllers/front/CategoryController.php | 2 +- .../front/ChangeCurrencyController.php | 2 +- controllers/front/CmsController.php | 2 +- controllers/front/CompareController.php | 2 +- controllers/front/ContactController.php | 4 +- controllers/front/DiscountController.php | 2 +- controllers/front/GetFileController.php | 2 +- controllers/front/GuestTrackingController.php | 2 +- controllers/front/HistoryController.php | 2 +- controllers/front/IdentityController.php | 2 +- controllers/front/IndexController.php | 2 +- controllers/front/ManufacturerController.php | 4 +- controllers/front/MyAccountController.php | 2 +- controllers/front/NewProductsController.php | 2 +- .../front/OrderConfirmationController.php | 2 +- controllers/front/OrderController.php | 12 +-- controllers/front/OrderDetailController.php | 4 +- controllers/front/OrderFollowController.php | 2 +- controllers/front/OrderOpcController.php | 2 +- controllers/front/OrderReturnController.php | 2 +- controllers/front/OrderSlipController.php | 2 +- controllers/front/PageNotFoundController.php | 2 +- controllers/front/ParentOrderController.php | 2 +- controllers/front/PasswordController.php | 2 +- controllers/front/PdfInvoiceController.php | 2 +- .../front/PdfOrderReturnController.php | 2 +- controllers/front/PdfOrderSlipController.php | 2 +- controllers/front/PricesDropController.php | 2 +- controllers/front/ProductController.php | 4 +- controllers/front/SearchController.php | 2 +- controllers/front/SitemapController.php | 2 +- controllers/front/StatisticsController.php | 2 +- controllers/front/StoresController.php | 2 +- controllers/front/SupplierController.php | 2 +- controllers/front/index.php | 4 +- controllers/index.php | 4 +- css/index.php | 4 +- discount.php | 4 +- docs/CHANGELOG | 4 +- docs/dev/index.php | 4 +- docs/index.php | 4 +- docs/licences/index.php | 4 +- docs/readme_de.txt | 28 +++---- docs/readme_en.txt | 4 +- docs/readme_es.txt | 4 +- docs/readme_fr.txt | 4 +- docs/readme_it.txt | 6 +- footer.php | 4 +- get-file.php | 4 +- guest-tracking.php | 4 +- header.php | 4 +- history.php | 4 +- identity.php | 4 +- images.inc.php | 4 +- img/admin/index.php | 4 +- img/c/index.php | 4 +- img/cms/index.php | 4 +- img/co/index.php | 4 +- img/index.php | 4 +- img/jquery-ui/index.php | 4 +- img/l/index.php | 4 +- img/m/index.php | 4 +- img/os/index.php | 4 +- img/p/index.php | 4 +- img/s/index.php | 4 +- img/scenes/index.php | 4 +- img/scenes/thumbs/index.php | 4 +- img/st/index.php | 4 +- img/su/index.php | 4 +- img/t/index.php | 4 +- img/tmp/index.php | 4 +- index.php | 10 ++- init.php | 4 +- install-dev/README.txt | 4 +- install-dev/classes/controllerHttp.php | 2 +- install-dev/classes/exception.php | 2 +- install-dev/classes/language.php | 2 +- install-dev/classes/languages.php | 2 +- install-dev/classes/model.php | 2 +- install-dev/classes/session.php | 2 +- install-dev/classes/simplexml.php | 2 +- install-dev/classes/sqlLoader.php | 2 +- install-dev/classes/xmlLoader.php | 4 +- install-dev/controllers/http/configure.php | 2 +- install-dev/controllers/http/database.php | 2 +- install-dev/controllers/http/process.php | 2 +- install-dev/controllers/http/system.php | 2 +- install-dev/controllers/http/welcome.php | 2 +- install-dev/fixtures/apple/install.php | 2 +- install-dev/index.php | 2 +- install-dev/init.php | 2 +- install-dev/install_version.php | 4 +- install-dev/langs/fr/README.txt | 4 +- install-dev/models/database.php | 2 +- install-dev/models/install.php | 2 +- install-dev/models/mail.php | 2 +- install-dev/models/system.php | 2 +- install-dev/theme/img/index.php | 4 +- .../upgrade/classes/AbstractLogger.php | 2 +- install-dev/upgrade/classes/AddConfToFile.php | 4 +- install-dev/upgrade/classes/FileLogger.php | 2 +- .../upgrade/php/add_attribute_position.php | 2 +- .../upgrade/php/add_carrier_position.php | 2 +- ...lumn_order_state_deleted_if_not_exists.php | 2 +- ..._column_orders_reference_if_not_exists.php | 2 +- ...dd_default_restrictions_modules_groups.php | 2 +- .../upgrade/php/add_feature_position.php | 2 +- .../php/add_group_attribute_position.php | 2 +- .../php/add_id_shop_to_shipper_lang_index.php | 2 +- .../upgrade/php/add_missing_rewrite_value.php | 2 +- .../upgrade/php/add_module_to_hook.php | 2 +- install-dev/upgrade/php/add_new_groups.php | 2 +- install-dev/upgrade/php/add_new_tab.php | 4 +- install-dev/upgrade/php/add_order_state.php | 4 +- .../add_required_customization_field_flag.php | 4 +- install-dev/upgrade/php/add_stock_tab.php | 2 +- .../upgrade/php/add_unknown_gender.php | 2 +- install-dev/upgrade/php/alter_blocklink.php | 4 +- install-dev/upgrade/php/alter_cms_block.php | 4 +- .../php/alter_productcomments_guest_index.php | 4 +- .../attribute_group_clean_combinations.php | 4 +- install-dev/upgrade/php/blocknewsletter.php | 4 +- .../php/category_product_index_unique.php | 2 +- .../php/check_webservice_account_table.php | 4 +- install-dev/upgrade/php/cms_block.php | 4 +- .../php/configuration_double_cleaner.php | 4 +- .../upgrade/php/convert_product_price.php | 4 +- .../upgrade/php/country_to_timezone.php | 4 +- .../upgrade/php/deactivate_custom_modules.php | 4 +- .../upgrade/php/delivery_number_set.php | 4 +- .../php/ecotax_tax_application_fix.php | 4 +- install-dev/upgrade/php/editorial_update.php | 4 +- install-dev/upgrade/php/generate_ntree.php | 4 +- .../upgrade/php/generate_tax_rules.php | 4 +- .../upgrade/php/gridextjs_deprecated.php | 2 +- .../php/group_reduction_column_fix.php | 4 +- .../php/hook_blocksearch_on_header.php | 2 +- .../upgrade/php/id_currency_country_fix.php | 4 +- install-dev/upgrade/php/index.php | 4 +- .../upgrade/php/invoice_number_set.php | 4 +- .../upgrade/php/latin1_database_to_utf8.php | 4 +- .../php/migrate_block_info_to_cms_block.php | 4 +- install-dev/upgrade/php/migrate_orders.php | 2 +- .../php/module_reinstall_blockmyaccount.php | 4 +- .../php/module_reinstall_blocksearch.php | 4 +- .../upgrade/php/regenerate_level_depth.php | 4 +- .../php/remove_duplicate_category_groups.php | 2 +- .../upgrade/php/remove_module_from_hook.php | 2 +- install-dev/upgrade/php/reorderpositions.php | 4 +- .../php/setAllGroupsOnHomeCategory.php | 4 +- .../upgrade/php/set_discount_category.php | 4 +- .../upgrade/php/set_payment_module.php | 4 +- .../upgrade/php/set_payment_module_group.php | 4 +- install-dev/upgrade/php/shop_url.php | 4 +- .../upgrade/php/update_carrier_url.php | 4 +- .../php/update_feature_detachable_cache.php | 2 +- .../upgrade/php/update_image_size_in_db.php | 4 +- .../upgrade/php/update_module_followup.php | 2 +- .../upgrade/php/update_module_loyalty.php | 2 +- .../upgrade/php/update_modules_sql.php | 4 +- .../upgrade/php/update_order_canada.php | 2 +- .../upgrade/php/update_order_details.php | 4 +- .../php/update_products_ecotax_v133.php | 2 +- .../upgrade/php/updateproductcomments.php | 4 +- .../php/updatetabicon_from_11version.php | 4 +- install-dev/upgrade/sql/index.php | 4 +- install-dev/upgrade/upgrade.php | 2 +- js/admin-categories-tree.js | 4 +- js/admin-dnd.js | 4 +- js/admin-products.js | 2 +- js/admin-scene-cropping.js | 4 +- js/admin-translations.js | 2 +- js/admin.js | 2 +- js/adminImport.js | 2 +- js/admin_order.js | 2 +- js/ajax.js | 4 +- js/attributesBack.js | 2 +- js/checkLangPack.js | 4 +- js/fileuploader.js | 2 +- js/form.js | 4 +- js/index.php | 4 +- js/price.js | 2 +- js/sendMailTest.js | 2 +- js/tiny_mce/index.php | 4 +- js/tiny_mce/langs/index.php | 4 +- js/tiny_mce/plugins/advimage/css/index.php | 4 +- js/tiny_mce/plugins/advimage/img/index.php | 4 +- js/tiny_mce/plugins/advimage/index.php | 4 +- js/tiny_mce/plugins/advimage/js/index.php | 4 +- js/tiny_mce/plugins/advimage/langs/index.php | 4 +- js/tiny_mce/plugins/advlink/css/index.php | 2 +- js/tiny_mce/plugins/advlink/index.php | 4 +- js/tiny_mce/plugins/advlink/js/index.php | 4 +- js/tiny_mce/plugins/advlink/langs/index.php | 2 +- js/tiny_mce/plugins/contextmenu/index.php | 4 +- js/tiny_mce/plugins/fullscreen/index.php | 2 +- js/tiny_mce/plugins/index.php | 4 +- js/tiny_mce/plugins/inlinepopups/index.php | 2 +- .../skins/clearlooks2/img/index.php | 2 +- .../inlinepopups/skins/clearlooks2/index.php | 2 +- .../plugins/inlinepopups/skins/index.php | 2 +- js/tiny_mce/plugins/media/css/index.php | 2 +- js/tiny_mce/plugins/media/index.php | 2 +- js/tiny_mce/plugins/media/js/index.php | 2 +- js/tiny_mce/plugins/media/langs/index.php | 2 +- js/tiny_mce/plugins/pagebreak/index.php | 2 +- js/tiny_mce/plugins/paste/index.php | 4 +- js/tiny_mce/plugins/paste/js/index.php | 4 +- js/tiny_mce/plugins/paste/langs/index.php | 4 +- js/tiny_mce/plugins/preview/index.php | 2 +- .../plugins/preview/jscripts/index.php | 2 +- js/tiny_mce/plugins/searchreplace/index.php | 2 +- .../plugins/searchreplace/langs/index.php | 2 +- js/tiny_mce/plugins/style/css/index.php | 2 +- js/tiny_mce/plugins/style/index.php | 2 +- js/tiny_mce/plugins/style/js/index.php | 2 +- js/tiny_mce/plugins/style/langs/index.php | 2 +- js/tiny_mce/plugins/table/css/index.php | 2 +- js/tiny_mce/plugins/table/index.php | 2 +- js/tiny_mce/plugins/table/js/index.php | 2 +- js/tiny_mce/plugins/table/langs/index.php | 2 +- js/tiny_mce/plugins/xhtmlxtras/css/index.php | 4 +- js/tiny_mce/plugins/xhtmlxtras/index.php | 4 +- js/tiny_mce/plugins/xhtmlxtras/js/index.php | 4 +- .../plugins/xhtmlxtras/langs/index.php | 4 +- js/tiny_mce/themes/advanced/img/index.php | 4 +- js/tiny_mce/themes/advanced/index.php | 4 +- js/tiny_mce/themes/advanced/js/index.php | 4 +- js/tiny_mce/themes/advanced/langs/index.php | 4 +- .../advanced/skins/cirkuit/img/index.php | 4 +- .../themes/advanced/skins/cirkuit/index.php | 4 +- .../advanced/skins/default/img/index.php | 4 +- .../themes/advanced/skins/default/index.php | 4 +- .../advanced/skins/highcontrast/index.php | 4 +- js/tiny_mce/themes/advanced/skins/index.php | 4 +- .../themes/advanced/skins/o2k7/img/index.php | 4 +- .../themes/advanced/skins/o2k7/index.php | 4 +- js/tiny_mce/themes/index.php | 4 +- js/tiny_mce/utils/index.php | 2 +- js/toggle.js | 4 +- js/tools.js | 4 +- localization/index.php | 4 +- log/index.php | 4 +- mails/de/index.php | 4 +- mails/en/index.php | 4 +- mails/en/lang.php | 4 +- mails/es/index.php | 4 +- mails/fr/index.php | 4 +- mails/index.php | 4 +- mails/it/index.php | 4 +- manufacturer.php | 4 +- modules/bankwire/bankwire.php | 4 +- .../bankwire/controllers/front/payment.php | 4 +- .../bankwire/controllers/front/validation.php | 4 +- modules/bankwire/index.php | 4 +- modules/bankwire/payment.php | 4 +- modules/bankwire/validation.php | 4 +- .../templates/front/payment_execution.tpl | 4 +- .../bankwire/views/templates/hook/payment.tpl | 4 +- .../views/templates/hook/payment_return.tpl | 4 +- modules/blockadvertising/blockadvertising.php | 4 +- modules/blockadvertising/blockadvertising.tpl | 4 +- modules/blockadvertising/index.php | 4 +- .../blockbestsellers-home.tpl | 4 +- modules/blockbestsellers/blockbestsellers.php | 4 +- modules/blockbestsellers/blockbestsellers.tpl | 4 +- modules/blockbestsellers/img/index.php | 4 +- modules/blockbestsellers/index.php | 4 +- modules/blockcart/ajax-cart.js | 2 +- modules/blockcart/blockcart-ajax.php | 2 +- modules/blockcart/blockcart-json.tpl | 2 +- modules/blockcart/blockcart-set-collapse.php | 2 +- modules/blockcart/blockcart.php | 2 +- modules/blockcart/blockcart.tpl | 2 +- modules/blockcart/img/icon/index.php | 2 +- modules/blockcart/img/index.php | 2 +- modules/blockcart/index.php | 2 +- modules/blockcategories/blockcategories.php | 4 +- modules/blockcategories/blockcategories.tpl | 4 +- .../blockcategories_footer.tpl | 4 +- .../blockcategories/category-tree-branch.tpl | 4 +- modules/blockcategories/index.php | 4 +- modules/blockcms/BlockCMSModel.php | 4 +- modules/blockcms/blockcms.php | 4 +- modules/blockcms/blockcms.tpl | 4 +- modules/blockcms/index.php | 4 +- .../admin/_configure/helpers/form/form.tpl | 4 +- modules/blockcontact/blockcontact.php | 2 +- modules/blockcontact/blockcontact.tpl | 2 +- .../blockcontactinfos/blockcontactinfos.php | 2 +- .../blockcontactinfos/blockcontactinfos.tpl | 2 +- modules/blockcurrencies/blockcurrencies.php | 4 +- modules/blockcurrencies/blockcurrencies.tpl | 4 +- modules/blockcurrencies/index.php | 4 +- .../blockcustomerprivacy.php | 4 +- .../blockcustomerprivacy.tpl | 4 +- modules/blockcustomerprivacy/index.php | 4 +- modules/blocklanguages/blocklanguages.php | 4 +- modules/blocklanguages/blocklanguages.tpl | 4 +- modules/blocklanguages/index.php | 4 +- .../blocklayered/blocklayered-ajax-back.php | 4 +- modules/blocklayered/blocklayered-ajax.php | 4 +- .../blocklayered/blocklayered-no-products.tpl | 4 +- modules/blocklayered/blocklayered.js | 4 +- modules/blocklayered/blocklayered.php | 4 +- modules/blocklayered/blocklayered.tpl | 4 +- modules/blocklayered/index.php | 4 +- modules/blocklink/blocklink.js | 4 +- modules/blocklink/blocklink.php | 4 +- modules/blocklink/blocklink.tpl | 4 +- modules/blocklink/index.php | 4 +- .../blockmanufacturer/blockmanufacturer.php | 4 +- .../blockmanufacturer/blockmanufacturer.tpl | 4 +- modules/blockmanufacturer/index.php | 4 +- modules/blockmyaccount/blockmyaccount.php | 4 +- modules/blockmyaccount/blockmyaccount.tpl | 4 +- modules/blockmyaccount/index.php | 4 +- .../blockmyaccountfooter.php | 4 +- .../blockmyaccountfooter.tpl | 4 +- modules/blocknewproducts/blocknewproducts.php | 4 +- modules/blocknewproducts/blocknewproducts.tpl | 4 +- modules/blocknewproducts/index.php | 4 +- modules/blocknewsletter/blocknewsletter.php | 4 +- .../controllers/front/verification.php | 4 +- modules/blocknewsletter/index.php | 4 +- modules/blocknewsletter/mails/de/index.php | 4 +- modules/blocknewsletter/mails/en/index.php | 4 +- modules/blocknewsletter/mails/es/index.php | 4 +- modules/blocknewsletter/mails/fr/index.php | 4 +- modules/blocknewsletter/mails/index.php | 4 +- modules/blocknewsletter/mails/it/index.php | 4 +- .../front/verification_execution.tpl | 4 +- .../views/templates/hook/blocknewsletter.tpl | 4 +- modules/blockpaymentlogo/blockpaymentlogo.php | 4 +- modules/blockpaymentlogo/blockpaymentlogo.tpl | 4 +- modules/blockpaymentlogo/index.php | 4 +- .../blockpermanentlinks-footer.tpl | 2 +- .../blockpermanentlinks-header.tpl | 2 +- .../blockpermanentlinks.php | 2 +- .../blockpermanentlinks.tpl | 2 +- modules/blockpermanentlinks/index.php | 2 +- modules/blockreinsurance/blockreinsurance.php | 2 +- modules/blockreinsurance/blockreinsurance.tpl | 2 +- modules/blockrss/blockrss.php | 4 +- modules/blockrss/blockrss.tpl | 4 +- modules/blockrss/index.php | 4 +- modules/blocksearch/blocksearch-top.tpl | 4 +- modules/blocksearch/blocksearch.php | 4 +- modules/blocksearch/blocksearch.tpl | 4 +- modules/blocksearch/index.php | 4 +- modules/blocksharefb/blocksharefb.php | 4 +- modules/blocksharefb/blocksharefb.tpl | 4 +- modules/blocksocial/blocksocial.php | 2 +- modules/blocksocial/blocksocial.tpl | 2 +- modules/blockspecials/blockspecials.php | 4 +- modules/blockspecials/blockspecials.tpl | 4 +- modules/blockspecials/index.php | 4 +- modules/blockstore/blockstore.php | 2 +- modules/blockstore/blockstore.tpl | 2 +- modules/blockstore/index.php | 2 +- modules/blocksupplier/blocksupplier.php | 4 +- modules/blocksupplier/blocksupplier.tpl | 4 +- modules/blocksupplier/index.php | 4 +- modules/blocktags/blocktags.php | 4 +- modules/blocktags/blocktags.tpl | 4 +- modules/blocktags/index.php | 4 +- modules/blocktopmenu/blocktopmenu.php | 4 +- modules/blocktopmenu/index.php | 4 +- modules/blocktopmenu/menutoplinks.class.php | 4 +- modules/blockuserinfo/blockuserinfo.php | 4 +- modules/blockuserinfo/blockuserinfo.tpl | 4 +- modules/blockuserinfo/index.php | 4 +- modules/blockviewed/blockviewed.php | 4 +- modules/blockviewed/blockviewed.tpl | 4 +- modules/blockviewed/index.php | 4 +- modules/blockwishlist/WishList.php | 4 +- modules/blockwishlist/blockwishlist-ajax.tpl | 4 +- modules/blockwishlist/blockwishlist-extra.tpl | 4 +- .../blockwishlist/blockwishlist-header.tpl | 4 +- modules/blockwishlist/blockwishlist.php | 4 +- modules/blockwishlist/blockwishlist.tpl | 4 +- modules/blockwishlist/buywishlistproduct.php | 7 +- modules/blockwishlist/cart.php | 4 +- modules/blockwishlist/img/icon/index.php | 4 +- modules/blockwishlist/img/index.php | 4 +- modules/blockwishlist/index.php | 4 +- modules/blockwishlist/js/ajax-wishlist.js | 4 +- modules/blockwishlist/js/index.php | 4 +- modules/blockwishlist/mails/de/index.php | 4 +- modules/blockwishlist/mails/en/index.php | 4 +- modules/blockwishlist/mails/es/index.php | 4 +- modules/blockwishlist/mails/fr/index.php | 4 +- modules/blockwishlist/mails/index.php | 4 +- modules/blockwishlist/mails/it/index.php | 4 +- modules/blockwishlist/managewishlist.php | 4 +- modules/blockwishlist/managewishlist.tpl | 4 +- modules/blockwishlist/my-account.tpl | 4 +- modules/blockwishlist/mywishlist.php | 4 +- modules/blockwishlist/mywishlist.tpl | 4 +- modules/blockwishlist/sendwishlist.php | 4 +- modules/blockwishlist/view.php | 4 +- modules/blockwishlist/view.tpl | 4 +- modules/carriercompare/ajax.php | 2 +- modules/carriercompare/carriercompare.js | 2 +- modules/carriercompare/carriercompare.php | 2 +- modules/carriercompare/carriercompare.tpl | 2 +- modules/carriercompare/index.php | 2 +- modules/cheque/cheque.php | 4 +- modules/cheque/controllers/front/payment.php | 4 +- .../cheque/controllers/front/validation.php | 4 +- modules/cheque/index.php | 4 +- modules/cheque/payment.php | 4 +- modules/cheque/validation.php | 4 +- .../templates/front/payment_execution.tpl | 4 +- .../cheque/views/templates/hook/payment.tpl | 4 +- .../views/templates/hook/payment_return.tpl | 4 +- modules/crossselling/crossselling.php | 4 +- modules/crossselling/crossselling.tpl | 4 +- modules/crossselling/index.php | 4 +- modules/crossselling/js/crossselling.js | 4 +- modules/crossselling/js/index.php | 4 +- modules/dateofdelivery/beforeCarrier.tpl | 4 +- modules/dateofdelivery/dateofdelivery.php | 4 +- modules/dateofdelivery/img/index.php | 4 +- modules/dateofdelivery/index.php | 4 +- modules/dateofdelivery/orderDetail.tpl | 4 +- modules/editorial/EditorialClass.php | 2 +- modules/editorial/editorial.php | 2 +- modules/editorial/editorial.tpl | 2 +- modules/editorial/index.php | 2 +- modules/favoriteproducts/FavoriteProduct.php | 4 +- .../controllers/front/account.php | 4 +- .../controllers/front/actions.php | 4 +- .../favoriteproducts-account.php | 4 +- .../favoriteproducts-ajax.php | 4 +- modules/favoriteproducts/favoriteproducts.php | 4 +- modules/favoriteproducts/index.php | 4 +- .../front/favoriteproducts-account.tpl | 4 +- .../templates/hook/favoriteproducts-extra.tpl | 4 +- .../views/templates/hook/my-account.tpl | 4 +- modules/feeder/feeder.php | 4 +- modules/feeder/feederHeader.tpl | 4 +- modules/feeder/index.php | 4 +- modules/feeder/rss.php | 4 +- modules/followup/cron.php | 2 +- modules/followup/followup.php | 2 +- modules/followup/index.php | 2 +- modules/followup/mails/de/index.php | 2 +- modules/followup/mails/en/index.php | 2 +- modules/followup/mails/es/index.php | 2 +- modules/followup/mails/fr/index.php | 2 +- modules/followup/mails/index.php | 2 +- modules/followup/mails/it/index.php | 2 +- .../graphartichow/artichow/cache/index.php | 4 +- modules/graphartichow/artichow/font/index.php | 4 +- .../artichow/images/errors/index.php | 4 +- .../graphartichow/artichow/images/index.php | 4 +- .../artichow/inc/drivers/index.php | 4 +- modules/graphartichow/artichow/inc/index.php | 4 +- modules/graphartichow/artichow/index.php | 4 +- .../graphartichow/artichow/patterns/index.php | 4 +- modules/graphartichow/graphartichow.php | 4 +- modules/graphartichow/index.php | 4 +- modules/graphgooglechart/graphgooglechart.php | 4 +- modules/graphgooglechart/index.php | 4 +- modules/graphvisifire/graphvisifire.php | 2 +- modules/graphvisifire/index.php | 2 +- modules/graphvisifire/visifire/index.php | 2 +- .../graphxmlswfcharts/graphxmlswfcharts.php | 2 +- modules/graphxmlswfcharts/index.php | 2 +- .../xml_swf_charts/charts_library/index.php | 2 +- .../xml_swf_charts/index.php | 2 +- modules/gridhtml/gridhtml.php | 2 +- modules/gridhtml/index.php | 2 +- modules/gsitemap/gsitemap.php | 4 +- modules/gsitemap/index.php | 4 +- modules/homefeatured/homefeatured.php | 2 +- modules/homefeatured/homefeatured.tpl | 2 +- modules/homefeatured/index.php | 2 +- modules/homeslider/HomeSlide.php | 2 +- modules/homeslider/ajax_homeslider.php | 2 +- modules/homeslider/homeslider.php | 2 +- modules/homeslider/homeslider.tpl | 2 +- modules/homeslider/index.php | 2 +- modules/homeslider/js/homeslider.js | 2 +- modules/importerosc/importerosc.php | 4 +- modules/importerosc/index.php | 4 +- modules/index.php | 4 +- modules/loyalty/LoyaltyModule.php | 4 +- modules/loyalty/LoyaltyStateModule.php | 4 +- modules/loyalty/controllers/front/default.php | 4 +- modules/loyalty/index.php | 4 +- modules/loyalty/loyalty-program.php | 4 +- modules/loyalty/loyalty.php | 4 +- .../loyalty/views/templates/front/loyalty.tpl | 4 +- .../views/templates/hook/my-account.tpl | 4 +- .../loyalty/views/templates/hook/product.tpl | 4 +- .../views/templates/hook/shopping-cart.tpl | 4 +- modules/mailalerts/MailAlert.php | 2 +- .../mailalerts/controllers/front/account.php | 2 +- .../mailalerts/controllers/front/actions.php | 2 +- modules/mailalerts/img/index.php | 2 +- modules/mailalerts/index.php | 2 +- modules/mailalerts/mailalerts-account.php | 2 +- modules/mailalerts/mailalerts-ajax.php | 2 +- modules/mailalerts/mailalerts-extra.php | 2 +- modules/mailalerts/mailalerts.php | 2 +- modules/mailalerts/mails/de/index.php | 2 +- modules/mailalerts/mails/en/index.php | 2 +- modules/mailalerts/mails/es/index.php | 2 +- modules/mailalerts/mails/fr/index.php | 2 +- modules/mailalerts/mails/index.php | 2 +- modules/mailalerts/mails/it/index.php | 2 +- .../templates/front/mailalerts-account.tpl | 2 +- .../views/templates/front/my-account.tpl | 2 +- .../views/templates/front/product.tpl | 2 +- modules/newsletter/index.php | 4 +- modules/newsletter/newsletter.php | 4 +- modules/pagesnotfound/index.php | 4 +- modules/pagesnotfound/pagesnotfound.php | 4 +- modules/productcomments/ProductComment.php | 4 +- .../ProductCommentCriterion.php | 4 +- modules/productcomments/ProductCriterion.php | 4 +- modules/productcomments/img/index.php | 4 +- modules/productcomments/index.php | 4 +- modules/productcomments/js/index.php | 4 +- modules/productcomments/js/moderate.js | 4 +- .../productcomments/js/productCriterion.js | 4 +- .../productcomments/js/products-comparison.js | 4 +- .../productcomments/productcomments-ajax.php | 4 +- .../productcomments/productcomments-extra.tpl | 4 +- modules/productcomments/productcomments.php | 4 +- modules/productcomments/productcomments.tpl | 4 +- .../productcommentscriterion.php | 4 +- .../productcomments/products-comparison.tpl | 4 +- modules/productcomments/tab.tpl | 4 +- modules/productscategory/img/index.php | 2 +- modules/productscategory/index.php | 2 +- modules/productscategory/productscategory.js | 2 +- modules/productscategory/productscategory.php | 2 +- modules/productscategory/productscategory.tpl | 2 +- modules/producttooltip/index.php | 2 +- modules/producttooltip/producttooltip.php | 2 +- modules/producttooltip/producttooltip.tpl | 2 +- .../referralprogram/ReferralProgramModule.php | 4 +- modules/referralprogram/authentication.tpl | 4 +- modules/referralprogram/index.php | 4 +- modules/referralprogram/mails/de/index.php | 4 +- modules/referralprogram/mails/en/index.php | 4 +- modules/referralprogram/mails/es/index.php | 4 +- modules/referralprogram/mails/fr/index.php | 4 +- modules/referralprogram/mails/index.php | 4 +- modules/referralprogram/mails/it/index.php | 4 +- modules/referralprogram/my-account.tpl | 4 +- .../referralprogram/order-confirmation.tpl | 4 +- modules/referralprogram/preview-email.php | 4 +- .../referralprogram-program.php | 4 +- .../referralprogram-program.tpl | 4 +- .../referralprogram/referralprogram-rules.php | 4 +- .../referralprogram/referralprogram-rules.tpl | 4 +- modules/referralprogram/referralprogram.php | 4 +- modules/referralprogram/shopping-cart.tpl | 4 +- modules/sekeywords/index.php | 2 +- modules/sekeywords/sekeywords.php | 2 +- modules/sendtoafriend/index.php | 4 +- modules/sendtoafriend/mails/de/index.php | 4 +- modules/sendtoafriend/mails/en/index.php | 4 +- modules/sendtoafriend/mails/es/index.php | 4 +- modules/sendtoafriend/mails/fr/index.php | 4 +- modules/sendtoafriend/mails/index.php | 4 +- modules/sendtoafriend/mails/it/index.php | 4 +- modules/sendtoafriend/product_page.tpl | 4 +- modules/sendtoafriend/sendtoafriend-extra.tpl | 4 +- modules/sendtoafriend/sendtoafriend-form.php | 4 +- modules/sendtoafriend/sendtoafriend.php | 4 +- modules/sendtoafriend/sendtoafriend.tpl | 4 +- modules/sendtoafriend/sendtoafriend_ajax.php | 4 +- modules/shopimporter/img/index.php | 4 +- modules/shopimporter/index.php | 4 +- modules/shopimporter/shopimporter.php | 4 +- modules/statsbestcategories/index.php | 4 +- .../statsbestcategories.php | 4 +- modules/statsbestcustomers/index.php | 4 +- .../statsbestcustomers/statsbestcustomers.php | 4 +- modules/statsbestmanufacturers/index.php | 4 +- .../statsbestmanufacturers.php | 4 +- modules/statsbestproducts/index.php | 2 +- .../statsbestproducts/statsbestproducts.php | 2 +- modules/statsbestsuppliers/index.php | 2 +- .../statsbestsuppliers/statsbestsuppliers.php | 2 +- modules/statsbestvouchers/index.php | 4 +- .../statsbestvouchers/statsbestvouchers.php | 4 +- modules/statscarrier/index.php | 4 +- modules/statscarrier/statscarrier.php | 4 +- modules/statscatalog/index.php | 4 +- modules/statscatalog/statscatalog.php | 4 +- modules/statscheckup/index.php | 4 +- modules/statscheckup/statscheckup.php | 4 +- modules/statsdata/index.php | 2 +- modules/statsdata/statsdata.php | 2 +- modules/statsequipment/index.php | 2 +- modules/statsequipment/statsequipment.php | 2 +- modules/statsforecast/index.php | 2 +- modules/statsforecast/statsforecast.php | 2 +- modules/statsgeolocation/config.php | 4 +- modules/statsgeolocation/drawer.php | 4 +- modules/statsgeolocation/img/index.php | 4 +- modules/statsgeolocation/index.php | 4 +- modules/statsgeolocation/statsgeolocation.js | 4 +- modules/statsgeolocation/statsgeolocation.php | 4 +- modules/statslive/index.php | 4 +- modules/statslive/statslive.php | 16 ++-- modules/statsnewsletter/index.php | 4 +- modules/statsnewsletter/statsnewsletter.php | 4 +- modules/statsorigin/index.php | 4 +- modules/statsorigin/statsorigin.php | 4 +- modules/statspersonalinfos/index.php | 2 +- .../statspersonalinfos/statspersonalinfos.php | 2 +- modules/statsproduct/index.php | 4 +- modules/statsproduct/statsproduct.php | 4 +- modules/statsregistrations/index.php | 4 +- .../statsregistrations/statsregistrations.php | 4 +- modules/statssales/index.php | 4 +- modules/statssales/statssales.php | 4 +- modules/statssearch/index.php | 4 +- modules/statssearch/statssearch.php | 4 +- modules/statsstock/index.php | 4 +- modules/statsstock/statsstock.php | 4 +- modules/statsvisits/index.php | 4 +- modules/statsvisits/statsvisits.php | 4 +- modules/themeinstallator/export/index.php | 4 +- modules/themeinstallator/import/index.php | 4 +- modules/themeinstallator/index.php | 4 +- modules/themeinstallator/themeinstallator.js | 4 +- modules/themeinstallator/themeinstallator.php | 4 +- modules/trackingfront/account.tpl | 2 +- modules/trackingfront/footer.tpl | 2 +- modules/trackingfront/header.tpl | 2 +- modules/trackingfront/index.php | 2 +- modules/trackingfront/login.tpl | 2 +- modules/trackingfront/stats.php | 2 +- modules/trackingfront/trackingfront.php | 2 +- modules/vatnumber/VATNumberTaxManager.php | 2 +- modules/vatnumber/ajax.php | 2 +- modules/vatnumber/index.php | 2 +- modules/vatnumber/vatnumber.php | 2 +- modules/watermark/index.php | 2 +- modules/watermark/watermark.php | 2 +- my-account.php | 4 +- new-products.php | 4 +- order-confirmation.php | 4 +- order-detail.php | 4 +- order-follow.php | 4 +- order-opc.php | 4 +- order-return.php | 4 +- order-slip.php | 4 +- order.php | 4 +- override/classes/_Hook.php | 4 +- override/classes/_ObjectModel.php | 2 +- override/classes/_Tools.php | 2 +- override/classes/controller/_Controller.php | 11 +-- override/classes/db/_Db.php | 4 +- override/classes/exception/index.php | 4 +- override/classes/index.php | 4 +- override/classes/webservice/index.php | 4 +- override/controllers/front/index.php | 4 +- override/controllers/index.php | 4 +- override/index.php | 4 +- password.php | 4 +- pdf-invoice.php | 4 +- pdf-order-return.php | 4 +- pdf-order-slip.php | 4 +- prices-drop.php | 4 +- product-sort.php | 4 +- product.php | 4 +- products-comparison.php | 4 +- search.php | 4 +- sitemap.php | 4 +- statistics.php | 4 +- stores.php | 4 +- supplier.php | 4 +- themes/debug.tpl | 4 +- themes/default/404.tpl | 7 +- themes/default/address.tpl | 4 +- themes/default/addresses.tpl | 4 +- themes/default/authentication.tpl | 4 +- themes/default/best-sales.tpl | 4 +- themes/default/breadcrumb.tpl | 4 +- themes/default/cache/index.php | 4 +- themes/default/category-cms-tree-branch.tpl | 4 +- themes/default/category-count.tpl | 4 +- themes/default/category-tree-branch.tpl | 4 +- themes/default/category.tpl | 4 +- themes/default/cms.tpl | 4 +- themes/default/contact-form.tpl | 4 +- themes/default/discount.tpl | 4 +- themes/default/errors.tpl | 4 +- themes/default/footer.tpl | 4 +- themes/default/guest-tracking.tpl | 4 +- themes/default/header.tpl | 4 +- themes/default/history.tpl | 4 +- themes/default/identity.tpl | 4 +- themes/default/img/icon/index.php | 4 +- themes/default/img/index.php | 4 +- themes/default/img/jquery/index.php | 4 +- themes/default/index.php | 4 +- themes/default/index.tpl | 4 +- themes/default/js/_product.js | 4 +- themes/default/js/cart-summary.js | 4 +- themes/default/js/cms.js | 4 +- themes/default/js/history.js | 4 +- themes/default/js/order-address.js | 4 +- themes/default/js/order-opc.js | 4 +- themes/default/js/product.js | 4 +- themes/default/js/products-comparison.js | 4 +- themes/default/js/scenes.js | 4 +- themes/default/js/stores.js | 4 +- themes/default/js/tools.js | 4 +- themes/default/lang/index.php | 4 +- themes/default/layout.tpl | 4 +- themes/default/maintenance.tpl | 4 +- themes/default/manufacturer-list.tpl | 4 +- themes/default/manufacturer.tpl | 4 +- themes/default/my-account.tpl | 4 +- themes/default/nbr-product-page.tpl | 4 +- themes/default/new-products.tpl | 4 +- .../order-address-multishipping-products.tpl | 4 +- .../default/order-address-multishipping.tpl | 4 +- themes/default/order-address-product-line.tpl | 4 +- themes/default/order-address.tpl | 4 +- themes/default/order-carrier.tpl | 37 ++------- themes/default/order-confirmation.tpl | 4 +- themes/default/order-detail.tpl | 4 +- themes/default/order-follow.tpl | 4 +- themes/default/order-opc.tpl | 4 +- themes/default/order-payment.tpl | 4 +- themes/default/order-return.tpl | 4 +- themes/default/order-slip.tpl | 4 +- themes/default/order-steps.tpl | 4 +- themes/default/pagination.tpl | 4 +- themes/default/password.tpl | 4 +- themes/default/pdf/delivery-slip.tpl | 4 +- themes/default/pdf/footer.tpl | 4 +- themes/default/pdf/header.tpl | 4 +- themes/default/pdf/invoice-b2b.tpl | 4 +- themes/default/pdf/invoice.tax-tab.tpl | 4 +- themes/default/pdf/invoice.tpl | 4 +- themes/default/pdf/order-return.tpl | 4 +- themes/default/pdf/order-slip.tpl | 4 +- themes/default/pdf/supply-order-footer.tpl | 4 +- themes/default/pdf/supply-order-header.tpl | 4 +- themes/default/pdf/supply-order.tpl | 4 +- themes/default/prices-drop.tpl | 4 +- themes/default/product-compare.tpl | 4 +- themes/default/product-list.tpl | 4 +- themes/default/product-sort.tpl | 4 +- themes/default/product.tpl | 4 +- themes/default/products-comparison.tpl | 4 +- themes/default/restricted-country.tpl | 4 +- themes/default/scenes.tpl | 4 +- themes/default/search.tpl | 4 +- themes/default/shopping-cart-product-line.tpl | 4 +- themes/default/shopping-cart.tpl | 4 +- themes/default/sitemap.tpl | 4 +- themes/default/store_infos.tpl | 4 +- themes/default/stores.tpl | 4 +- themes/default/supplier-list.tpl | 4 +- themes/default/supplier.tpl | 4 +- themes/index.php | 4 +- themes/live_edit.tpl | 4 +- tools/geoip/index.php | 2 +- tools/js_minify/index.php | 2 +- tools/json/index.php | 2 +- tools/minify_html/index.php | 2 +- tools/parser_sql/index.php | 2 +- tools/pclzip/index.php | 2 +- tools/pear/index.php | 2 +- tools/taasc/index.php | 2 +- tools/tar/index.php | 2 +- webservice/dispatcher.php | 2 +- webservice/index.php | 2 +- 1327 files changed, 2312 insertions(+), 2353 deletions(-) diff --git a/404.php b/404.php index 52e1b4d6f06..9e74447ebde 100644 --- a/404.php +++ b/404.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/address.php b/address.php index b5d9f7f38e0..a1f59b39ad3 100644 --- a/address.php +++ b/address.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 7104 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/addresses.php b/addresses.php index 094da533356..e2faabeea2e 100644 --- a/addresses.php +++ b/addresses.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 7104 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajax-tab.php b/admin-dev/ajax-tab.php index 62f69e8e186..c92a2383d72 100755 --- a/admin-dev/ajax-tab.php +++ b/admin-dev/ajax-tab.php @@ -19,7 +19,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php index ca37596956e..ccd348ee722 100644 --- a/admin-dev/ajax.php +++ b/admin-dev/ajax.php @@ -19,7 +19,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 7234 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajax_products_list.php b/admin-dev/ajax_products_list.php index 7cddaf7deee..0c1b1b40072 100644 --- a/admin-dev/ajax_products_list.php +++ b/admin-dev/ajax_products_list.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajax_send_mail_test.php b/admin-dev/ajax_send_mail_test.php index 18baa3da6fb..160309c584d 100644 --- a/admin-dev/ajax_send_mail_test.php +++ b/admin-dev/ajax_send_mail_test.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/inc/index.php b/admin-dev/ajaxfilemanager/inc/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/inc/index.php +++ b/admin-dev/ajaxfilemanager/inc/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/index.php b/admin-dev/ajaxfilemanager/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/index.php +++ b/admin-dev/ajaxfilemanager/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php b/admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/jscripts/edit_area/index.php b/admin-dev/ajaxfilemanager/jscripts/edit_area/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/jscripts/edit_area/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/edit_area/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php b/admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/jscripts/edit_area/reg_syntax/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/edit_area/reg_syntax/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/jscripts/index.php b/admin-dev/ajaxfilemanager/jscripts/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/jscripts/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/langs/index.php b/admin-dev/ajaxfilemanager/langs/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/langs/index.php +++ b/admin-dev/ajaxfilemanager/langs/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/session/index.php b/admin-dev/ajaxfilemanager/session/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/session/index.php +++ b/admin-dev/ajaxfilemanager/session/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/theme/default/css/index.php b/admin-dev/ajaxfilemanager/theme/default/css/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/theme/default/css/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/css/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/theme/default/images/action/index.php b/admin-dev/ajaxfilemanager/theme/default/images/action/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/action/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/action/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/big_icon/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/big_icon/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/file_type/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/file_type/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/theme/default/images/index.php b/admin-dev/ajaxfilemanager/theme/default/images/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/theme/default/images/pagination/index.php b/admin-dev/ajaxfilemanager/theme/default/images/pagination/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/pagination/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/pagination/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/theme/default/images/standard/index.php b/admin-dev/ajaxfilemanager/theme/default/images/standard/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/standard/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/standard/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/theme/default/index.php b/admin-dev/ajaxfilemanager/theme/default/index.php index b01a65b25b4..d377b4cba72 100644 --- a/admin-dev/ajaxfilemanager/theme/default/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/ajaxfilemanager/theme/index.php b/admin-dev/ajaxfilemanager/theme/index.php index b01a65b25b4..d377b4cba72 100644 --- a/admin-dev/ajaxfilemanager/theme/index.php +++ b/admin-dev/ajaxfilemanager/theme/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/backup.php b/admin-dev/backup.php index 9953c15e5af..97d588ff9ed 100644 --- a/admin-dev/backup.php +++ b/admin-dev/backup.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/backups/index.php b/admin-dev/backups/index.php index adc944f1ccf..60bc2ce2774 100644 --- a/admin-dev/backups/index.php +++ b/admin-dev/backups/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/cron_currency_rates.php b/admin-dev/cron_currency_rates.php index c71e6697e62..0e83921a705 100644 --- a/admin-dev/cron_currency_rates.php +++ b/admin-dev/cron_currency_rates.php @@ -19,7 +19,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/csv.php b/admin-dev/csv.php index 0dfc5aca77c..4c645ea3e80 100644 --- a/admin-dev/csv.php +++ b/admin-dev/csv.php @@ -19,7 +19,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/displayImage.php b/admin-dev/displayImage.php index 133fe91a766..2a2cfda2f56 100644 --- a/admin-dev/displayImage.php +++ b/admin-dev/displayImage.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/drawer.php b/admin-dev/drawer.php index e81b1cb275c..c7432093d6a 100644 --- a/admin-dev/drawer.php +++ b/admin-dev/drawer.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6883 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/export/index.php b/admin-dev/export/index.php index adc944f1ccf..60bc2ce2774 100644 --- a/admin-dev/export/index.php +++ b/admin-dev/export/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/footer.inc.php b/admin-dev/footer.inc.php index 8c654413a20..94f238f9b72 100644 --- a/admin-dev/footer.inc.php +++ b/admin-dev/footer.inc.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/functions.php b/admin-dev/functions.php index 3ec961410ba..87f0c27f7c0 100644 --- a/admin-dev/functions.php +++ b/admin-dev/functions.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 7383 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/get-file-admin.php b/admin-dev/get-file-admin.php index 4c43f73a745..8692b266e21 100644 --- a/admin-dev/get-file-admin.php +++ b/admin-dev/get-file-admin.php @@ -19,7 +19,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/grider.php b/admin-dev/grider.php index a808b560b24..01208917514 100644 --- a/admin-dev/grider.php +++ b/admin-dev/grider.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/header.inc.php b/admin-dev/header.inc.php index 60b4efa0cf5..41f8e7b338e 100644 --- a/admin-dev/header.inc.php +++ b/admin-dev/header.inc.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 7048 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/import/index.php b/admin-dev/import/index.php index adc944f1ccf..60bc2ce2774 100644 --- a/admin-dev/import/index.php +++ b/admin-dev/import/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/index.php b/admin-dev/index.php index a8e25d89af0..2f854389355 100644 --- a/admin-dev/index.php +++ b/admin-dev/index.php @@ -19,7 +19,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 7451 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/init.php b/admin-dev/init.php index 60c067a7d08..efe822ee49e 100644 --- a/admin-dev/init.php +++ b/admin-dev/init.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 7227 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/login.php b/admin-dev/login.php index c5f6d4af8a1..6d0d746c0c8 100644 --- a/admin-dev/login.php +++ b/admin-dev/login.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/password.php b/admin-dev/password.php index fda1f934bac..b32d5779b81 100644 --- a/admin-dev/password.php +++ b/admin-dev/password.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 7310 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/pdf.php b/admin-dev/pdf.php index f6b1d3c61d7..4c2fffb6974 100644 --- a/admin-dev/pdf.php +++ b/admin-dev/pdf.php @@ -19,7 +19,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/searchcron.php b/admin-dev/searchcron.php index 805bb00996d..1677bd33d6b 100644 --- a/admin-dev/searchcron.php +++ b/admin-dev/searchcron.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/tabs/index.php b/admin-dev/tabs/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/tabs/index.php +++ b/admin-dev/tabs/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/css/index.php b/admin-dev/themes/default/css/index.php index 52e77fd425f..20a9e8b6f87 100755 --- a/admin-dev/themes/default/css/index.php +++ b/admin-dev/themes/default/css/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8667 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/img/index.php b/admin-dev/themes/default/img/index.php index 52e77fd425f..20a9e8b6f87 100755 --- a/admin-dev/themes/default/img/index.php +++ b/admin-dev/themes/default/img/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8667 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/index.php b/admin-dev/themes/default/index.php index 3d4820f798b..c0c4a31bb26 100644 --- a/admin-dev/themes/default/index.php +++ b/admin-dev/themes/default/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/content.tpl b/admin-dev/themes/default/template/content.tpl index c3a4a862248..210d4689f9b 100644 --- a/admin-dev/themes/default/template/content.tpl +++ b/admin-dev/themes/default/template/content.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 0d9f034da2f..ea10002537c 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/accounting_export/common_form.tpl b/admin-dev/themes/default/template/controllers/accounting_export/common_form.tpl index 42b5cf100ac..cb299a728ef 100644 --- a/admin-dev/themes/default/template/controllers/accounting_export/common_form.tpl +++ b/admin-dev/themes/default/template/controllers/accounting_export/common_form.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/accounting_export/global_export.tpl b/admin-dev/themes/default/template/controllers/accounting_export/global_export.tpl index 9b4caa400ed..10d40bcb319 100644 --- a/admin-dev/themes/default/template/controllers/accounting_export/global_export.tpl +++ b/admin-dev/themes/default/template/controllers/accounting_export/global_export.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/accounting_export/menu.tpl b/admin-dev/themes/default/template/controllers/accounting_export/menu.tpl index 91960a258b2..c670312ffa2 100644 --- a/admin-dev/themes/default/template/controllers/accounting_export/menu.tpl +++ b/admin-dev/themes/default/template/controllers/accounting_export/menu.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/accounting_export/reconciliation_export.tpl b/admin-dev/themes/default/template/controllers/accounting_export/reconciliation_export.tpl index d766c7af127..04b4d49c84a 100644 --- a/admin-dev/themes/default/template/controllers/accounting_export/reconciliation_export.tpl +++ b/admin-dev/themes/default/template/controllers/accounting_export/reconciliation_export.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/accounting_management/content.tpl b/admin-dev/themes/default/template/controllers/accounting_management/content.tpl index 779002521a0..a8bcc79d6d9 100644 --- a/admin-dev/themes/default/template/controllers/accounting_management/content.tpl +++ b/admin-dev/themes/default/template/controllers/accounting_management/content.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/addons_catalog/content.tpl b/admin-dev/themes/default/template/controllers/addons_catalog/content.tpl index c3230d3f2fa..4f272029c99 100644 --- a/admin-dev/themes/default/template/controllers/addons_catalog/content.tpl +++ b/admin-dev/themes/default/template/controllers/addons_catalog/content.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/addons_my_account/content.tpl b/admin-dev/themes/default/template/controllers/addons_my_account/content.tpl index af257dc861c..d551215c395 100644 --- a/admin-dev/themes/default/template/controllers/addons_my_account/content.tpl +++ b/admin-dev/themes/default/template/controllers/addons_my_account/content.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 cf3366eb38e..b73c3ffe03a 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 44009c0c173..9400b6a9ab9 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 10891 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 70e34eb9400..3bb9efce30f 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9197 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 23e72455d1b..32f81af73f8 100644 --- a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl +++ b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 1e00b45300a..4f2af17cfa1 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 4af6587d86c..22949a51b87 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9608 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 649f8d33cdb..edc9df86f0e 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 5be2587151a..ffe48dd3268 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 e762a421962..affaa126f55 100644 --- a/admin-dev/themes/default/template/controllers/backup/download/view.tpl +++ b/admin-dev/themes/default/template/controllers/backup/download/view.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 ed17b05e108..34108870812 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9639 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 5002aa1a21b..7f5191f7ee4 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 075879a0810..2fab7894fdd 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 cfd221c8618..4a1eb4b7b12 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/form.js +++ b/admin-dev/themes/default/template/controllers/cart_rules/form.js @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 6844 $ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 241c8166226..dd10545951a 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9596 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 f238476bdd5..d30c38b4b57 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 254476b914d..8bb8d6e6700 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 642ce204b3e..155608c2c24 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 022a4a37a7e..b13bd9d98b2 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 093fdcd8ae4..8902331f299 100644 --- a/admin-dev/themes/default/template/controllers/cms_content/content.tpl +++ b/admin-dev/themes/default/template/controllers/cms_content/content.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 cb6a9db0b87..5258a3787e2 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 14d2e32fa19..676ec0e27b4 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9432 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 a3595d2a961..efa8dd2d62b 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9639 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 75eb6f9b49a..bc11efa6374 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 b3ce2ca23fe..50f7ee108bc 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8897 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 b1b966b5f9e..71f9db1cfc9 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/message.tpl +++ b/admin-dev/themes/default/template/controllers/customer_threads/message.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8897 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 812158501ad..fbd8a46ec00 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 10891 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 b487987bb99..46a3e0a9fab 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/db/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/db/helpers/form/form.tpl index 7e79520fe86..dc390fa91cb 100644 --- a/admin-dev/themes/default/template/controllers/db/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/db/helpers/form/form.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/emails/content.tpl b/admin-dev/themes/default/template/controllers/emails/content.tpl index 488984fd91e..640f3992533 100644 --- a/admin-dev/themes/default/template/controllers/emails/content.tpl +++ b/admin-dev/themes/default/template/controllers/emails/content.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 b34a1e3a927..4813164248f 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 55cd2365c59..654ec92218b 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 f9d06ae920c..46d6a791ab3 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/generator/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/generator/helpers/options/options.tpl index 5f9edebec10..cd2269afa3c 100644 --- a/admin-dev/themes/default/template/controllers/generator/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/generator/helpers/options/options.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/controllers/geolocation/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl index 3b6806a9590..76c370a5f42 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/group_shop/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/group_shop/helpers/form/form.tpl index ee7520d2eac..db0e476c08d 100644 --- a/admin-dev/themes/default/template/controllers/group_shop/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/group_shop/helpers/form/form.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 a66e413bbfe..3fe9a236dcf 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 2717b740aea..d026f391b33 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9596 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/home/content.tpl b/admin-dev/themes/default/template/controllers/home/content.tpl index c8a97c93919..7e4f60c2873 100644 --- a/admin-dev/themes/default/template/controllers/home/content.tpl +++ b/admin-dev/themes/default/template/controllers/home/content.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/home/optimizationTips.tpl b/admin-dev/themes/default/template/controllers/home/optimizationTips.tpl index 55d51ed4664..a99f7604d65 100644 --- a/admin-dev/themes/default/template/controllers/home/optimizationTips.tpl +++ b/admin-dev/themes/default/template/controllers/home/optimizationTips.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/images/content.tpl b/admin-dev/themes/default/template/controllers/images/content.tpl index 58cd2bac39a..b47e7d050a7 100644 --- a/admin-dev/themes/default/template/controllers/images/content.tpl +++ b/admin-dev/themes/default/template/controllers/images/content.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 3a84cf9055b..6fd450d21e5 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 b76f94ad3bf..7201f0394db 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 a6908271ecc..b27a74f7fe1 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8897 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 9a40b027671..10a5f659a10 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 47a07e9d582..1c3d1bf4651 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl index 51d5e82ef3d..6929977cbd7 100755 --- a/admin-dev/themes/default/template/controllers/login/content.tpl +++ b/admin-dev/themes/default/template/controllers/login/content.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/logs/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl index 125f669edb6..92297a6e868 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9639 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 17a837710f0..af7af0f7914 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/modules/content.tpl b/admin-dev/themes/default/template/controllers/modules/content.tpl index 88a8f13da0b..0a8cdc15e9f 100644 --- a/admin-dev/themes/default/template/controllers/modules/content.tpl +++ b/admin-dev/themes/default/template/controllers/modules/content.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 9892226e931..b1e90762488 100644 --- a/admin-dev/themes/default/template/controllers/modules/filters.tpl +++ b/admin-dev/themes/default/template/controllers/modules/filters.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 bd9dad08159..9c3d7d5bf9e 100644 --- a/admin-dev/themes/default/template/controllers/modules/header.tpl +++ b/admin-dev/themes/default/template/controllers/modules/header.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/js.tpl b/admin-dev/themes/default/template/controllers/modules/js.tpl index 77328578fb8..b85d3742401 100644 --- a/admin-dev/themes/default/template/controllers/modules/js.tpl +++ b/admin-dev/themes/default/template/controllers/modules/js.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/list.tpl b/admin-dev/themes/default/template/controllers/modules/list.tpl index aca0c350283..857df17295e 100644 --- a/admin-dev/themes/default/template/controllers/modules/list.tpl +++ b/admin-dev/themes/default/template/controllers/modules/list.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/page.tpl b/admin-dev/themes/default/template/controllers/modules/page.tpl index 1bacda9b385..6370f635b18 100644 --- a/admin-dev/themes/default/template/controllers/modules/page.tpl +++ b/admin-dev/themes/default/template/controllers/modules/page.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 3d19a14612b..578d2582f00 100644 --- a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl +++ b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 163356627bf..dc10217b870 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 8e4ec323aae..d159cdbfc78 100644 --- a/admin-dev/themes/default/template/controllers/not_found/content.tpl +++ b/admin-dev/themes/default/template/controllers/not_found/content.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 7e27d51a3ae..a5a6de31d8d 100755 --- a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 79341e5dc51..3160e8c187f 100644 --- a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 7c43aae7d13..2b3bee1c6fe 100644 --- a/admin-dev/themes/default/template/controllers/orders/_documents.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_documents.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 0e22f0d09ed..0bfde51fc4b 100644 --- a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 6a8d68d9295..ca2c4f2daf7 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 5668d89a340..214d40278c7 100755 --- a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl index 256b1ac5e53..d91b4f35033 100644 --- a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 5c58641e3b8..e057cf1c684 100755 --- a/admin-dev/themes/default/template/controllers/orders/form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/form.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 4a971eb1693..57a7643f6a9 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA @@ -192,12 +192,6 @@
-
- {l s='Orders'} : - {if $previousOrder}{l s='< Prev'}{/if} - {if $nextOrder}{l s='Next >'}{/if} -
-
{l s='Documents'} @@ -570,7 +564,7 @@ {l s='tax included.'} {/if} - {if !Configuration::get('PS_ORDER_RETURN')} + {if Configuration::get('PS_ORDER_RETURN')}

{l s='Merchandise returns are disabled'} {/if}
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 d68a89acc51..46df6d03454 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/payment/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl index 4acbd38ab70..cf79bb8bc6f 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/restrictions.tpl b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl index 516f40246df..60ac3cff8d1 100644 --- a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl +++ b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 53b123ff0ca..0b6d5546c9f 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/preferences/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/preferences/helpers/options/options.tpl index f5241a44281..bdd9b54518f 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/products/accounting.tpl b/admin-dev/themes/default/template/controllers/products/accounting.tpl index 464dc84cdd7..f3a8edc84e1 100644 --- a/admin-dev/themes/default/template/controllers/products/accounting.tpl +++ b/admin-dev/themes/default/template/controllers/products/accounting.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/associations.tpl b/admin-dev/themes/default/template/controllers/products/associations.tpl index e52dfa8cbca..e1c07817aa8 100644 --- a/admin-dev/themes/default/template/controllers/products/associations.tpl +++ b/admin-dev/themes/default/template/controllers/products/associations.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/products/attachments.tpl b/admin-dev/themes/default/template/controllers/products/attachments.tpl index 1398afebf68..bb06ff33a95 100644 --- a/admin-dev/themes/default/template/controllers/products/attachments.tpl +++ b/admin-dev/themes/default/template/controllers/products/attachments.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 04fd32da1f1..674c3f31227 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl index 27291327a95..43f96261e18 100644 --- a/admin-dev/themes/default/template/controllers/products/combinations.tpl +++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/products/customization.tpl b/admin-dev/themes/default/template/controllers/products/customization.tpl index b71bf6a3b59..8d24b2e7394 100644 --- a/admin-dev/themes/default/template/controllers/products/customization.tpl +++ b/admin-dev/themes/default/template/controllers/products/customization.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/products/features.tpl b/admin-dev/themes/default/template/controllers/products/features.tpl index 527b625ff30..a396625643b 100644 --- a/admin-dev/themes/default/template/controllers/products/features.tpl +++ b/admin-dev/themes/default/template/controllers/products/features.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 96c3d7154c2..6ba978e4b30 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 f874ee77bd7..42717ce691d 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/products/images.tpl b/admin-dev/themes/default/template/controllers/products/images.tpl index a42b19bf6ba..da91bb2cccb 100644 --- a/admin-dev/themes/default/template/controllers/products/images.tpl +++ b/admin-dev/themes/default/template/controllers/products/images.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl index 935b2649703..5ef144efb02 100644 --- a/admin-dev/themes/default/template/controllers/products/informations.tpl +++ b/admin-dev/themes/default/template/controllers/products/informations.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 ee506520433..a2a96ef8d48 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/products/pack.tpl b/admin-dev/themes/default/template/controllers/products/pack.tpl index 433599bdd4b..3223e249223 100644 --- a/admin-dev/themes/default/template/controllers/products/pack.tpl +++ b/admin-dev/themes/default/template/controllers/products/pack.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 446de022983..01c056477cd 100644 --- a/admin-dev/themes/default/template/controllers/products/prices.tpl +++ b/admin-dev/themes/default/template/controllers/products/prices.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/products/quantities.tpl b/admin-dev/themes/default/template/controllers/products/quantities.tpl index f0b1c2f218e..54a477fa5d8 100644 --- a/admin-dev/themes/default/template/controllers/products/quantities.tpl +++ b/admin-dev/themes/default/template/controllers/products/quantities.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 9e665977415..e5f4c575999 100644 --- a/admin-dev/themes/default/template/controllers/products/seo.tpl +++ b/admin-dev/themes/default/template/controllers/products/seo.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 24e5ab6bc54..e14b564f328 100644 --- a/admin-dev/themes/default/template/controllers/products/shipping.tpl +++ b/admin-dev/themes/default/template/controllers/products/shipping.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/products/suppliers.tpl b/admin-dev/themes/default/template/controllers/products/suppliers.tpl index 07ec2a06666..a2e9f5c62f3 100644 --- a/admin-dev/themes/default/template/controllers/products/suppliers.tpl +++ b/admin-dev/themes/default/template/controllers/products/suppliers.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 6666c03c4a5..fbfd2fcab17 100644 --- a/admin-dev/themes/default/template/controllers/products/textarea_lang.tpl +++ b/admin-dev/themes/default/template/controllers/products/textarea_lang.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl index 628fbfcb82a..39f908e4227 100644 --- a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl +++ b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 243af27c4ec..18ed103be6a 100644 --- a/admin-dev/themes/default/template/controllers/products/warehouses.tpl +++ b/admin-dev/themes/default/template/controllers/products/warehouses.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 ae82db79f4d..080bdde32c3 100644 --- a/admin-dev/themes/default/template/controllers/referrers/calendar.tpl +++ b/admin-dev/themes/default/template/controllers/referrers/calendar.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 24517d9de70..5548fa0b7f1 100644 --- a/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl +++ b/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 fa13228e3ed..4690080f1ce 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/list/list_header.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/list/list_header.tpl index 081831ec5db..834e5118460 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9639 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 8b042dcef32..86c34586946 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8897 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 4707f59a201..18ccf27c41e 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 23f612c1c6d..610a4b63418 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8897 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 f3df2af56ae..d3590535e27 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9197 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 c41966716a2..e1f35080625 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 a250b3fbf30..6d945c0fc32 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 fd8c2d59ce0..261142165f1 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9596 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/shipping/content.tpl b/admin-dev/themes/default/template/controllers/shipping/content.tpl index 634dd3ef618..9f987c54dbd 100644 --- a/admin-dev/themes/default/template/controllers/shipping/content.tpl +++ b/admin-dev/themes/default/template/controllers/shipping/content.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 fc85c407a7c..47f5e84323e 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 f55cebeb983..e485c3a5f7f 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9608 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 c22d3a413af..f04eb53b6b2 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 41a4bf87e8a..0f8779444df 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 b0d527f4909..fca904df897 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 14d2e32fa19..676ec0e27b4 100644 --- a/admin-dev/themes/default/template/controllers/states/list_footer.tpl +++ b/admin-dev/themes/default/template/controllers/states/list_footer.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9432 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/stats/calendar.tpl b/admin-dev/themes/default/template/controllers/stats/calendar.tpl index 4567ef1cbe0..1288fdb6b31 100644 --- a/admin-dev/themes/default/template/controllers/stats/calendar.tpl +++ b/admin-dev/themes/default/template/controllers/stats/calendar.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/stats/engines.tpl b/admin-dev/themes/default/template/controllers/stats/engines.tpl index 1927c793784..ac5892a2f5a 100644 --- a/admin-dev/themes/default/template/controllers/stats/engines.tpl +++ b/admin-dev/themes/default/template/controllers/stats/engines.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 70e4fa1b545..51cd83fe884 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8897 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/stats/menu.tpl b/admin-dev/themes/default/template/controllers/stats/menu.tpl index 633d3c2841f..b9d77e3b603 100644 --- a/admin-dev/themes/default/template/controllers/stats/menu.tpl +++ b/admin-dev/themes/default/template/controllers/stats/menu.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/controllers/stats/stats.tpl b/admin-dev/themes/default/template/controllers/stats/stats.tpl index fb78acf1f60..59e151ca1f6 100644 --- a/admin-dev/themes/default/template/controllers/stats/stats.tpl +++ b/admin-dev/themes/default/template/controllers/stats/stats.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8897 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 0f71c52cd7a..e91982c17c2 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 b4232ec3daf..5aeafdf77a2 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl index 0cf2062d76f..cba56233773 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl index 3c564633953..90ff60f5bda 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/stores/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl index 42497c83e6a..3ec141b8b1d 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 9e2e36b0cfb..4fbf8fc22a1 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 8f2e2e60d13..7dd4acb2e3b 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/list/list_header.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl index 97f11047420..18c9663319b 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 652915a1065..b8bdf3b16fa 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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_change_state/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl index 0c7f9c85e9a..107c595c01f 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA @@ -28,18 +28,6 @@ {block name="other_input"} {if isset($supply_order) && $supply_order->id > 0 && isset($supply_order_states)} - 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 1c0f651e3b8..4c467c53acd 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/tags/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/tags/helpers/form/form.tpl index a9b70e682f4..3a9d95aa854 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 996272646a6..409067fdb23 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 d4800df0a12..7bca5591837 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9197 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 4968de02bbc..c27db234e12 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9608 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 237fada6978..5ca79ab0b9d 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 54226011556..3a03f5063ef 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 4772b19e87f..64081ae7f18 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/tracking/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/tracking/helpers/list/list_header.tpl index a27bf65cdd2..7c94e91aac8 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 9639 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 2465ba7a6fd..24f175c20fa 100644 --- a/admin-dev/themes/default/template/controllers/translations/auto_translate.tpl +++ b/admin-dev/themes/default/template/controllers/translations/auto_translate.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 3d2c0acf49b..c2a5cf96b17 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 18be18469e7..796d7b54ec3 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 e04bd1dd119..125ce1e13d3 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 62b1b82bf0e..8d07dfdf448 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 4e4fa31e2da..56d1eea554c 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 b98136ff0f5..ca8b2df35e0 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 @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA 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 6d8cb21c395..600fd7838ab 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 @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/footer.tpl b/admin-dev/themes/default/template/footer.tpl index f120c517411..d6f7bc2ecf0 100644 --- a/admin-dev/themes/default/template/footer.tpl +++ b/admin-dev/themes/default/template/footer.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/form_submit_ajax.tpl b/admin-dev/themes/default/template/form_submit_ajax.tpl index 392826be762..4999bdadd79 100644 --- a/admin-dev/themes/default/template/form_submit_ajax.tpl +++ b/admin-dev/themes/default/template/form_submit_ajax.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl index 8ee06956cf0..5a8fac2f339 100644 --- a/admin-dev/themes/default/template/header.tpl +++ b/admin-dev/themes/default/template/header.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/helpers/form/assoshop.tpl b/admin-dev/themes/default/template/helpers/form/assoshop.tpl index 15a68b6a457..26d25158167 100644 --- a/admin-dev/themes/default/template/helpers/form/assoshop.tpl +++ b/admin-dev/themes/default/template/helpers/form/assoshop.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl index 0d216f9ee18..1f23170b724 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision: 8971 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA @@ -85,12 +85,12 @@ $('#'+input_id).tagify({addTagPrompt: '{/literal}{l s='Add tag'}{literal}'}); $({/literal}'#{$table}{literal}_form').submit( function() { $(this).find('#'+input_id).val($('#'+input_id).tagify('serialize')); - }); + }); }); {/literal} {/if} - {assign var='value_text' value=$fields_value[$input.name][$language.id_lang]} + {assign var='value_text' value=$fields_value[$input.name][$language.id_lang]} {/literal} {/if} - {assign var='value_text' value=$fields_value[$input.name]} + {assign var='value_text' value=$fields_value[$input.name]} $input.options.id} + {if $field_value == $option->$input.options.id + || empty($field_value) + && isset($input.options.preselect_country) + && isset($input.options.preselect_country) + && $option->$input.options.id == $default_country} selected="selected" {/if} {/foreach} {else} - {if $fields_value[$input.name] == $option->$input.options.id} + {if $fields_value[$input.name] == $option->$input.options.id + || empty($fields_value[$input.name]) + && isset($input.options.preselect_country) + && isset($input.options.preselect_country) + && $option->$input.options.id == $default_country} selected="selected" {/if} {/if} @@ -185,16 +193,25 @@ + {/if} {/foreach} {/if} @@ -210,15 +227,15 @@ {if $fields_value[$input.name] == $value.value}checked="checked"{/if} {if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} /> {if isset($input.br) && $input.br}
{/if} {if isset($value.p) && $value.p}

{$value.p}

{/if} @@ -270,20 +287,20 @@ + +

diff --git a/themes/default/address.tpl b/themes/default/address.tpl index b05e8ea471f..588cf57415c 100644 --- a/themes/default/address.tpl +++ b/themes/default/address.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 6f1f46c0f5b..58eebb3aed1 100644 --- a/themes/default/addresses.tpl +++ b/themes/default/addresses.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 03c3293d63e..2c0d480ae06 100644 --- a/themes/default/authentication.tpl +++ b/themes/default/authentication.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 f3c9ef5e056..1980d7f3371 100644 --- a/themes/default/best-sales.tpl +++ b/themes/default/best-sales.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 bc1296d251b..534383c5223 100644 --- a/themes/default/breadcrumb.tpl +++ b/themes/default/breadcrumb.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/cache/index.php b/themes/default/cache/index.php index dce6b30f55c..d377b4cba72 100644 --- a/themes/default/cache/index.php +++ b/themes/default/cache/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/themes/default/category-cms-tree-branch.tpl b/themes/default/category-cms-tree-branch.tpl index d97faacb4e4..7f6418a26fa 100644 --- a/themes/default/category-cms-tree-branch.tpl +++ b/themes/default/category-cms-tree-branch.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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-count.tpl b/themes/default/category-count.tpl index 540d732e881..37b5db1d56f 100644 --- a/themes/default/category-count.tpl +++ b/themes/default/category-count.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/themes/default/category-tree-branch.tpl b/themes/default/category-tree-branch.tpl index bc8fcad3e6c..0f5f60ceded 100644 --- a/themes/default/category-tree-branch.tpl +++ b/themes/default/category-tree-branch.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 e3fbedab8c9..360c6171471 100644 --- a/themes/default/category.tpl +++ b/themes/default/category.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 f95e8250944..31aabff5caa 100644 --- a/themes/default/cms.tpl +++ b/themes/default/cms.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 ca462f434b7..1af2848b441 100644 --- a/themes/default/contact-form.tpl +++ b/themes/default/contact-form.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/discount.tpl b/themes/default/discount.tpl index b03764c176e..dc8ee6b4bcc 100644 --- a/themes/default/discount.tpl +++ b/themes/default/discount.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 ba284a7c3f4..9ccce41f99e 100644 --- a/themes/default/errors.tpl +++ b/themes/default/errors.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 a68a47b2af9..70cf9b84096 100644 --- a/themes/default/footer.tpl +++ b/themes/default/footer.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 79eb3de8c24..116970fdbfb 100644 --- a/themes/default/guest-tracking.tpl +++ b/themes/default/guest-tracking.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 ed30cf51e86..6181cb25936 100644 --- a/themes/default/header.tpl +++ b/themes/default/header.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 38c12f1ff59..7c44702d6ce 100644 --- a/themes/default/history.tpl +++ b/themes/default/history.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 c5417a0d0ed..04db43a47b5 100644 --- a/themes/default/identity.tpl +++ b/themes/default/identity.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/img/icon/index.php b/themes/default/img/icon/index.php index 4e2611d37d5..c0c4a31bb26 100644 --- a/themes/default/img/icon/index.php +++ b/themes/default/img/icon/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/themes/default/img/index.php b/themes/default/img/index.php index 4e2611d37d5..c0c4a31bb26 100644 --- a/themes/default/img/index.php +++ b/themes/default/img/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/themes/default/img/jquery/index.php b/themes/default/img/jquery/index.php index 4e2611d37d5..c0c4a31bb26 100644 --- a/themes/default/img/jquery/index.php +++ b/themes/default/img/jquery/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/themes/default/index.php b/themes/default/index.php index 521586247a4..af505b65cc5 100644 --- a/themes/default/index.php +++ b/themes/default/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 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 319d97a786c..2689ca2e419 100644 --- a/themes/default/index.tpl +++ b/themes/default/index.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/_product.js b/themes/default/js/_product.js index 08c45395c81..ebb98aa029b 100644 --- a/themes/default/js/_product.js +++ b/themes/default/js/_product.js @@ -1,5 +1,5 @@ /* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/js/cart-summary.js b/themes/default/js/cart-summary.js index 61179306b31..3c2feca3b8f 100644 --- a/themes/default/js/cart-summary.js +++ b/themes/default/js/cart-summary.js @@ -1,5 +1,5 @@ /* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 0df9c878a30..890938df8d2 100644 --- a/themes/default/js/cms.js +++ b/themes/default/js/cms.js @@ -1,5 +1,5 @@ /* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 9ddb99db1f7..4329950be19 100644 --- a/themes/default/js/history.js +++ b/themes/default/js/history.js @@ -1,5 +1,5 @@ /* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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-address.js b/themes/default/js/order-address.js index 747ef137f6d..02eee48ea98 100644 --- a/themes/default/js/order-address.js +++ b/themes/default/js/order-address.js @@ -1,5 +1,5 @@ /* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 e16760dfc89..e0c4cb183af 100644 --- a/themes/default/js/order-opc.js +++ b/themes/default/js/order-opc.js @@ -1,5 +1,5 @@ /* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 031e5aedbca..982b1b8eded 100644 --- a/themes/default/js/product.js +++ b/themes/default/js/product.js @@ -1,5 +1,5 @@ /* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 ed4e4cc1c52..4aadcf5df64 100644 --- a/themes/default/js/products-comparison.js +++ b/themes/default/js/products-comparison.js @@ -1,5 +1,5 @@ /* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 970c039c74c..5c00d7d0a9f 100644 --- a/themes/default/js/scenes.js +++ b/themes/default/js/scenes.js @@ -1,5 +1,5 @@ /* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 c7f0d348845..12aa631a963 100644 --- a/themes/default/js/stores.js +++ b/themes/default/js/stores.js @@ -1,5 +1,5 @@ /* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 5fd3a3b17d4..84c64c48210 100644 --- a/themes/default/js/tools.js +++ b/themes/default/js/tools.js @@ -1,5 +1,5 @@ /* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/lang/index.php b/themes/default/lang/index.php index 4e2611d37d5..c0c4a31bb26 100644 --- a/themes/default/lang/index.php +++ b/themes/default/lang/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/themes/default/layout.tpl b/themes/default/layout.tpl index d24b3068c7b..7821fe3447c 100644 --- a/themes/default/layout.tpl +++ b/themes/default/layout.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/themes/default/maintenance.tpl b/themes/default/maintenance.tpl index 4e21729ab8d..34adbb7f9d6 100644 --- a/themes/default/maintenance.tpl +++ b/themes/default/maintenance.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 70432bb9915..0f60fd0577b 100644 --- a/themes/default/manufacturer-list.tpl +++ b/themes/default/manufacturer-list.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 facc923476e..6a7d0e1ee0d 100644 --- a/themes/default/manufacturer.tpl +++ b/themes/default/manufacturer.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/my-account.tpl b/themes/default/my-account.tpl index baf3b305b3a..739e7c7bf12 100644 --- a/themes/default/my-account.tpl +++ b/themes/default/my-account.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/nbr-product-page.tpl b/themes/default/nbr-product-page.tpl index 3f9c46da731..3af3d7f6c19 100644 --- a/themes/default/nbr-product-page.tpl +++ b/themes/default/nbr-product-page.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/themes/default/new-products.tpl b/themes/default/new-products.tpl index 6ea576810ae..f58d192b626 100644 --- a/themes/default/new-products.tpl +++ b/themes/default/new-products.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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-multishipping-products.tpl b/themes/default/order-address-multishipping-products.tpl index fb28f4738ec..769f4f56dea 100644 --- a/themes/default/order-address-multishipping-products.tpl +++ b/themes/default/order-address-multishipping-products.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/themes/default/order-address-multishipping.tpl b/themes/default/order-address-multishipping.tpl index 473a622d224..f1f09973c73 100644 --- a/themes/default/order-address-multishipping.tpl +++ b/themes/default/order-address-multishipping.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/themes/default/order-address-product-line.tpl b/themes/default/order-address-product-line.tpl index 4c3cf4f901c..236ac6a7f65 100644 --- a/themes/default/order-address-product-line.tpl +++ b/themes/default/order-address-product-line.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/themes/default/order-address.tpl b/themes/default/order-address.tpl index ec86b9c761d..d0b34a94213 100644 --- a/themes/default/order-address.tpl +++ b/themes/default/order-address.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 8a02332359a..3b2bb6099d8 100644 --- a/themes/default/order-carrier.tpl +++ b/themes/default/order-carrier.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 @@ -36,38 +36,17 @@ var txtProducts = "{l s='products'}"; var orderUrl = '{$link->getPageLink("order", true)}'; - var msgCgv = "{l s='You must agree to the terms of service before continuing.' js=1}"; - var msgCarrier = "{l s='You must select a delivery option before continuing.' js=1}"; - var msgCarriers = "{l s='You must select deliveries options before continuing.' js=1}"; - + var msg = "{l s='You must agree to the terms of service before continuing.' js=1}"; {literal} - function validateCarriers() + function acceptCGV() { if ($('#cgv').length && !$('input#cgv:checked').length) { - alert(msgCgv); + alert(msg); return false; } - - var delivery_option = {}; - $('.delivery_option_radio').each(function () { - if (typeof(delivery_option[$(this).attr('name')]) == 'undefined') - delivery_option[$(this).attr('name')] = false; - if ($(this).is(':checked')) - delivery_option[$(this).attr('name')] = true; - }); - - $.each(delivery_option, function(i, val) { - if (!val) { - if (delivery_option.length > 1) - alert(msgCarriers); - else - alert(msgCarrier); - return false; - } - }); - - return true; + else + return true; } {/literal} //]]> @@ -104,7 +83,7 @@ {include file="$tpl_dir./errors.tpl"} -
+ {else}
diff --git a/themes/default/order-confirmation.tpl b/themes/default/order-confirmation.tpl index b8895033901..a14fa1a53c9 100644 --- a/themes/default/order-confirmation.tpl +++ b/themes/default/order-confirmation.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 577bb809758..68c72dda1e6 100644 --- a/themes/default/order-detail.tpl +++ b/themes/default/order-detail.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 38fa082d8f6..adc3906c4ec 100644 --- a/themes/default/order-follow.tpl +++ b/themes/default/order-follow.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 ece6fc7db7b..b070bd125c6 100755 --- a/themes/default/order-opc.tpl +++ b/themes/default/order-opc.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 b98a888af80..6c02a005942 100644 --- a/themes/default/order-payment.tpl +++ b/themes/default/order-payment.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 c0d44428f26..838581ba36f 100644 --- a/themes/default/order-return.tpl +++ b/themes/default/order-return.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 be6324386fd..e9adb0bea1f 100644 --- a/themes/default/order-slip.tpl +++ b/themes/default/order-slip.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 9e65c770afb..0293110dcfa 100644 --- a/themes/default/order-steps.tpl +++ b/themes/default/order-steps.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 dd6ec4319c3..4d14e1017c5 100644 --- a/themes/default/pagination.tpl +++ b/themes/default/pagination.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 1914f4a0472..e86a0997c87 100644 --- a/themes/default/password.tpl +++ b/themes/default/password.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/delivery-slip.tpl b/themes/default/pdf/delivery-slip.tpl index 5b6ca51698b..8c121afefc8 100755 --- a/themes/default/pdf/delivery-slip.tpl +++ b/themes/default/pdf/delivery-slip.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/pdf/footer.tpl b/themes/default/pdf/footer.tpl index 2bcb2f7e2fa..222f6949363 100755 --- a/themes/default/pdf/footer.tpl +++ b/themes/default/pdf/footer.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/pdf/header.tpl b/themes/default/pdf/header.tpl index b58e1b65f2c..bf9bac29d0a 100755 --- a/themes/default/pdf/header.tpl +++ b/themes/default/pdf/header.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/pdf/invoice-b2b.tpl b/themes/default/pdf/invoice-b2b.tpl index 02a316b3fd8..c49e1d233c3 100755 --- a/themes/default/pdf/invoice-b2b.tpl +++ b/themes/default/pdf/invoice-b2b.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/pdf/invoice.tax-tab.tpl b/themes/default/pdf/invoice.tax-tab.tpl index f365aa6f97d..88f6c787f2d 100755 --- a/themes/default/pdf/invoice.tax-tab.tpl +++ b/themes/default/pdf/invoice.tax-tab.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/pdf/invoice.tpl b/themes/default/pdf/invoice.tpl index 3524c069f51..32dd0ec6e30 100755 --- a/themes/default/pdf/invoice.tpl +++ b/themes/default/pdf/invoice.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/pdf/order-return.tpl b/themes/default/pdf/order-return.tpl index 53f5e41f86b..bba90e4b15f 100755 --- a/themes/default/pdf/order-return.tpl +++ b/themes/default/pdf/order-return.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/pdf/order-slip.tpl b/themes/default/pdf/order-slip.tpl index 1c464ef9551..8deddec9e38 100755 --- a/themes/default/pdf/order-slip.tpl +++ b/themes/default/pdf/order-slip.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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/pdf/supply-order-footer.tpl b/themes/default/pdf/supply-order-footer.tpl index 8e7ccca80c8..3d8f7fcadfe 100755 --- a/themes/default/pdf/supply-order-footer.tpl +++ b/themes/default/pdf/supply-order-footer.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/themes/default/pdf/supply-order-header.tpl b/themes/default/pdf/supply-order-header.tpl index 15889a91575..74c73df98f5 100644 --- a/themes/default/pdf/supply-order-header.tpl +++ b/themes/default/pdf/supply-order-header.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/themes/default/pdf/supply-order.tpl b/themes/default/pdf/supply-order.tpl index adc8486d5e6..f19fbadc872 100644 --- a/themes/default/pdf/supply-order.tpl +++ b/themes/default/pdf/supply-order.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 PrestaShop SA +* @copyright 2007-2012 PrestaShop SA * @version Release: $Revision$ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/themes/default/prices-drop.tpl b/themes/default/prices-drop.tpl index 9491d9278e8..5628340a8f9 100644 --- a/themes/default/prices-drop.tpl +++ b/themes/default/prices-drop.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 65980341c0b..9803d54315f 100644 --- a/themes/default/product-compare.tpl +++ b/themes/default/product-compare.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 b5bd6e4a5d9..4589bc50e2b 100644 --- a/themes/default/product-list.tpl +++ b/themes/default/product-list.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 9e8e1d2f35f..2f17d076951 100644 --- a/themes/default/product-sort.tpl +++ b/themes/default/product-sort.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 5f98e50108a..e9d1fafd3fa 100644 --- a/themes/default/product.tpl +++ b/themes/default/product.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 cd11bbee48c..25eb26ace45 100644 --- a/themes/default/products-comparison.tpl +++ b/themes/default/products-comparison.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 e6adc67e63b..f23bb089629 100644 --- a/themes/default/restricted-country.tpl +++ b/themes/default/restricted-country.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 b6973310380..4b08d4dd985 100644 --- a/themes/default/scenes.tpl +++ b/themes/default/scenes.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 214a75d4e2d..f9ff988ca85 100644 --- a/themes/default/search.tpl +++ b/themes/default/search.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 544835962c2..1c2dc756001 100644 --- a/themes/default/shopping-cart-product-line.tpl +++ b/themes/default/shopping-cart-product-line.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 7fab80c769a..65833c84c66 100644 --- a/themes/default/shopping-cart.tpl +++ b/themes/default/shopping-cart.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 e40f8bf0cc1..e15665b66f0 100644 --- a/themes/default/sitemap.tpl +++ b/themes/default/sitemap.tpl @@ -1,5 +1,5 @@ {* -* 2007-2011 PrestaShop +* 2007-2012 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2011 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 f4812b709e9..e1dd1f