From bcf4ed9685d556ed7cbd87b1f3f52dcc86fcca94 Mon Sep 17 00:00:00 2001 From: Alex Sampaio Date: Tue, 24 Jan 2017 18:29:13 +0100 Subject: [PATCH] CO: update licences --- .github/contrib/install.php | 4 +- .github/contrib/uninstall.php | 4 +- admin-dev/ajax-tab.php | 4 +- admin-dev/ajax.php | 4 +- admin-dev/ajax_products_list.php | 4 +- admin-dev/autoupgrade/backup/index.php | 4 +- admin-dev/autoupgrade/index.php | 4 +- admin-dev/backup.php | 4 +- admin-dev/backups/index.php | 4 +- admin-dev/bootstrap.php | 4 +- admin-dev/cron_currency_rates.php | 4 +- admin-dev/displayImage.php | 4 +- admin-dev/drawer.php | 4 +- admin-dev/export/index.php | 4 +- admin-dev/filemanager/config/index.php | 4 +- admin-dev/filemanager/css/index.php | 4 +- admin-dev/filemanager/img/ico/index.php | 4 +- admin-dev/filemanager/img/ico_dark/index.php | 4 +- admin-dev/filemanager/img/index.php | 4 +- admin-dev/filemanager/include/index.php | 4 +- admin-dev/filemanager/index.php | 4 +- .../filemanager/jPlayer/add-on/index.php | 4 +- admin-dev/filemanager/jPlayer/index.php | 4 +- .../filemanager/jPlayer/popcorn/index.php | 4 +- .../jPlayer/skin/blue.monday/index.php | 4 +- admin-dev/filemanager/jPlayer/skin/index.php | 4 +- admin-dev/filemanager/js/index.php | 4 +- admin-dev/filemanager/lang/index.php | 4 +- admin-dev/filemanager/uploader/index.php | 4 +- admin-dev/footer.inc.php | 4 +- admin-dev/functions.php | 4 +- admin-dev/get-file-admin.php | 4 +- admin-dev/grider.php | 4 +- admin-dev/header.inc.php | 4 +- admin-dev/import/index.php | 4 +- admin-dev/index.php | 4 +- admin-dev/init.php | 4 +- admin-dev/pdf.php | 4 +- admin-dev/searchcron.php | 4 +- .../themes/default/css/bundle/module/drop.css | 4 +- .../css/bundle/plugins/jquery.pstagger.css | 4 +- admin-dev/themes/default/css/font.css | 4 +- admin-dev/themes/default/css/index.php | 4 +- .../themes/default/css/schemes/index.php | 4 +- .../themes/default/css/schemes_rtl/index.php | 4 +- admin-dev/themes/default/css/vendor/index.php | 12 +- admin-dev/themes/default/fonts/index.php | 4 +- admin-dev/themes/default/img/index.php | 10 +- .../themes/default/img/patterns/index.php | 4 +- admin-dev/themes/default/index.php | 4 +- admin-dev/themes/default/js/admin-theme.js | 4 +- .../themes/default/js/bundle/category-tree.js | 4 +- .../themes/default/js/bundle/module/loader.js | 4 +- .../themes/default/js/bundle/pagination.js | 4 +- .../js/bundle/plugins/jquery.pstagger.js | 4 +- .../default/js/bundle/product/catalog.js | 4 +- .../themes/default/js/bundle/product/form.js | 4 +- admin-dev/themes/default/js/calendar.js | 6 +- admin-dev/themes/default/js/help.js | 4 +- admin-dev/themes/default/js/index.php | 4 +- .../themes/default/js/modernizr-loads.js | 6 +- admin-dev/themes/default/js/theme.js | 4 +- admin-dev/themes/default/js/tree.js | 442 +++++++++--------- .../default/js/vendor/bootstrap/index.php | 4 +- admin-dev/themes/default/js/vendor/index.php | 4 +- .../themes/default/sass/controllers/index.php | 4 +- admin-dev/themes/default/sass/index.php | 4 +- .../default/sass/modules/colors/index.php | 4 +- .../themes/default/sass/modules/index.php | 4 +- .../themes/default/sass/partials/index.php | 4 +- .../themes/default/sass/schemes/index.php | 4 +- .../themes/default/sass/schemes_rtl/index.php | 4 +- .../default/sass/vendor/bi-app/index.php | 4 +- .../sass/vendor/bootstrap-rtl-sass/index.php | 4 +- .../sass/vendor/bootstrap-sass/index.php | 4 +- .../vendor/bootstrap-sass/mixins/index.php | 4 +- .../sass/vendor/font-awesome/index.php | 4 +- .../themes/default/sass/vendor/index.php | 12 +- .../default/template/content-legacy.tpl | 6 +- admin-dev/themes/default/template/content.tpl | 6 +- .../controllers/access/helpers/form/form.tpl | 4 +- .../controllers/access/helpers/form/index.php | 4 +- .../controllers/access/helpers/index.php | 4 +- .../template/controllers/access/index.php | 4 +- .../controllers/addons_catalog/content.tpl | 4 +- .../controllers/addons_catalog/index.php | 4 +- .../addresses/helpers/form/form.tpl | 4 +- .../addresses/helpers/form/index.php | 4 +- .../controllers/addresses/helpers/index.php | 4 +- .../addresses/helpers/list/index.php | 4 +- .../addresses/helpers/list/list_header.tpl | 4 +- .../template/controllers/addresses/index.php | 4 +- .../helpers/list/list_action_delete.tpl | 4 +- .../controllers/attachments/index.php | 4 +- .../attribute_generator/content.tpl | 4 +- .../controllers/attribute_generator/index.php | 4 +- .../attributes/helpers/form/form.tpl | 8 +- .../attributes/helpers/form/index.php | 4 +- .../controllers/attributes/helpers/index.php | 4 +- .../template/controllers/attributes/index.php | 4 +- .../attributes_groups/helpers/form/form.tpl | 6 +- .../attributes_groups/helpers/form/index.php | 4 +- .../attributes_groups/helpers/index.php | 4 +- .../attributes_groups/helpers/list/index.php | 4 +- .../helpers/list/list_header.tpl | 6 +- .../attributes_groups/helpers/view/index.php | 4 +- .../controllers/attributes_groups/index.php | 4 +- .../controllers/backup/download/index.php | 4 +- .../controllers/backup/download/view.tpl | 8 +- .../controllers/backup/helpers/index.php | 4 +- .../controllers/backup/helpers/list/index.php | 4 +- .../backup/helpers/list/list_header.tpl | 4 +- .../controllers/backup/helpers/view/index.php | 4 +- .../controllers/backup/helpers/view/view.tpl | 4 +- .../template/controllers/backup/index.php | 4 +- .../carrier_wizard/helpers/form/form.tpl | 4 +- .../helpers/form/form_ranges.tpl | 4 +- .../carrier_wizard/helpers/form/index.php | 4 +- .../carrier_wizard/helpers/index.php | 4 +- .../carrier_wizard/helpers/view/index.php | 4 +- .../carrier_wizard/helpers/view/view.tpl | 6 +- .../controllers/carrier_wizard/index.php | 4 +- .../controllers/carrier_wizard/logo.tpl | 8 +- .../controllers/carrier_wizard/summary.tpl | 4 +- .../carriers/helpers/form/form.tpl | 6 +- .../carriers/helpers/form/index.php | 4 +- .../controllers/carriers/helpers/index.php | 4 +- .../carriers/helpers/list/index.php | 4 +- .../carriers/helpers/list/list_content.tpl | 6 +- .../carriers/helpers/list/list_footer.tpl | 4 +- .../carriers/helpers/list/list_header.tpl | 4 +- .../template/controllers/carriers/index.php | 4 +- .../controllers/cart_rules/actions.tpl | 4 +- .../controllers/cart_rules/conditions.tpl | 4 +- .../template/controllers/cart_rules/form.js | 4 +- .../template/controllers/cart_rules/form.tpl | 6 +- .../controllers/cart_rules/helpers/index.php | 4 +- .../cart_rules/helpers/list/index.php | 4 +- .../cart_rules/helpers/list/list_header.tpl | 4 +- .../template/controllers/cart_rules/index.php | 4 +- .../controllers/cart_rules/informations.tpl | 4 +- .../cart_rules/product_rule_group.tpl | 4 +- .../cart_rules/product_rule_itemlist.tpl | 6 +- .../controllers/carts/helpers/index.php | 4 +- .../controllers/carts/helpers/view/index.php | 4 +- .../controllers/carts/helpers/view/view.tpl | 4 +- .../template/controllers/carts/index.php | 4 +- .../categories/helpers/form/form.tpl | 4 +- .../categories/helpers/form/index.php | 4 +- .../controllers/categories/helpers/index.php | 4 +- .../categories/helpers/list/index.php | 4 +- .../categories/helpers/list/list_header.tpl | 4 +- .../template/controllers/categories/index.php | 4 +- .../controllers/cms/helpers/form/form.tpl | 4 +- .../controllers/cms/helpers/form/index.php | 4 +- .../controllers/cms/helpers/index.php | 4 +- .../template/controllers/cms/index.php | 4 +- .../cms_categories/helpers/form/form.tpl | 4 +- .../cms_categories/helpers/form/index.php | 4 +- .../cms_categories/helpers/index.php | 4 +- .../controllers/cms_categories/index.php | 4 +- .../controllers/cms_content/content.tpl | 4 +- .../controllers/cms_content/index.php | 4 +- .../countries/helpers/form/form.tpl | 10 +- .../countries/helpers/form/index.php | 4 +- .../controllers/countries/helpers/index.php | 4 +- .../countries/helpers/list/index.php | 4 +- .../countries/helpers/list/list_footer.tpl | 4 +- .../template/controllers/countries/index.php | 4 +- .../controllers/currencies/content.tpl | 6 +- .../currencies/conversion_rate.tpl | 4 +- .../template/controllers/currencies/index.php | 4 +- .../controllers/currencies/status.tpl | 4 +- .../customer_threads/helpers/index.php | 4 +- .../customer_threads/helpers/list/index.php | 4 +- .../helpers/list/list_header.tpl | 8 +- .../helpers/options/index.php | 4 +- .../helpers/options/options.tpl | 12 +- .../customer_threads/helpers/view/index.php | 4 +- .../customer_threads/helpers/view/message.tpl | 4 +- .../customer_threads/helpers/view/modal.tpl | 10 +- .../helpers/view/timeline_item.tpl | 4 +- .../customer_threads/helpers/view/view.tpl | 10 +- .../controllers/customer_threads/index.php | 4 +- .../controllers/customer_threads/message.tpl | 24 +- .../controllers/customers/helpers/index.php | 4 +- .../customers/helpers/list/index.php | 4 +- .../customers/helpers/list/list_header.tpl | 4 +- .../customers/helpers/required_fields.tpl | 4 +- .../customers/helpers/view/index.php | 4 +- .../customers/helpers/view/view.tpl | 4 +- .../template/controllers/customers/index.php | 4 +- .../controllers/dashboard/helpers/index.php | 4 +- .../dashboard/helpers/view/index.php | 4 +- .../dashboard/helpers/view/view.tpl | 4 +- .../template/controllers/dashboard/index.php | 4 +- .../template/controllers/emails/content.tpl | 6 +- .../template/controllers/emails/index.php | 4 +- .../employees/helpers/form/form.tpl | 4 +- .../employees/helpers/form/index.php | 4 +- .../controllers/employees/helpers/index.php | 4 +- .../template/controllers/employees/index.php | 4 +- .../feature_value/helpers/form/form.tpl | 6 +- .../feature_value/helpers/form/index.php | 4 +- .../feature_value/helpers/index.php | 4 +- .../controllers/feature_value/index.php | 4 +- .../features/helpers/form/form.tpl | 4 +- .../features/helpers/form/index.php | 4 +- .../controllers/features/helpers/index.php | 4 +- .../template/controllers/features/index.php | 4 +- .../controllers/geolocation/helpers/index.php | 4 +- .../geolocation/helpers/options/index.php | 4 +- .../geolocation/helpers/options/options.tpl | 4 +- .../controllers/geolocation/index.php | 4 +- .../controllers/groups/helpers/form/form.tpl | 4 +- .../controllers/groups/helpers/form/index.php | 4 +- .../controllers/groups/helpers/index.php | 4 +- .../controllers/groups/helpers/tree/index.php | 4 +- .../groups/helpers/tree/tree_categories.tpl | 6 +- .../helpers/tree/tree_node_folder_radio.tpl | 6 +- .../helpers/tree/tree_node_item_radio.tpl | 6 +- .../controllers/groups/helpers/view/index.php | 4 +- .../controllers/groups/helpers/view/view.tpl | 4 +- .../template/controllers/groups/index.php | 4 +- .../template/controllers/images/content.tpl | 4 +- .../template/controllers/images/index.php | 4 +- .../controllers/import/helpers/form/form.tpl | 4 +- .../controllers/import/helpers/form/index.php | 4 +- .../controllers/import/helpers/index.php | 4 +- .../controllers/import/helpers/view/index.php | 4 +- .../controllers/import/helpers/view/view.tpl | 4 +- .../template/controllers/import/index.php | 4 +- .../import/modal_import_progress.tpl | 4 +- .../default/template/controllers/index.php | 4 +- .../controllers/information/helpers/index.php | 4 +- .../information/helpers/view/index.php | 4 +- .../information/helpers/view/view.tpl | 4 +- .../controllers/information/index.php | 4 +- .../invoices/helpers/form/form.tpl | 4 +- .../invoices/helpers/form/index.php | 4 +- .../controllers/invoices/helpers/index.php | 4 +- .../template/controllers/invoices/index.php | 4 +- .../languages/helpers/form/form.tpl | 4 +- .../languages/helpers/form/index.php | 4 +- .../controllers/languages/helpers/index.php | 4 +- .../template/controllers/languages/index.php | 4 +- .../controllers/localization/content.tpl | 6 +- .../controllers/localization/index.php | 4 +- .../template/controllers/login/content.tpl | 4 +- .../template/controllers/login/header.tpl | 4 +- .../template/controllers/login/index.php | 4 +- .../template/controllers/login/layout.tpl | 6 +- .../controllers/logs/employee_field.tpl | 6 +- .../controllers/logs/helpers/index.php | 4 +- .../controllers/logs/helpers/list/index.php | 4 +- .../logs/helpers/list/list_header.tpl | 6 +- .../template/controllers/logs/index.php | 4 +- .../controllers/maintenance/helpers/index.php | 4 +- .../maintenance/helpers/options/index.php | 4 +- .../maintenance/helpers/options/options.tpl | 6 +- .../controllers/maintenance/index.php | 4 +- .../manufacturers/helpers/index.php | 4 +- .../manufacturers/helpers/view/index.php | 4 +- .../manufacturers/helpers/view/view.tpl | 4 +- .../controllers/manufacturers/index.php | 4 +- .../controllers/marketing/helpers/index.php | 4 +- .../marketing/helpers/view/index.php | 4 +- .../marketing/helpers/view/view.tpl | 6 +- .../template/controllers/marketing/index.php | 4 +- .../controllers/meta/helpers/index.php | 4 +- .../template/controllers/meta/index.php | 4 +- .../template/controllers/modules/ad_bar.tpl | 4 +- .../controllers/modules/configuration_bar.tpl | 6 +- .../controllers/modules/configure.tpl | 4 +- .../controllers/modules/content-legacy.tpl | 4 +- .../controllers/modules/favorites.tpl | 6 +- .../template/controllers/modules/filters.tpl | 8 +- .../template/controllers/modules/index.php | 4 +- .../template/controllers/modules/js.tpl | 26 +- .../template/controllers/modules/list.tpl | 4 +- .../controllers/modules/login_addons.tpl | 4 +- .../controllers/modules/modal_not_trusted.tpl | 4 +- .../modules/modal_not_trusted_blocked.tpl | 4 +- .../modules/modal_not_trusted_country.tpl | 4 +- .../controllers/modules/modal_translation.tpl | 6 +- .../template/controllers/modules/page.tpl | 4 +- .../modules/page_header_toolbar-legacy.tpl | 4 +- .../controllers/modules/quickview.tpl | 4 +- .../controllers/modules/readmore-body.tpl | 4 +- .../controllers/modules/readmore-header.tpl | 4 +- .../controllers/modules/tab_module_line.tpl | 4 +- .../controllers/modules/tab_modules_list.tpl | 140 +++--- .../controllers/modules/warning_module.tpl | 6 +- .../controllers/modules_positions/form.tpl | 4 +- .../controllers/modules_positions/index.php | 4 +- .../modules_positions/list_modules.tpl | 4 +- .../controllers/not_found/content.tpl | 6 +- .../template/controllers/not_found/index.php | 4 +- .../order_preferences/helpers/index.php | 4 +- .../helpers/options/index.php | 4 +- .../helpers/options/options.tpl | 4 +- .../controllers/order_preferences/index.php | 4 +- .../controllers/orders/_customized_data.tpl | 4 +- .../controllers/orders/_discount_form.tpl | 8 +- .../controllers/orders/_documents.tpl | 4 +- .../controllers/orders/_new_product.tpl | 4 +- .../controllers/orders/_print_pdf_icon.tpl | 4 +- .../controllers/orders/_product_line.tpl | 4 +- .../controllers/orders/_select_payment.tpl | 4 +- .../template/controllers/orders/_shipping.tpl | 4 +- .../template/controllers/orders/form.tpl | 4 +- .../orders/form_customization_feedback.tpl | 4 +- .../controllers/orders/helpers/index.php | 4 +- .../controllers/orders/helpers/list/index.php | 4 +- .../orders/helpers/list/list_header.tpl | 4 +- .../controllers/orders/helpers/view/index.php | 4 +- .../controllers/orders/helpers/view/view.tpl | 4 +- .../template/controllers/orders/index.php | 4 +- .../outstanding/_print_pdf_icon.tpl | 6 +- .../controllers/outstanding/index.php | 4 +- .../controllers/payment/helpers/index.php | 4 +- .../payment/helpers/view/index.php | 4 +- .../controllers/payment/helpers/view/view.tpl | 4 +- .../template/controllers/payment/index.php | 4 +- .../payment_preferences/helpers/index.php | 4 +- .../helpers/view/index.php | 4 +- .../payment_preferences/helpers/view/view.tpl | 4 +- .../controllers/payment_preferences/index.php | 4 +- .../payment_preferences/restrictions.tpl | 6 +- .../performance/helpers/form/form.tpl | 4 +- .../performance/helpers/form/index.php | 4 +- .../controllers/performance/helpers/index.php | 4 +- .../controllers/performance/index.php | 4 +- .../controllers/preferences/helpers/index.php | 4 +- .../preferences/helpers/options/index.php | 4 +- .../preferences/helpers/options/options.tpl | 4 +- .../controllers/preferences/index.php | 4 +- .../controllers/referrers/calendar.tpl | 4 +- .../controllers/referrers/form_settings.tpl | 5 +- .../referrers/helpers/form/form.tpl | 4 +- .../referrers/helpers/form/index.php | 4 +- .../controllers/referrers/helpers/index.php | 4 +- .../referrers/helpers/list/index.php | 4 +- .../referrers/helpers/list/list_header.tpl | 12 +- .../referrers/helpers/view/index.php | 4 +- .../referrers/helpers/view/view.tpl | 8 +- .../template/controllers/referrers/index.php | 4 +- .../request_sql/helpers/form/form.tpl | 6 +- .../request_sql/helpers/form/index.php | 4 +- .../controllers/request_sql/helpers/index.php | 4 +- .../request_sql/helpers/view/index.php | 4 +- .../request_sql/helpers/view/view.tpl | 6 +- .../controllers/request_sql/index.php | 4 +- .../request_sql/list_action_export.tpl | 6 +- .../controllers/return/helpers/form/form.tpl | 4 +- .../controllers/return/helpers/form/index.php | 4 +- .../controllers/return/helpers/index.php | 4 +- .../template/controllers/return/index.php | 4 +- .../controllers/scenes/helpers/form/form.tpl | 4 +- .../controllers/scenes/helpers/form/index.php | 4 +- .../controllers/scenes/helpers/index.php | 4 +- .../controllers/scenes/helpers/tree/index.php | 4 +- .../tree/tree_node_folder_checkbox.tpl | 6 +- .../helpers/tree/tree_node_item_checkbox.tpl | 6 +- .../template/controllers/scenes/index.php | 4 +- .../controllers/search/helpers/index.php | 4 +- .../controllers/search/helpers/view/index.php | 4 +- .../controllers/search/helpers/view/view.tpl | 4 +- .../template/controllers/search/index.php | 4 +- .../template/controllers/shop/content.tpl | 6 +- .../controllers/shop/helpers/form/form.tpl | 4 +- .../controllers/shop/helpers/form/index.php | 4 +- .../controllers/shop/helpers/index.php | 4 +- .../controllers/shop/helpers/list/index.php | 4 +- .../shop/helpers/list/list_action_delete.tpl | 4 +- .../shop/helpers/list/list_content.tpl | 4 +- .../shop/helpers/list/list_header.tpl | 6 +- .../controllers/shop/helpers/tree/index.php | 4 +- .../shop/helpers/tree/shop_tree_header.tpl | 6 +- .../helpers/tree/shop_tree_node_folder.tpl | 6 +- .../shop/helpers/tree/shop_tree_node_item.tpl | 6 +- .../template/controllers/shop/index.php | 4 +- .../controllers/shop_group/content.tpl | 6 +- .../shop_group/helpers/form/form.tpl | 4 +- .../shop_group/helpers/form/index.php | 4 +- .../controllers/shop_group/helpers/index.php | 4 +- .../template/controllers/shop_group/index.php | 4 +- .../template/controllers/shop_url/content.tpl | 6 +- .../shop_url/helpers/form/form.tpl | 6 +- .../shop_url/helpers/form/index.php | 4 +- .../controllers/shop_url/helpers/index.php | 4 +- .../shop_url/helpers/list/index.php | 4 +- .../shop_url/helpers/list/list_content.tpl | 4 +- .../template/controllers/shop_url/index.php | 4 +- .../controllers/slip/_print_pdf_icon.tpl | 4 +- .../controllers/slip/helpers/form/form.tpl | 6 +- .../controllers/slip/helpers/form/index.php | 4 +- .../controllers/slip/helpers/index.php | 4 +- .../template/controllers/slip/index.php | 4 +- .../specific_price_rule/helpers/form/form.tpl | 4 +- .../helpers/form/index.php | 4 +- .../specific_price_rule/helpers/index.php | 4 +- .../controllers/specific_price_rule/index.php | 4 +- .../controllers/states/helpers/index.php | 4 +- .../controllers/states/helpers/list/index.php | 4 +- .../template/controllers/states/index.php | 4 +- .../template/controllers/stats/calendar.tpl | 6 +- .../template/controllers/stats/engines.tpl | 6 +- .../controllers/stats/helpers/index.php | 4 +- .../controllers/stats/helpers/view/index.php | 4 +- .../controllers/stats/helpers/view/view.tpl | 6 +- .../template/controllers/stats/index.php | 4 +- .../template/controllers/stats/menu.tpl | 6 +- .../template/controllers/stats/stats.tpl | 6 +- .../statuses/helpers/form/form.tpl | 4 +- .../statuses/helpers/form/index.php | 4 +- .../controllers/statuses/helpers/index.php | 4 +- .../template/controllers/statuses/index.php | 4 +- .../controllers/stock_cover/helpers/index.php | 4 +- .../stock_cover/helpers/list/index.php | 4 +- .../stock_cover/helpers/list/list_header.tpl | 6 +- .../controllers/stock_cover/index.php | 4 +- .../stock_instant_state/helpers/index.php | 4 +- .../helpers/list/index.php | 4 +- .../helpers/list/list_header.tpl | 6 +- .../controllers/stock_instant_state/index.php | 4 +- .../controllers/stock_mvt/helpers/index.php | 4 +- .../stock_mvt/helpers/list/index.php | 4 +- .../stock_mvt/helpers/list/list_header.tpl | 6 +- .../template/controllers/stock_mvt/index.php | 4 +- .../controllers/stores/helpers/form/form.tpl | 6 +- .../controllers/stores/helpers/form/index.php | 4 +- .../controllers/stores/helpers/index.php | 4 +- .../stores/helpers/options/index.php | 4 +- .../stores/helpers/options/options.tpl | 4 +- .../template/controllers/stores/index.php | 4 +- .../controllers/suppliers/helpers/index.php | 4 +- .../suppliers/helpers/view/index.php | 4 +- .../suppliers/helpers/view/view.tpl | 6 +- .../template/controllers/suppliers/index.php | 4 +- .../supply_orders/helpers/form/form.tpl | 4 +- .../supply_orders/helpers/form/index.php | 4 +- .../supply_orders/helpers/index.php | 4 +- .../supply_orders/helpers/list/index.php | 4 +- .../helpers/list/list_header.tpl | 6 +- .../supply_orders/helpers/view/index.php | 4 +- .../supply_orders/helpers/view/view.tpl | 4 +- .../controllers/supply_orders/index.php | 4 +- .../helpers/form/form.tpl | 14 +- .../helpers/form/index.php | 4 +- .../helpers/index.php | 4 +- .../supply_orders_change_state/index.php | 4 +- .../helpers/index.php | 4 +- .../helpers/list/index.php | 4 +- .../helpers/list/list_footer.tpl | 4 +- .../helpers/list/list_header.tpl | 6 +- .../supply_orders_receipt_history/index.php | 4 +- .../controllers/tabs/helpers/index.php | 4 +- .../controllers/tabs/helpers/list/index.php | 4 +- .../tabs/helpers/list/list_content.tpl | 6 +- .../template/controllers/tabs/index.php | 4 +- .../controllers/tags/helpers/form/form.tpl | 4 +- .../controllers/tags/helpers/form/index.php | 4 +- .../controllers/tags/helpers/index.php | 4 +- .../template/controllers/tags/index.php | 4 +- .../tax_rules/helpers/form/form.tpl | 4 +- .../tax_rules/helpers/form/index.php | 4 +- .../controllers/tax_rules/helpers/index.php | 4 +- .../tax_rules/helpers/list/index.php | 4 +- .../helpers/list/list_action_edit.tpl | 8 +- .../tax_rules/helpers/list/list_content.tpl | 4 +- .../tax_rules/helpers/list/list_footer.tpl | 4 +- .../tax_rules/helpers/list/list_header.tpl | 6 +- .../template/controllers/tax_rules/index.php | 4 +- .../tax_rules_group/helpers/index.php | 4 +- .../controllers/tax_rules_group/index.php | 4 +- .../controllers/themes/configurelayouts.tpl | 4 +- .../controllers/themes/helpers/form/form.tpl | 4 +- .../controllers/themes/helpers/form/index.php | 4 +- .../controllers/themes/helpers/index.php | 4 +- .../themes/helpers/options/index.php | 4 +- .../themes/helpers/options/options.tpl | 4 +- .../controllers/themes/helpers/view/index.php | 4 +- .../controllers/themes/helpers/view/view.tpl | 4 +- .../template/controllers/themes/index.php | 4 +- .../controllers/themes_catalog/content.tpl | 4 +- .../controllers/themes_catalog/index.php | 4 +- .../controllers/tracking/helpers/index.php | 4 +- .../tracking/helpers/list/index.php | 4 +- .../tracking/helpers/list/list_header.tpl | 6 +- .../template/controllers/tracking/index.php | 4 +- .../translations/helpers/index.php | 4 +- .../translations/helpers/view/index.php | 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 +- .../controllers/translations/index.php | 4 +- .../controllers/warehouses/helpers/index.php | 4 +- .../warehouses/helpers/view/index.php | 4 +- .../warehouses/helpers/view/view.tpl | 4 +- .../template/controllers/warehouses/index.php | 4 +- .../webservice/helpers/form/form.tpl | 4 +- .../webservice/helpers/form/index.php | 4 +- .../controllers/webservice/helpers/index.php | 4 +- .../template/controllers/webservice/index.php | 4 +- admin-dev/themes/default/template/error.tpl | 34 +- admin-dev/themes/default/template/footer.tpl | 4 +- .../default/template/footer_toolbar.tpl | 4 +- .../template/form_date_range_picker.tpl | 8 +- .../default/template/form_submit_ajax.tpl | 4 +- admin-dev/themes/default/template/header.tpl | 4 +- .../template/helpers/calendar/calendar.tpl | 4 +- .../template/helpers/calendar/index.php | 4 +- .../template/helpers/dataviz/graph.tpl | 12 +- .../template/helpers/dataviz/index.php | 4 +- .../template/helpers/form/assoshop.tpl | 10 +- .../default/template/helpers/form/form.tpl | 4 +- .../template/helpers/form/form_category.tpl | 6 +- .../template/helpers/form/form_group.tpl | 6 +- .../default/template/helpers/form/index.php | 4 +- .../themes/default/template/helpers/index.php | 4 +- .../default/template/helpers/kpi/index.php | 4 +- .../default/template/helpers/kpi/kpi.tpl | 4 +- .../default/template/helpers/kpi/row.tpl | 4 +- .../default/template/helpers/list/index.php | 4 +- .../default/template/helpers/list/list.tpl | 4 +- .../helpers/list/list_action_addstock.tpl | 6 +- .../helpers/list/list_action_default.tpl | 6 +- .../helpers/list/list_action_delete.tpl | 6 +- .../helpers/list/list_action_details.tpl | 6 +- .../helpers/list/list_action_duplicate.tpl | 4 +- .../helpers/list/list_action_edit.tpl | 6 +- .../helpers/list/list_action_enable.tpl | 4 +- .../helpers/list/list_action_preview.tpl | 4 +- .../helpers/list/list_action_removestock.tpl | 4 +- .../list_action_supplier_order_receipt.tpl | 6 +- .../list_action_supply_order_change_state.tpl | 6 +- ...tion_supply_order_create_from_template.tpl | 6 +- .../list/list_action_supply_order_receipt.tpl | 6 +- .../list/list_action_transferstock.tpl | 6 +- .../helpers/list/list_action_view.tpl | 6 +- .../template/helpers/list/list_content.tpl | 4 +- .../template/helpers/list/list_footer.tpl | 4 +- .../template/helpers/list/list_header.tpl | 4 +- .../template/helpers/modules_list/index.php | 4 +- .../template/helpers/modules_list/list.tpl | 4 +- .../template/helpers/modules_list/modal.tpl | 4 +- .../template/helpers/options/index.php | 4 +- .../template/helpers/options/options.tpl | 4 +- .../template/helpers/required_fields.tpl | 8 +- .../template/helpers/shops_list/index.php | 4 +- .../template/helpers/shops_list/list.tpl | 4 +- .../default/template/helpers/tree/index.php | 4 +- .../tree/subtree_associated_categories.tpl | 4 +- .../default/template/helpers/tree/tree.tpl | 6 +- .../tree/tree_associated_categories.tpl | 4 +- .../helpers/tree/tree_associated_header.tpl | 4 +- .../template/helpers/tree/tree_categories.tpl | 10 +- .../template/helpers/tree/tree_header.tpl | 6 +- .../helpers/tree/tree_node_folder.tpl | 6 +- .../tree/tree_node_folder_checkbox.tpl | 4 +- .../tree/tree_node_folder_checkbox_shops.tpl | 6 +- .../helpers/tree/tree_node_folder_radio.tpl | 4 +- .../template/helpers/tree/tree_node_item.tpl | 6 +- .../helpers/tree/tree_node_item_checkbox.tpl | 6 +- .../tree/tree_node_item_checkbox_shops.tpl | 6 +- .../helpers/tree/tree_node_item_radio.tpl | 6 +- .../template/helpers/tree/tree_shops.tpl | 6 +- .../template/helpers/tree/tree_toolbar.tpl | 6 +- .../helpers/tree/tree_toolbar_link.tpl | 6 +- .../helpers/tree/tree_toolbar_search.tpl | 6 +- .../template/helpers/uploader/ajax.tpl | 4 +- .../template/helpers/uploader/index.php | 4 +- .../template/helpers/uploader/simple.tpl | 4 +- .../default/template/helpers/view/index.php | 4 +- .../default/template/helpers/view/view.tpl | 4 +- admin-dev/themes/default/template/index.php | 10 +- .../themes/default/template/invalid_token.tpl | 4 +- .../themes/default/template/layout-ajax.tpl | 4 +- .../themes/default/template/layout-export.tpl | 6 +- admin-dev/themes/default/template/layout.tpl | 4 +- admin-dev/themes/default/template/modal.tpl | 6 +- .../default/template/page_header_toolbar.tpl | 4 +- .../themes/default/template/search_form.tpl | 6 +- admin-dev/themes/default/template/toolbar.tpl | 4 +- admin-dev/themes/default/webpack.config.js | 4 +- admin-dev/themes/index.php | 4 +- admin-dev/themes/new-theme/js/header.js | 4 +- admin-dev/themes/new-theme/js/nav_bar.js | 4 +- .../themes/new-theme/js/notifications.js | 4 +- .../new-theme/js/product-page/attributes.js | 4 +- .../js/product-page/category-tree.js | 4 +- .../themes/new-theme/js/product-page/index.js | 4 +- .../js/product-page/product-header.js | 4 +- .../product-search-autocomplete.js | 4 +- admin-dev/themes/new-theme/js/theme.js | 4 +- .../new-theme/js/translation-page/index.js | 4 +- .../js/translation-page/messages-edition.js | 4 +- .../translation-page/messages-pagination.js | 4 +- .../js/translation-page/messages-search.js | 4 +- .../js/translation-page/messages-tree.js | 4 +- .../translation-page/messages-visibility.js | 4 +- admin-dev/themes/new-theme/public/bundle.js | 26 +- admin-dev/themes/new-theme/public/theme.css | 12 +- .../layout/confirmation_messages.tpl | 4 +- .../components/layout/employee_dropdown.tpl | 4 +- .../components/layout/error_messages.tpl | 4 +- .../layout/information_messages.tpl | 4 +- .../template/components/layout/nav_bar.tpl | 4 +- .../layout/notifications_center.tpl | 4 +- .../components/layout/search_form.tpl | 4 +- .../template/components/layout/shop_list.tpl | 4 +- .../components/layout/warning_messages.tpl | 4 +- .../controllers/addons_catalog/content.tpl | 4 +- .../controllers/addons_catalog/index.php | 4 +- .../controllers/modules/login_addons.tpl | 4 +- admin-dev/themes/new-theme/template/error.tpl | 34 +- .../themes/new-theme/template/footer.tpl | 4 +- .../themes/new-theme/template/header.tpl | 4 +- .../new-theme/template/helpers/kpi/kpi.tpl | 4 +- .../new-theme/template/helpers/kpi/row.tpl | 4 +- .../template/helpers/shops_list/list.tpl | 4 +- admin-dev/themes/new-theme/template/modal.tpl | 6 +- admin-dev/themes/new-theme/webpack.config.js | 4 +- admin-dev/webpack.config.js | 4 +- app/AppCache.php | 4 +- app/AppKernel.php | 4 +- app/Resources/geoip/index.php | 10 +- app/Resources/views/base.html.twig | 4 +- app/Resources/views/default/index.html.twig | 4 +- app/autoload.php | 4 +- app/check.php | 4 +- app/config/set_parameters.php | 4 +- cache/cachefs/index.php | 10 +- cache/index.php | 10 +- cache/purifier/index.php | 10 +- cache/push/index.php | 4 +- cache/sandbox/index.php | 4 +- cache/smarty/cache/index.php | 4 +- cache/smarty/compile/index.php | 4 +- cache/smarty/index.php | 4 +- cache/tcpdf/index.php | 4 +- classes/Access.php | 4 +- classes/Address.php | 6 +- classes/AddressChecksumCore.php | 4 +- classes/AddressFormat.php | 4 +- classes/Alias.php | 4 +- classes/Attachment.php | 4 +- classes/Attribute.php | 4 +- classes/AttributeGroup.php | 4 +- classes/CMS.php | 4 +- classes/CMSCategory.php | 4 +- classes/CMSRole.php | 4 +- classes/CSV.php | 4 +- classes/Carrier.php | 4 +- classes/Cart.php | 4 +- classes/CartRule.php | 4 +- classes/Category.php | 4 +- classes/Chart.php | 4 +- classes/ChecksumInterface.php | 4 +- classes/Combination.php | 6 +- classes/Configuration.php | 4 +- classes/ConfigurationKPI.php | 4 +- classes/ConfigurationTest.php | 6 +- classes/Connection.php | 4 +- classes/ConnectionsSource.php | 4 +- classes/Contact.php | 4 +- classes/Context.php | 4 +- classes/Cookie.php | 4 +- classes/Country.php | 4 +- classes/Currency.php | 4 +- classes/Customer.php | 4 +- classes/CustomerMessage.php | 4 +- classes/CustomerThread.php | 4 +- classes/Customization.php | 4 +- classes/CustomizationField.php | 4 +- classes/DateRange.php | 4 +- classes/Delivery.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/Hook.php | 4 +- classes/Image.php | 8 +- classes/ImageManager.php | 4 +- classes/ImageType.php | 4 +- classes/Language.php | 4 +- classes/Link.php | 4 +- classes/LocalizationPack.php | 4 +- classes/Mail.php | 4 +- classes/Manufacturer.php | 4 +- classes/Media.php | 4 +- classes/Message.php | 4 +- classes/Meta.php | 4 +- classes/Notification.php | 4 +- classes/ObjectModel.php | 4 +- classes/Pack.php | 4 +- classes/Page.php | 4 +- classes/PaymentModule.php | 4 +- classes/PhpEncryption.php | 4 +- classes/PhpEncryptionEngine.php | 4 +- classes/PhpEncryptionLegacyEngine.php | 4 +- classes/PrestaShopAutoload.php | 4 +- classes/PrestaShopBackup.php | 4 +- classes/PrestaShopCollection.php | 4 +- classes/PrestaShopLogger.php | 4 +- classes/Product.php | 4 +- classes/ProductAssembler.php | 4 +- classes/ProductDownload.php | 4 +- classes/ProductPresenterFactory.php | 4 +- classes/ProductSale.php | 4 +- classes/ProductSupplier.php | 4 +- classes/Profile.php | 18 +- classes/QuickAccess.php | 4 +- classes/Referrer.php | 4 +- classes/RequestSql.php | 4 +- classes/Risk.php | 4 +- classes/Search.php | 4 +- classes/SearchEngine.php | 4 +- classes/Smarty/SmartyCacheResourceMysql.php | 4 +- classes/Smarty/SmartyCustom.php | 4 +- classes/Smarty/SmartyDev.php | 4 +- classes/Smarty/SmartyLazyRegister.php | 4 +- classes/Smarty/SmartyResourceModule.php | 4 +- classes/Smarty/SmartyResourceParent.php | 4 +- classes/Smarty/TemplateFinder.php | 4 +- classes/SpecificPrice.php | 4 +- classes/SpecificPriceRule.php | 4 +- classes/State.php | 4 +- classes/Store.php | 6 +- classes/Supplier.php | 4 +- classes/Tab.php | 4 +- classes/Tag.php | 4 +- classes/Tools.php | 4 +- classes/Translate.php | 4 +- classes/TranslatedConfiguration.php | 4 +- classes/Upgrader.php | 4 +- classes/Uploader.php | 6 +- classes/Validate.php | 4 +- classes/ValidateConstraintTranslator.php | 4 +- classes/Windows.php | 4 +- classes/Zone.php | 4 +- classes/assets/AbstractAssetManager.php | 4 +- classes/assets/CccReducer.php | 4 +- classes/assets/CssMinifier.php | 4 +- classes/assets/JavascriptManager.php | 4 +- classes/assets/JsMinifier.php | 4 +- classes/assets/PrestashopAssetsLibraries.php | 4 +- classes/assets/StylesheetManager.php | 4 +- classes/cache/Cache.php | 4 +- classes/cache/CacheApc.php | 4 +- classes/cache/CacheMemcache.php | 4 +- classes/cache/CacheMemcached.php | 6 +- classes/cache/CacheXcache.php | 4 +- classes/cache/index.php | 4 +- classes/checkout/AbstractCheckoutStep.php | 4 +- classes/checkout/CartChecksum.php | 4 +- classes/checkout/CheckoutAddressesStep.php | 4 +- classes/checkout/CheckoutDeliveryStep.php | 4 +- classes/checkout/CheckoutPaymentStep.php | 4 +- .../CheckoutPersonalInformationStep.php | 4 +- classes/checkout/CheckoutProcess.php | 4 +- classes/checkout/CheckoutSession.php | 4 +- classes/checkout/CheckoutStepInterface.php | 4 +- .../checkout/ConditionsToApproveFinder.php | 4 +- classes/checkout/DeliveryOptionsFinder.php | 6 +- classes/checkout/PaymentOptionsFinder.php | 6 +- 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 +- .../ProductListingFrontController.php | 4 +- .../ProductPresentingFrontController.php | 4 +- classes/controller/index.php | 4 +- classes/db/Db.php | 4 +- classes/db/DbMySQLi.php | 4 +- classes/db/DbPDO.php | 4 +- classes/db/DbQuery.php | 4 +- classes/db/index.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/form/AbstractForm.php | 4 +- classes/form/CustomerAddressForm.php | 4 +- classes/form/CustomerAddressFormatter.php | 4 +- classes/form/CustomerAddressPersister.php | 4 +- classes/form/CustomerForm.php | 4 +- classes/form/CustomerFormatter.php | 6 +- classes/form/CustomerLoginForm.php | 4 +- classes/form/CustomerLoginFormatter.php | 4 +- classes/form/CustomerPersister.php | 4 +- classes/form/FormField.php | 4 +- classes/form/FormFormatterInterface.php | 4 +- classes/form/FormInterface.php | 4 +- classes/helper/Helper.php | 4 +- classes/helper/HelperCalendar.php | 4 +- classes/helper/HelperForm.php | 6 +- classes/helper/HelperImageUploader.php | 4 +- classes/helper/HelperKpi.php | 4 +- classes/helper/HelperKpiRow.php | 4 +- classes/helper/HelperList.php | 4 +- classes/helper/HelperOptions.php | 4 +- classes/helper/HelperShop.php | 4 +- classes/helper/HelperTreeCategories.php | 4 +- classes/helper/HelperTreeShops.php | 4 +- classes/helper/HelperUploader.php | 4 +- classes/helper/HelperView.php | 4 +- classes/helper/index.php | 4 +- classes/index.php | 4 +- classes/log/AbstractLogger.php | 4 +- classes/log/FileLogger.php | 4 +- classes/log/index.php | 4 +- classes/module/CarrierModule.php | 4 +- classes/module/Module.php | 4 +- classes/module/ModuleGraph.php | 4 +- classes/module/ModuleGraphEngine.php | 4 +- classes/module/ModuleGrid.php | 4 +- classes/module/ModuleGridEngine.php | 4 +- classes/module/index.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/order/index.php | 4 +- classes/pdf/HTMLTemplate.php | 6 +- classes/pdf/HTMLTemplateDeliverySlip.php | 4 +- classes/pdf/HTMLTemplateInvoice.php | 4 +- classes/pdf/HTMLTemplateOrderReturn.php | 10 +- classes/pdf/HTMLTemplateOrderSlip.php | 4 +- classes/pdf/HTMLTemplateSupplyOrderForm.php | 6 +- classes/pdf/PDF.php | 4 +- classes/pdf/PDFGenerator.php | 4 +- classes/pdf/index.php | 4 +- classes/proxy/LinkProxy.php | 4 +- classes/range/RangePrice.php | 4 +- classes/range/RangeWeight.php | 4 +- classes/range/index.php | 4 +- classes/shop/Shop.php | 4 +- classes/shop/ShopGroup.php | 4 +- classes/shop/ShopUrl.php | 4 +- classes/shop/index.php | 4 +- classes/stock/Stock.php | 4 +- classes/stock/StockAvailable.php | 4 +- classes/stock/StockManager.php | 6 +- 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 | 4 +- classes/stock/Warehouse.php | 4 +- classes/stock/WarehouseProductLocation.php | 4 +- classes/stock/index.php | 4 +- .../tax/AverageTaxOfProductsTaxCalculator.php | 4 +- classes/tax/Tax.php | 4 +- classes/tax/TaxCalculator.php | 4 +- classes/tax/TaxConfiguration.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/tax/index.php | 4 +- classes/tree/ITreeToolbar.php | 4 +- classes/tree/ITreeToolbarButton.php | 4 +- classes/tree/Tree.php | 4 +- classes/tree/TreeToolbar.php | 4 +- classes/tree/TreeToolbarButton.php | 4 +- classes/tree/TreeToolbarLink.php | 4 +- classes/tree/TreeToolbarSearch.php | 4 +- classes/tree/TreeToolbarSearchCategories.php | 4 +- classes/tree/index.php | 4 +- classes/webservice/WebserviceException.php | 4 +- classes/webservice/WebserviceKey.php | 4 +- .../webservice/WebserviceOutputBuilder.php | 4 +- .../webservice/WebserviceOutputInterface.php | 4 +- classes/webservice/WebserviceOutputJSON.php | 4 +- classes/webservice/WebserviceOutputXML.php | 4 +- classes/webservice/WebserviceRequest.php | 4 +- .../WebserviceSpecificManagementImages.php | 4 +- .../WebserviceSpecificManagementInterface.php | 4 +- .../WebserviceSpecificManagementSearch.php | 4 +- classes/webservice/index.php | 4 +- config/alias.php | 4 +- config/autoload.php | 4 +- config/bootstrap.php | 4 +- config/config.inc.php | 4 +- config/db_slave_server.inc.php | 4 +- config/defines.inc.php | 4 +- config/defines_uri.inc.php | 4 +- config/index.php | 4 +- config/smarty.config.inc.php | 4 +- config/smartyadmin.config.inc.php | 4 +- config/smartyfront.config.inc.php | 4 +- config/xml/index.php | 4 +- config/xml/themes/index.php | 4 +- controllers/admin/AdminAccessController.php | 4 +- .../admin/AdminAddonsCatalogController.php | 4 +- .../admin/AdminAddressesController.php | 4 +- .../admin/AdminAdminPreferencesController.php | 4 +- .../admin/AdminAttachmentsController.php | 4 +- .../AdminAttributeGeneratorController.php | 4 +- .../admin/AdminAttributesGroupsController.php | 4 +- controllers/admin/AdminBackupController.php | 4 +- .../admin/AdminCarrierWizardController.php | 4 +- controllers/admin/AdminCarriersController.php | 4 +- .../admin/AdminCartRulesController.php | 4 +- controllers/admin/AdminCartsController.php | 4 +- .../admin/AdminCategoriesController.php | 4 +- .../admin/AdminCmsCategoriesController.php | 4 +- .../admin/AdminCmsContentController.php | 4 +- controllers/admin/AdminCmsController.php | 4 +- controllers/admin/AdminContactsController.php | 4 +- .../admin/AdminCountriesController.php | 4 +- .../admin/AdminCurrenciesController.php | 4 +- .../AdminCustomerPreferencesController.php | 4 +- .../admin/AdminCustomerThreadsController.php | 4 +- .../admin/AdminCustomersController.php | 4 +- .../admin/AdminDashboardController.php | 4 +- .../admin/AdminDeliverySlipController.php | 4 +- controllers/admin/AdminEmailsController.php | 4 +- .../admin/AdminEmployeesController.php | 4 +- controllers/admin/AdminFeaturesController.php | 4 +- controllers/admin/AdminGendersController.php | 4 +- .../admin/AdminGeolocationController.php | 4 +- controllers/admin/AdminGroupsController.php | 4 +- controllers/admin/AdminImagesController.php | 4 +- controllers/admin/AdminImportController.php | 4 +- .../admin/AdminInformationController.php | 4 +- controllers/admin/AdminInvoicesController.php | 4 +- .../admin/AdminLanguagesController.php | 4 +- .../admin/AdminLegacyLayoutController.php | 4 +- .../admin/AdminLocalizationController.php | 4 +- controllers/admin/AdminLoginController.php | 4 +- controllers/admin/AdminLogsController.php | 4 +- .../admin/AdminMaintenanceController.php | 4 +- .../admin/AdminManufacturersController.php | 4 +- controllers/admin/AdminMetaController.php | 4 +- controllers/admin/AdminModulesController.php | 4 +- .../admin/AdminModulesPositionsController.php | 4 +- controllers/admin/AdminNotFoundController.php | 4 +- .../admin/AdminOrderMessageController.php | 4 +- .../admin/AdminOrderPreferencesController.php | 4 +- controllers/admin/AdminOrdersController.php | 4 +- .../admin/AdminOutstandingController.php | 4 +- .../admin/AdminPPreferencesController.php | 4 +- controllers/admin/AdminPatternsController.php | 4 +- controllers/admin/AdminPaymentController.php | 4 +- .../AdminPaymentPreferencesController.php | 4 +- controllers/admin/AdminPdfController.php | 4 +- .../admin/AdminPerformanceController.php | 4 +- .../admin/AdminPreferencesController.php | 4 +- controllers/admin/AdminProductsController.php | 4 +- controllers/admin/AdminProfilesController.php | 4 +- .../admin/AdminQuickAccessesController.php | 4 +- .../admin/AdminReferrersController.php | 4 +- .../admin/AdminRequestSqlController.php | 4 +- controllers/admin/AdminReturnController.php | 4 +- .../admin/AdminSearchConfController.php | 4 +- controllers/admin/AdminSearchController.php | 4 +- .../admin/AdminSearchEnginesController.php | 4 +- controllers/admin/AdminShippingController.php | 4 +- controllers/admin/AdminShopController.php | 4 +- .../admin/AdminShopGroupController.php | 4 +- controllers/admin/AdminShopUrlController.php | 4 +- controllers/admin/AdminSlipController.php | 4 +- .../AdminSpecificPriceRuleController.php | 4 +- controllers/admin/AdminStatesController.php | 4 +- controllers/admin/AdminStatsController.php | 4 +- controllers/admin/AdminStatsTabController.php | 4 +- controllers/admin/AdminStatusesController.php | 4 +- .../AdminStockConfigurationController.php | 4 +- .../admin/AdminStockCoverController.php | 4 +- .../AdminStockInstantStateController.php | 4 +- .../admin/AdminStockManagementController.php | 4 +- controllers/admin/AdminStockMvtController.php | 4 +- controllers/admin/AdminStoresController.php | 4 +- .../admin/AdminSuppliersController.php | 4 +- .../admin/AdminSupplyOrdersController.php | 4 +- controllers/admin/AdminTabsController.php | 4 +- controllers/admin/AdminTagsController.php | 4 +- .../admin/AdminTaxRulesGroupController.php | 4 +- controllers/admin/AdminTaxesController.php | 4 +- .../admin/AdminThemesCatalogController.php | 4 +- controllers/admin/AdminThemesController.php | 4 +- controllers/admin/AdminTrackingController.php | 4 +- .../admin/AdminTranslationsController.php | 4 +- .../admin/AdminWarehousesController.php | 4 +- .../admin/AdminWebserviceController.php | 4 +- controllers/admin/AdminZonesController.php | 4 +- controllers/admin/index.php | 4 +- controllers/front/AddressController.php | 4 +- controllers/front/AddressesController.php | 4 +- controllers/front/AttachmentController.php | 4 +- controllers/front/AuthController.php | 4 +- controllers/front/CartController.php | 4 +- .../front/ChangeCurrencyController.php | 4 +- controllers/front/CmsController.php | 4 +- controllers/front/ContactController.php | 4 +- controllers/front/DiscountController.php | 4 +- controllers/front/GetFileController.php | 4 +- controllers/front/GuestTrackingController.php | 4 +- controllers/front/HistoryController.php | 4 +- controllers/front/IdentityController.php | 4 +- controllers/front/IndexController.php | 4 +- controllers/front/MyAccountController.php | 4 +- .../front/OrderConfirmationController.php | 4 +- controllers/front/OrderController.php | 4 +- controllers/front/OrderDetailController.php | 4 +- controllers/front/OrderFollowController.php | 4 +- controllers/front/OrderReturnController.php | 4 +- controllers/front/OrderSlipController.php | 4 +- controllers/front/PageNotFoundController.php | 4 +- controllers/front/PasswordController.php | 4 +- controllers/front/PdfInvoiceController.php | 4 +- .../front/PdfOrderReturnController.php | 4 +- controllers/front/PdfOrderSlipController.php | 4 +- controllers/front/ProductController.php | 4 +- controllers/front/SitemapController.php | 4 +- controllers/front/StatisticsController.php | 4 +- controllers/front/StoresController.php | 4 +- controllers/front/index.php | 4 +- .../front/listing/BestSalesController.php | 4 +- .../front/listing/CategoryController.php | 4 +- .../front/listing/ManufacturerController.php | 4 +- .../front/listing/NewProductsController.php | 4 +- .../front/listing/PricesDropController.php | 4 +- .../front/listing/SearchController.php | 4 +- .../front/listing/SupplierController.php | 4 +- controllers/index.php | 4 +- diff-hooks.php | 4 +- docs/CHANGELOG.txt | 4 +- docs/csv_import/index.php | 10 +- docs/index.php | 10 +- docs/licences/index.php | 4 +- docs/readme_de.txt | 4 +- docs/readme_en.txt | 4 +- docs/readme_es.txt | 4 +- docs/readme_fr.txt | 4 +- docs/readme_it.txt | 4 +- download/index.php | 4 +- images.inc.php | 4 +- img/admin/index.php | 4 +- img/c/index.php | 4 +- img/cms/index.php | 10 +- img/co/index.php | 4 +- img/genders/index.php | 4 +- img/index.php | 4 +- img/jquery-ui/index.php | 10 +- 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 | 4 +- init.php | 4 +- install-dev/autoload.php | 4 +- .../classes/HttpConfigureInterface.php | 4 +- install-dev/classes/Step.php | 4 +- install-dev/classes/StepList.php | 4 +- install-dev/classes/controllerConsole.php | 4 +- install-dev/classes/controllerHttp.php | 4 +- install-dev/classes/datas.php | 4 +- install-dev/classes/exception.php | 4 +- install-dev/classes/index.php | 4 +- install-dev/classes/session.php | 4 +- install-dev/controllers/console/index.php | 4 +- install-dev/controllers/console/process.php | 4 +- install-dev/controllers/http/configure.php | 4 +- install-dev/controllers/http/database.php | 4 +- install-dev/controllers/http/index.php | 4 +- install-dev/controllers/http/license.php | 4 +- install-dev/controllers/http/process.php | 4 +- .../controllers/http/smarty_compile.php | 4 +- install-dev/controllers/http/system.php | 4 +- install-dev/controllers/http/welcome.php | 4 +- install-dev/controllers/index.php | 4 +- install-dev/data/img/genders/index.php | 4 +- install-dev/data/img/index.php | 4 +- install-dev/data/img/os/index.php | 4 +- install-dev/data/index.php | 4 +- install-dev/data/xml/index.php | 4 +- .../fashion/data/generate_attribute.php | 4 +- install-dev/fixtures/fashion/data/index.php | 4 +- install-dev/fixtures/fashion/img/c/index.php | 4 +- install-dev/fixtures/fashion/img/c/resize.php | 4 +- install-dev/fixtures/fashion/img/index.php | 4 +- install-dev/fixtures/fashion/img/m/index.php | 4 +- install-dev/fixtures/fashion/img/p/index.php | 4 +- install-dev/fixtures/fashion/img/p/resize.php | 4 +- .../fixtures/fashion/img/scenes/index.php | 4 +- .../fashion/img/scenes/thumbs/index.php | 4 +- install-dev/fixtures/fashion/img/st/index.php | 4 +- install-dev/fixtures/fashion/img/su/index.php | 4 +- install-dev/fixtures/fashion/index.php | 4 +- install-dev/fixtures/fashion/install.php | 4 +- .../fixtures/fashion/langs/bn/data/index.php | 4 +- .../fixtures/fashion/langs/bn/index.php | 4 +- .../fixtures/fashion/langs/br/data/index.php | 4 +- .../fixtures/fashion/langs/br/index.php | 4 +- .../fixtures/fashion/langs/de/data/index.php | 4 +- .../fixtures/fashion/langs/de/index.php | 4 +- .../fixtures/fashion/langs/en/data/index.php | 4 +- .../fixtures/fashion/langs/en/index.php | 4 +- .../fixtures/fashion/langs/es/data/index.php | 4 +- .../fixtures/fashion/langs/es/index.php | 4 +- .../fixtures/fashion/langs/fa/data/index.php | 4 +- .../fixtures/fashion/langs/fa/index.php | 4 +- .../fixtures/fashion/langs/fr/data/index.php | 4 +- .../fixtures/fashion/langs/fr/index.php | 4 +- .../fixtures/fashion/langs/id/data/index.php | 4 +- .../fixtures/fashion/langs/id/index.php | 4 +- install-dev/fixtures/fashion/langs/index.php | 4 +- .../fixtures/fashion/langs/it/data/index.php | 4 +- .../fixtures/fashion/langs/it/index.php | 4 +- .../fixtures/fashion/langs/nl/data/index.php | 4 +- .../fixtures/fashion/langs/nl/index.php | 4 +- .../fixtures/fashion/langs/pl/data/index.php | 4 +- .../fixtures/fashion/langs/pl/index.php | 4 +- .../fixtures/fashion/langs/qc/data/index.php | 4 +- .../fixtures/fashion/langs/qc/index.php | 4 +- .../fixtures/fashion/langs/ro/data/index.php | 4 +- .../fixtures/fashion/langs/ro/index.php | 4 +- .../fixtures/fashion/langs/ru/data/index.php | 4 +- .../fixtures/fashion/langs/ru/index.php | 4 +- .../fixtures/fashion/langs/tw/data/index.php | 4 +- .../fixtures/fashion/langs/tw/index.php | 4 +- .../fixtures/fashion/langs/vn/data/index.php | 4 +- .../fixtures/fashion/langs/vn/index.php | 4 +- .../fixtures/fashion/langs/zh/data/index.php | 4 +- .../fixtures/fashion/langs/zh/index.php | 4 +- install-dev/fixtures/index.php | 4 +- install-dev/index.php | 4 +- install-dev/index_cli.php | 4 +- install-dev/init.php | 4 +- install-dev/install_version.php | 4 +- install-dev/langs/bg/data/index.php | 4 +- install-dev/langs/bg/img/index.php | 4 +- install-dev/langs/bg/index.php | 4 +- install-dev/langs/bn/data/index.php | 4 +- install-dev/langs/bn/img/index.php | 4 +- install-dev/langs/bn/index.php | 4 +- install-dev/langs/br/data/index.php | 4 +- install-dev/langs/br/img/index.php | 4 +- install-dev/langs/br/index.php | 4 +- install-dev/langs/ca/index.php | 4 +- install-dev/langs/cs/data/index.php | 4 +- install-dev/langs/cs/img/index.php | 4 +- install-dev/langs/cs/index.php | 4 +- install-dev/langs/da/data/index.php | 4 +- install-dev/langs/da/img/index.php | 4 +- install-dev/langs/da/index.php | 4 +- install-dev/langs/de/data/index.php | 4 +- install-dev/langs/de/img/index.php | 4 +- install-dev/langs/de/index.php | 4 +- install-dev/langs/en/data/index.php | 4 +- install-dev/langs/en/img/index.php | 4 +- install-dev/langs/en/index.php | 4 +- install-dev/langs/es/data/index.php | 4 +- install-dev/langs/es/img/index.php | 4 +- install-dev/langs/es/index.php | 4 +- install-dev/langs/fa/data/index.php | 4 +- install-dev/langs/fa/img/index.php | 4 +- install-dev/langs/fa/index.php | 4 +- install-dev/langs/fr/data/index.php | 4 +- install-dev/langs/fr/img/index.php | 4 +- install-dev/langs/fr/index.php | 4 +- install-dev/langs/he/data/index.php | 4 +- install-dev/langs/he/img/index.php | 4 +- install-dev/langs/he/index.php | 4 +- install-dev/langs/hr/data/index.php | 4 +- install-dev/langs/hr/img/index.php | 4 +- install-dev/langs/hr/index.php | 4 +- install-dev/langs/hu/data/index.php | 4 +- install-dev/langs/hu/img/index.php | 4 +- install-dev/langs/hu/index.php | 4 +- install-dev/langs/id/data/index.php | 4 +- install-dev/langs/id/img/index.php | 4 +- install-dev/langs/id/index.php | 4 +- install-dev/langs/index.php | 4 +- install-dev/langs/it/data/index.php | 4 +- install-dev/langs/it/img/index.php | 4 +- install-dev/langs/it/index.php | 4 +- install-dev/langs/lt/data/index.php | 4 +- install-dev/langs/lt/img/index.php | 4 +- install-dev/langs/lt/index.php | 4 +- install-dev/langs/mk/data/index.php | 4 +- install-dev/langs/mk/img/index.php | 4 +- install-dev/langs/mk/index.php | 4 +- install-dev/langs/nl/data/index.php | 4 +- install-dev/langs/nl/img/index.php | 4 +- install-dev/langs/nl/index.php | 4 +- install-dev/langs/no/data/index.php | 4 +- install-dev/langs/no/img/index.php | 4 +- install-dev/langs/no/index.php | 4 +- install-dev/langs/pl/data/index.php | 4 +- install-dev/langs/pl/img/index.php | 4 +- install-dev/langs/pl/index.php | 4 +- install-dev/langs/pt/data/index.php | 4 +- install-dev/langs/pt/img/index.php | 4 +- install-dev/langs/pt/index.php | 4 +- install-dev/langs/qc/data/index.php | 4 +- install-dev/langs/qc/img/index.php | 4 +- install-dev/langs/qc/index.php | 4 +- install-dev/langs/ro/data/index.php | 4 +- install-dev/langs/ro/img/index.php | 4 +- install-dev/langs/ro/index.php | 4 +- install-dev/langs/ru/data/index.php | 4 +- install-dev/langs/ru/img/index.php | 4 +- install-dev/langs/ru/index.php | 4 +- install-dev/langs/si/data/index.php | 4 +- install-dev/langs/si/img/index.php | 4 +- install-dev/langs/si/index.php | 4 +- install-dev/langs/sr/data/index.php | 4 +- install-dev/langs/sr/img/index.php | 4 +- install-dev/langs/sr/index.php | 4 +- install-dev/langs/sv/data/index.php | 4 +- install-dev/langs/sv/img/index.php | 4 +- install-dev/langs/sv/index.php | 4 +- install-dev/langs/tr/img/index.php | 4 +- install-dev/langs/tr/index.php | 4 +- install-dev/langs/tw/data/index.php | 4 +- install-dev/langs/tw/img/index.php | 4 +- install-dev/langs/tw/index.php | 4 +- install-dev/langs/vn/data/index.php | 4 +- install-dev/langs/vn/img/index.php | 4 +- install-dev/langs/vn/index.php | 4 +- install-dev/langs/zh/data/index.php | 4 +- install-dev/langs/zh/img/index.php | 4 +- install-dev/langs/zh/index.php | 4 +- install-dev/sandbox/index.php | 4 +- install-dev/sandbox/test.php | 4 +- install-dev/theme/img/index.php | 10 +- install-dev/theme/index.php | 4 +- install-dev/theme/js/configure.js | 104 ++--- install-dev/theme/js/database.js | 6 +- install-dev/theme/js/index.php | 4 +- install-dev/theme/js/install.js | 122 ++--- install-dev/theme/js/license.js | 10 +- install-dev/theme/js/process.js | 4 +- install-dev/theme/js/welcome.js | 18 +- install-dev/theme/views/configure.php | 4 +- install-dev/theme/views/database.php | 4 +- install-dev/theme/views/index.php | 4 +- install-dev/theme/views/license.php | 4 +- install-dev/theme/views/process.php | 4 +- install-dev/theme/views/system.php | 4 +- install-dev/theme/views/welcome.php | 4 +- install-dev/upgrade/classes/AddConfToFile.php | 4 +- install-dev/upgrade/classes/ToolsInstall.php | 4 +- install-dev/upgrade/classes/index.php | 4 +- install-dev/upgrade/index.php | 10 +- .../upgrade/php/add_accounting_tab.php | 4 +- .../upgrade/php/add_attribute_position.php | 4 +- .../upgrade/php/add_carrier_position.php | 4 +- ...lumn_order_state_deleted_if_not_exists.php | 4 +- ..._column_orders_reference_if_not_exists.php | 4 +- ...dd_default_restrictions_modules_groups.php | 4 +- .../upgrade/php/add_feature_position.php | 4 +- .../php/add_group_attribute_position.php | 4 +- .../php/add_id_shop_to_shipper_lang_index.php | 6 +- .../php/add_missing_columns_customer.php | 6 +- .../upgrade/php/add_missing_image_key.php | 4 +- .../upgrade/php/add_missing_rewrite_value.php | 4 +- .../add_missing_shop_column_pagenotfound.php | 4 +- .../upgrade/php/add_module_to_hook.php | 4 +- install-dev/upgrade/php/add_new_groups.php | 6 +- install-dev/upgrade/php/add_new_tab.php | 4 +- .../add_order_reference_in_order_payment.php | 18 +- install-dev/upgrade/php/add_order_state.php | 4 +- .../upgrade/php/add_quick_access_tab.php | 4 +- .../add_required_customization_field_flag.php | 4 +- install-dev/upgrade/php/add_stock_tab.php | 4 +- .../upgrade/php/add_unknown_gender.php | 4 +- install-dev/upgrade/php/alter_blocklink.php | 4 +- install-dev/upgrade/php/alter_cms_block.php | 10 +- .../upgrade/php/alter_ignore_drop_key.php | 4 +- .../php/alter_productcomments_guest_index.php | 6 +- .../attribute_group_clean_combinations.php | 4 +- .../upgrade/php/block_category_1521.php | 4 +- install-dev/upgrade/php/blocknewsletter.php | 4 +- .../upgrade/php/blocknewsletter1530.php | 6 +- .../php/category_product_index_unique.php | 4 +- .../php/check_webservice_account_table.php | 4 +- .../upgrade/php/clean_category_product.php | 4 +- install-dev/upgrade/php/clean_tabs_15.php | 4 +- install-dev/upgrade/php/cms_block.php | 4 +- install-dev/upgrade/php/cms_multishop.php | 4 +- .../php/configuration_double_cleaner.php | 4 +- .../upgrade/php/convert_product_price.php | 4 +- .../upgrade/php/country_to_timezone.php | 4 +- install-dev/upgrade/php/create_multistore.php | 4 +- .../customization_field_multishop_lang.php | 4 +- .../upgrade/php/deactivate_custom_modules.php | 4 +- .../upgrade/php/delivery_number_set.php | 4 +- .../php/drop_image_type_non_unique_index.php | 4 +- .../php/drop_module_non_unique_index.php | 4 +- .../php/ecotax_tax_application_fix.php | 4 +- install-dev/upgrade/php/editorial_update.php | 4 +- .../php/editorial_update_multishop.php | 4 +- install-dev/upgrade/php/fix_cms_shop_1520.php | 4 +- .../fix_download_product_feature_active.php | 4 +- .../upgrade/php/fix_unique_specific_price.php | 4 +- install-dev/upgrade/php/generate_ntree.php | 4 +- .../generate_root_category_for_multishop.php | 6 +- .../upgrade/php/generate_tax_rules.php | 4 +- .../php/generic_add_missing_column.php | 6 +- .../upgrade/php/gridextjs_deprecated.php | 4 +- .../php/group_reduction_column_fix.php | 4 +- .../php/hook_blocksearch_on_header.php | 4 +- .../upgrade/php/id_currency_country_fix.php | 4 +- install-dev/upgrade/php/image_shop1510.php | 4 +- install-dev/upgrade/php/index.php | 10 +- .../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 | 24 +- install-dev/upgrade/php/migrate_tabs_15.php | 4 +- install-dev/upgrade/php/migrate_tabs_17.php | 6 +- .../upgrade/php/migrate_tabs_multi_shop.php | 12 +- .../php/module_blockwishlist_multishop.php | 6 +- .../php/module_reinstall_blockmyaccount.php | 4 +- .../php/module_reinstall_blocksearch.php | 4 +- install-dev/upgrade/php/move_crossselling.php | 4 +- .../php/move_translations_module_file.php | 4 +- .../php/outstanding_allow_amount1530.php | 4 +- ...15010_drop_column_id_address_if_exists.php | 4 +- .../php/p15012_add_missing_columns.php | 12 +- .../php/p15013_add_missing_columns.php | 4 +- .../php/p15014_add_missing_columns.php | 4 +- ...copy_missing_images_tab_from_installer.php | 4 +- .../upgrade/php/p15014_upgrade_sekeywords.php | 4 +- .../php/p15015_blockadvertising_extension.php | 4 +- .../php/p15016_add_missing_columns.php | 14 +- .../php/p15017_add_id_shop_to_primary_key.php | 6 +- .../upgrade/php/p15018_change_image_types.php | 8 +- .../upgrade/php/p1531_redirect_type.php | 6 +- .../upgrade/php/p1540_add_missing_columns.php | 10 +- .../upgrade/php/p16011_media_server.php | 4 +- .../upgrade/php/p16012_pack_rework.php | 4 +- .../upgrade/php/p1603_add_attachment_size.php | 4 +- .../upgrade/php/p1606module_exceptions.php | 16 +- .../php/p1607_drop_primary_key_if_exists.php | 4 +- .../upgrade/php/ps1600_add_missing_index.php | 4 +- .../upgrade/php/ps16012_update_alias.php | 4 +- .../php/ps1604_update_employee_date.php | 4 +- .../upgrade/php/ps1605_change_index.php | 4 +- .../php/ps1607_language_code_update.php | 4 +- install-dev/upgrade/php/ps1700_stores.php | 4 +- .../upgrade/php/ps_1700_add_locale.php | 4 +- .../ps_1700_add_payment_preferences_tab.php | 4 +- .../upgrade/php/ps_1700_reset_theme.php | 6 +- .../upgrade/php/ps_1700_right_management.php | 12 +- .../upgrade/php/regenerate_level_depth.php | 4 +- .../php/remove_duplicate_category_groups.php | 4 +- .../upgrade/php/remove_module_from_hook.php | 6 +- install-dev/upgrade/php/remove_tab.php | 4 +- install-dev/upgrade/php/reorderpositions.php | 12 +- .../php/select_current_payment_modules.php | 4 +- .../upgrade/php/set_discount_category.php | 4 +- .../upgrade/php/set_payment_module.php | 4 +- .../upgrade/php/set_payment_module_group.php | 4 +- .../upgrade/php/set_product_suppliers.php | 4 +- .../upgrade/php/set_stock_available.php | 4 +- .../php/setallgroupsonhomecategory.php | 4 +- install-dev/upgrade/php/shop_url.php | 4 +- .../upgrade/php/update_carrier_url.php | 4 +- .../php/update_customer_default_group.php | 6 +- .../php/update_feature_detachable_cache.php | 4 +- .../upgrade/php/update_for_13version.php | 6 +- .../upgrade/php/update_genders_images.php | 4 +- .../upgrade/php/update_image_size_in_db.php | 4 +- .../update_mailalerts_add_column_idshop.php | 4 +- .../php/update_module_blocklayered.php | 4 +- .../upgrade/php/update_module_followup.php | 4 +- .../upgrade/php/update_module_loyalty.php | 4 +- .../php/update_module_pagesnotfound.php | 4 +- .../php/update_module_product_comments.php | 4 +- .../upgrade/php/update_modules_multishop.php | 6 +- .../upgrade/php/update_modules_sql.php | 4 +- .../upgrade/php/update_order_canada.php | 4 +- .../upgrade/php/update_order_detail_taxes.php | 6 +- .../upgrade/php/update_order_details.php | 4 +- .../upgrade/php/update_order_messages.php | 4 +- .../php/update_products_ecotax_v133.php | 4 +- .../upgrade/php/update_stock_mvt_reason.php | 4 +- .../upgrade/php/updateproductcomments.php | 4 +- .../php/updatetabicon_from_11version.php | 4 +- install-dev/upgrade/php/upgrade_cms_15.php | 6 +- .../upgrade/php/upgrade_cms_15_rename.php | 4 +- install-dev/upgrade/sql/index.php | 10 +- install-dev/upgrade/upgrade.php | 8 +- js/admin-categories-tree.js | 4 +- js/admin.js | 4 +- js/admin/addons.js | 4 +- js/admin/attachments.js | 4 +- js/admin/carrier_wizard.js | 4 +- js/admin/dashboard.js | 4 +- js/admin/dnd.js | 4 +- js/admin/email.js | 6 +- js/admin/import.js | 56 +-- js/admin/index.php | 4 +- js/admin/modules-position.js | 4 +- js/admin/notifications.js | 4 +- js/admin/orders.js | 10 +- js/admin/price.js | 4 +- js/admin/products.js | 4 +- js/admin/themes.js | 4 +- js/admin/tinymce_loader.js | 4 +- js/cldr.js | 36 +- js/cropper/index.php | 4 +- js/index.php | 4 +- js/jquery/index.php | 4 +- js/jquery/plugins/ajaxfileupload/index.php | 4 +- js/jquery/plugins/alerts/images/index.php | 4 +- js/jquery/plugins/alerts/index.php | 4 +- js/jquery/plugins/autocomplete/index.php | 4 +- js/jquery/plugins/bxslider/index.php | 4 +- js/jquery/plugins/chosen/index.php | 4 +- js/jquery/plugins/cluetip/index.php | 4 +- js/jquery/plugins/fancybox/index.php | 4 +- js/jquery/plugins/footable-sort/index.php | 4 +- js/jquery/plugins/footable/index.php | 4 +- js/jquery/plugins/growl/index.php | 4 +- js/jquery/plugins/imgareaselect/index.php | 4 +- js/jquery/plugins/index.php | 4 +- js/jquery/plugins/jgrowl/index.php | 4 +- js/jquery/plugins/jqzoom/index.php | 4 +- js/jquery/plugins/jstree/index.php | 4 +- .../plugins/jstree/themes/apple/index.php | 4 +- .../plugins/jstree/themes/classic/index.php | 4 +- .../jstree/themes/default-rtl/index.php | 4 +- .../plugins/jstree/themes/default/index.php | 4 +- js/jquery/plugins/jstree/themes/index.php | 4 +- js/jquery/plugins/select2/index.php | 4 +- js/jquery/plugins/smartWizard/index.php | 4 +- js/jquery/plugins/tabpane/index.php | 4 +- js/jquery/plugins/thickbox/index.php | 4 +- js/jquery/plugins/timepicker/index.php | 4 +- .../treeview-categories/images/index.php | 4 +- .../plugins/treeview-categories/index.php | 4 +- js/jquery/plugins/validate/index.php | 4 +- .../plugins/validate/localization/index.php | 4 +- js/jquery/ui/i18n/index.php | 4 +- js/jquery/ui/index.php | 4 +- js/jquery/ui/themes/base/images/index.php | 4 +- js/jquery/ui/themes/base/index.php | 4 +- .../ui/themes/base/minified/images/index.php | 4 +- js/jquery/ui/themes/base/minified/index.php | 4 +- js/jquery/ui/themes/index.php | 4 +- .../ui/themes/ui-lightness/images/index.php | 4 +- js/jquery/ui/themes/ui-lightness/index.php | 4 +- .../ui-lightness/minified/images/index.php | 4 +- .../ui/themes/ui-lightness/minified/index.php | 4 +- js/retro-compat.js.php | 4 +- js/tiny_mce/index.php | 10 +- js/tiny_mce/langs/index.php | 4 +- js/tiny_mce/plugins/advlist/index.php | 4 +- js/tiny_mce/plugins/anchor/index.php | 4 +- js/tiny_mce/plugins/autolink/index.php | 4 +- js/tiny_mce/plugins/autoresize/index.php | 4 +- js/tiny_mce/plugins/autosave/index.php | 4 +- js/tiny_mce/plugins/bbcode/index.php | 4 +- js/tiny_mce/plugins/charmap/index.php | 4 +- js/tiny_mce/plugins/code/index.php | 4 +- js/tiny_mce/plugins/colorpicker/index.php | 4 +- js/tiny_mce/plugins/contextmenu/index.php | 4 +- js/tiny_mce/plugins/directionality/index.php | 4 +- js/tiny_mce/plugins/emoticons/img/index.php | 4 +- js/tiny_mce/plugins/emoticons/index.php | 4 +- js/tiny_mce/plugins/example/index.php | 4 +- .../plugins/example_dependency/index.php | 4 +- js/tiny_mce/plugins/fullpage/index.php | 4 +- js/tiny_mce/plugins/fullscreen/index.php | 4 +- js/tiny_mce/plugins/hr/index.php | 4 +- js/tiny_mce/plugins/image/index.php | 4 +- js/tiny_mce/plugins/importcss/index.php | 4 +- js/tiny_mce/plugins/index.php | 10 +- js/tiny_mce/plugins/insertdatetime/index.php | 4 +- js/tiny_mce/plugins/layer/index.php | 4 +- js/tiny_mce/plugins/legacyoutput/index.php | 4 +- js/tiny_mce/plugins/link/index.php | 4 +- js/tiny_mce/plugins/lists/index.php | 4 +- js/tiny_mce/plugins/media/index.php | 4 +- js/tiny_mce/plugins/nonbreaking/index.php | 4 +- js/tiny_mce/plugins/noneditable/index.php | 4 +- js/tiny_mce/plugins/pagebreak/index.php | 4 +- js/tiny_mce/plugins/paste/index.php | 4 +- js/tiny_mce/plugins/placeholder/index.php | 4 +- js/tiny_mce/plugins/preview/index.php | 4 +- js/tiny_mce/plugins/print/index.php | 4 +- js/tiny_mce/plugins/save/index.php | 4 +- js/tiny_mce/plugins/searchreplace/index.php | 4 +- js/tiny_mce/plugins/tabfocus/index.php | 4 +- js/tiny_mce/plugins/table/index.php | 4 +- js/tiny_mce/plugins/template/index.php | 4 +- js/tiny_mce/plugins/textcolor/index.php | 4 +- .../plugins/visualblocks/css/index.php | 4 +- js/tiny_mce/plugins/visualblocks/index.php | 4 +- js/tiny_mce/plugins/visualchars/index.php | 4 +- js/tiny_mce/plugins/wordcount/index.php | 4 +- js/tiny_mce/skins/index.php | 4 +- js/tiny_mce/skins/prestashop/index.php | 4 +- js/tiny_mce/themes/index.php | 4 +- js/tiny_mce/themes/modern/index.php | 4 +- js/tools.js | 4 +- js/validate.js | 4 +- js/vendor/index.php | 4 +- localization/index.php | 10 +- mails/en/download-product.tpl | 6 +- mails/en/index.php | 4 +- mails/en/order_conf_cart_rules.tpl | 6 +- mails/en/order_conf_product_list.tpl | 4 +- mails/index.php | 4 +- modules/index.php | 4 +- override/classes/cache/index.php | 10 +- override/classes/controller/index.php | 10 +- override/classes/db/index.php | 10 +- override/classes/exception/index.php | 10 +- override/classes/helper/index.php | 4 +- override/classes/index.php | 4 +- override/classes/log/index.php | 10 +- override/classes/module/index.php | 10 +- override/classes/order/index.php | 10 +- override/classes/pdf/index.php | 10 +- override/classes/range/index.php | 4 +- override/classes/shop/index.php | 10 +- override/classes/stock/index.php | 10 +- override/classes/tax/index.php | 10 +- override/classes/tree/index.php | 10 +- override/classes/webservice/index.php | 10 +- override/controllers/admin/index.php | 10 +- .../controllers/admin/templates/index.php | 10 +- override/controllers/front/index.php | 10 +- override/controllers/index.php | 10 +- override/index.php | 10 +- override/modules/index.php | 4 +- pdf/delivery-slip.addresses-tab.tpl | 4 +- pdf/delivery-slip.payment-tab.tpl | 4 +- pdf/delivery-slip.product-tab.tpl | 16 +- pdf/delivery-slip.style-tab.tpl | 4 +- pdf/delivery-slip.summary-tab.tpl | 4 +- pdf/delivery-slip.tpl | 8 +- pdf/footer.tpl | 6 +- pdf/header.tpl | 4 +- pdf/index.php | 4 +- pdf/invoice-b2b.tpl | 4 +- pdf/invoice.addresses-tab.tpl | 4 +- pdf/invoice.note-tab.tpl | 6 +- pdf/invoice.payment-tab.tpl | 4 +- pdf/invoice.product-tab.tpl | 4 +- pdf/invoice.shipping-tab.tpl | 4 +- pdf/invoice.style-tab.tpl | 4 +- pdf/invoice.summary-tab.tpl | 4 +- pdf/invoice.tax-tab.tpl | 4 +- pdf/invoice.total-tab.tpl | 4 +- pdf/invoice.tpl | 4 +- pdf/order-return.addresses-tab.tpl | 6 +- pdf/order-return.conditions-tab.tpl | 4 +- pdf/order-return.product-tab.tpl | 6 +- pdf/order-return.summary-tab.tpl | 4 +- pdf/order-return.tpl | 4 +- pdf/order-slip.payment-tab.tpl | 4 +- pdf/order-slip.product-tab.tpl | 4 +- pdf/order-slip.summary-tab.tpl | 4 +- pdf/order-slip.total-tab.tpl | 8 +- pdf/order-slip.tpl | 8 +- pdf/pagination.tpl | 4 +- pdf/supply-order-footer.tpl | 6 +- pdf/supply-order-header.tpl | 6 +- pdf/supply-order.addresses-tab.tpl | 4 +- pdf/supply-order.product-tab.tpl | 4 +- pdf/supply-order.tax-tab.tpl | 4 +- pdf/supply-order.total-tab.tpl | 4 +- pdf/supply-order.tpl | 8 +- robots.txt | 30 +- src/Adapter/Addons/AddonsDataProvider.php | 6 +- src/Adapter/AddressFactory.php | 4 +- .../Admin/AbstractAdminQueryBuilder.php | 4 +- .../Admin/LegacyBlockHelperSubscriber.php | 4 +- src/Adapter/Admin/PagePreference.php | 4 +- src/Adapter/Admin/UrlGenerator.php | 4 +- src/Adapter/Assets/AssetUrlGeneratorTrait.php | 4 +- ...minAttributeGeneratorControllerWrapper.php | 4 +- .../Attribute/AttributeDataProvider.php | 4 +- .../BestSalesProductSearchProvider.php | 4 +- src/Adapter/CacheManager.php | 4 +- src/Adapter/Carrier/CarrierDataProvider.php | 4 +- src/Adapter/Cart/CartPresenter.php | 4 +- .../AdminCategoryControllerWrapper.php | 4 +- src/Adapter/Category/CategoryDataProvider.php | 4 +- .../CategoryProductSearchProvider.php | 4 +- src/Adapter/CombinationDataProvider.php | 4 +- src/Adapter/Configuration.php | 4 +- src/Adapter/CoreException.php | 4 +- src/Adapter/Country/CountryDataProvider.php | 12 +- src/Adapter/Currency/CurrencyDataProvider.php | 4 +- src/Adapter/Customer/CustomerDataProvider.php | 4 +- src/Adapter/Database.php | 4 +- src/Adapter/EntityMapper.php | 4 +- src/Adapter/EntityMetaDataRetriever.php | 4 +- src/Adapter/Feature/FeatureDataProvider.php | 4 +- src/Adapter/Group/GroupDataProvider.php | 4 +- src/Adapter/Hook/HookInformationProvider.php | 4 +- src/Adapter/HookManager.php | 4 +- src/Adapter/Image/ImageRetriever.php | 4 +- src/Adapter/ImageManager.php | 4 +- src/Adapter/LegacyContext.php | 5 +- src/Adapter/LegacyHookSubscriber.php | 6 +- src/Adapter/LegacyLogger.php | 4 +- .../Manufacturer/ManufacturerDataProvider.php | 4 +- .../ManufacturerProductSearchProvider.php | 4 +- .../Module/AdminModuleDataProvider.php | 4 +- src/Adapter/Module/Module.php | 4 +- src/Adapter/Module/ModuleDataProvider.php | 6 +- src/Adapter/Module/ModuleDataUpdater.php | 4 +- src/Adapter/Module/ModulePresenter.php | 4 +- src/Adapter/Module/ModuleZipManager.php | 4 +- .../NewProductsProductSearchProvider.php | 4 +- src/Adapter/ObjectPresenter.php | 4 +- src/Adapter/Order/OrderPresenter.php | 4 +- src/Adapter/Order/OrderReturnPresenter.php | 4 +- src/Adapter/Pack/PackDataProvider.php | 4 +- .../PricesDropProductSearchProvider.php | 4 +- .../Product/AdminProductDataProvider.php | 4 +- .../Product/AdminProductDataUpdater.php | 4 +- src/Adapter/Product/AdminProductWrapper.php | 4 +- .../Product/AttachmentDataProvider.php | 4 +- src/Adapter/Product/PackItemsManager.php | 10 +- src/Adapter/Product/PriceCalculator.php | 4 +- src/Adapter/Product/PriceFormatter.php | 4 +- .../Product/ProductColorsRetriever.php | 4 +- src/Adapter/Product/ProductDataProvider.php | 4 +- .../Search/SearchProductSearchProvider.php | 4 +- src/Adapter/Security/Admin.php | 4 +- src/Adapter/Security/SslMiddleware.php | 4 +- src/Adapter/ServiceLocator.php | 4 +- src/Adapter/Shop/Context.php | 4 +- src/Adapter/StockManager.php | 4 +- src/Adapter/Supplier/SupplierDataProvider.php | 4 +- .../SupplierProductSearchProvider.php | 4 +- src/Adapter/Tax/TaxRuleDataProvider.php | 4 +- src/Adapter/Tools.php | 4 +- .../Warehouse/WarehouseDataProvider.php | 4 +- src/Core/Addon/AddonInterface.php | 4 +- src/Core/Addon/AddonListFilter.php | 4 +- src/Core/Addon/AddonListFilterOrigin.php | 4 +- src/Core/Addon/AddonListFilterStatus.php | 4 +- src/Core/Addon/AddonListFilterType.php | 4 +- src/Core/Addon/AddonListItem.php | 4 +- src/Core/Addon/AddonManagerInterface.php | 4 +- src/Core/Addon/AddonRepositoryInterface.php | 4 +- .../Module/AddonListFilterDeviceStatus.php | 4 +- src/Core/Addon/Module/ModuleInterface.php | 4 +- src/Core/Addon/Module/ModuleManager.php | 4 +- .../Addon/Module/ModuleManagerBuilder.php | 4 +- src/Core/Addon/Module/ModuleRepository.php | 4 +- .../Module/ModuleRepositoryInterface.php | 4 +- src/Core/Addon/Theme/Theme.php | 4 +- src/Core/Addon/Theme/ThemeExporter.php | 4 +- src/Core/Addon/Theme/ThemeManager.php | 4 +- src/Core/Addon/Theme/ThemeManagerBuilder.php | 4 +- src/Core/Addon/Theme/ThemeRepository.php | 4 +- src/Core/Addon/Theme/ThemeValidator.php | 4 +- src/Core/CMS/CMSRepository.php | 4 +- src/Core/CMS/CMSRoleRepository.php | 4 +- src/Core/Checkout/TermsAndConditions.php | 6 +- src/Core/Cldr/Composer/Hook.php | 4 +- src/Core/Cldr/Localize.php | 4 +- src/Core/Cldr/Repository.php | 4 +- src/Core/Cldr/Update.php | 4 +- src/Core/ConfigurationInterface.php | 4 +- src/Core/ContainerBuilder.php | 4 +- src/Core/Crypto/Hashing.php | 4 +- src/Core/Email/EmailLister.php | 4 +- .../Foundation/Database/DatabaseInterface.php | 4 +- .../Foundation/Database/EntityInterface.php | 4 +- .../Foundation/Database/EntityManager.php | 4 +- .../Database/EntityManager/QueryBuilder.php | 4 +- .../Foundation/Database/EntityMetaData.php | 4 +- .../Foundation/Database/EntityRepository.php | 4 +- src/Core/Foundation/Database/Exception.php | 4 +- src/Core/Foundation/Filesystem/Exception.php | 4 +- src/Core/Foundation/Filesystem/FileSystem.php | 4 +- src/Core/Foundation/IoC/Container.php | 4 +- src/Core/Foundation/IoC/Exception.php | 4 +- .../Templating/PresenterInterface.php | 4 +- .../Templating/RenderableInterface.php | 4 +- .../Foundation/Templating/RenderableProxy.php | 4 +- src/Core/Image/ImageTypeRepository.php | 4 +- src/Core/Module/HookConfigurator.php | 4 +- src/Core/Module/HookRepository.php | 4 +- src/Core/Module/WidgetInterface.php | 4 +- src/Core/Payment/PaymentOption.php | 4 +- .../Payment/PaymentOptionFormDecorator.php | 4 +- src/Core/Product/ProductExtraContent.php | 8 +- .../Product/ProductExtraContentFinder.php | 6 +- src/Core/Product/ProductListingPresenter.php | 4 +- .../Product/ProductPresentationSettings.php | 4 +- src/Core/Product/ProductPresenter.php | 4 +- src/Core/Product/Search/Facet.php | 4 +- src/Core/Product/Search/FacetCollection.php | 4 +- .../Search/FacetsRendererInterface.php | 4 +- src/Core/Product/Search/Filter.php | 4 +- src/Core/Product/Search/Pagination.php | 4 +- .../Product/Search/ProductSearchContext.php | 4 +- .../Search/ProductSearchProviderInterface.php | 4 +- .../Product/Search/ProductSearchQuery.php | 4 +- .../Product/Search/ProductSearchResult.php | 4 +- src/Core/Product/Search/SortOrder.php | 4 +- src/Core/Product/Search/SortOrderFactory.php | 4 +- .../Product/Search/URLFragmentSerializer.php | 4 +- src/Core/Shop/LogoUploader.php | 4 +- src/Core/Stock/StockManager.php | 4 +- src/PrestaShopBundle/Cache/CacheWarmer.php | 4 +- .../Cache/LocalizationWarmer.php | 4 +- .../Command/ExportThemeCommand.php | 4 +- .../Command/UpdateEUTaxruleGroupsCommand.php | 4 +- .../Command/UpdateLicencesCommand.php | 34 +- .../Controller/Admin/AddonsController.php | 4 +- .../Admin/AttachementProductController.php | 4 +- .../Controller/Admin/AttributeController.php | 4 +- .../Controller/Admin/CategoryController.php | 4 +- .../Admin/CombinationController.php | 4 +- .../Controller/Admin/CommonController.php | 4 +- .../Controller/Admin/FeatureController.php | 4 +- .../Admin/FrameworkBundleAdminController.php | 4 +- .../Controller/Admin/ModuleController.php | 4 +- .../Controller/Admin/ProductController.php | 4 +- .../Admin/ProductImageController.php | 4 +- .../Controller/Admin/SecurityController.php | 4 +- .../Admin/SpecificPriceController.php | 4 +- .../Controller/Admin/SupplierController.php | 4 +- .../Admin/TranslationsController.php | 4 +- .../Admin/VirtualProductController.php | 4 +- .../Controller/Admin/WarehouseController.php | 4 +- .../AddOnsConfiguration.php | 4 +- .../Compiler/DynamicRolePass.php | 4 +- .../PopulateTranslationProvidersPass.php | 4 +- .../RemoveXmlCompiledContainerPass.php | 4 +- .../Compiler/RouterPass.php | 4 +- .../PrestaShopExtension.php | 4 +- src/PrestaShopBundle/Entity/AdminFilter.php | 4 +- src/PrestaShopBundle/Entity/Attribute.php | 4 +- .../Entity/AttributeGroup.php | 4 +- .../Entity/AttributeGroupLang.php | 4 +- src/PrestaShopBundle/Entity/AttributeLang.php | 4 +- src/PrestaShopBundle/Entity/Lang.php | 4 +- src/PrestaShopBundle/Entity/ModuleHistory.php | 4 +- .../AttributeGroupLangRepository.php | 4 +- .../Repository/AttributeGroupRepository.php | 4 +- .../Repository/AttributeLangRepository.php | 4 +- .../Entity/Repository/AttributeRepository.php | 4 +- .../Entity/Repository/LangRepository.php | 4 +- .../Entity/Repository/ShopGroupRepository.php | 4 +- .../Entity/Repository/ShopRepository.php | 4 +- .../Repository/TranslationRepository.php | 4 +- src/PrestaShopBundle/Entity/Shop.php | 4 +- src/PrestaShopBundle/Entity/ShopGroup.php | 4 +- src/PrestaShopBundle/Entity/Translation.php | 4 +- .../EventListener/TokenizedUrlsListener.php | 4 +- .../EventListener/UserLocaleListener.php | 4 +- .../Exception/ServiceDefinitionException.php | 10 +- .../Exception/UpdateProductException.php | 4 +- .../Form/Admin/Category/SimpleCategory.php | 4 +- .../Form/Admin/Feature/ProductFeature.php | 4 +- .../Form/Admin/Product/ProductAttachement.php | 4 +- .../Form/Admin/Product/ProductCombination.php | 4 +- .../Admin/Product/ProductCombinationBulk.php | 4 +- .../Form/Admin/Product/ProductCustomField.php | 4 +- .../Form/Admin/Product/ProductInformation.php | 4 +- .../Form/Admin/Product/ProductOptions.php | 4 +- .../Form/Admin/Product/ProductPrice.php | 4 +- .../Form/Admin/Product/ProductQuantity.php | 4 +- .../Form/Admin/Product/ProductSeo.php | 4 +- .../Form/Admin/Product/ProductShipping.php | 4 +- .../Admin/Product/ProductSpecificPrice.php | 4 +- .../Product/ProductSupplierCombination.php | 4 +- .../Form/Admin/Product/ProductVirtual.php | 4 +- .../Product/ProductWarehouseCombination.php | 4 +- .../Admin/Type/ChoiceCategoriesTreeType.php | 4 +- .../Form/Admin/Type/CommonAbstractType.php | 4 +- .../Form/Admin/Type/CustomMoneyType.php | 4 +- .../Form/Admin/Type/DatePickerType.php | 4 +- .../Form/Admin/Type/TextEmptyType.php | 4 +- .../Form/Admin/Type/TextareaEmptyType.php | 4 +- .../Form/Admin/Type/TranslateType.php | 4 +- .../Type/TypeaheadCustomerCollectionType.php | 4 +- .../Type/TypeaheadProductCollectionType.php | 4 +- .../TypeaheadProductPackCollectionType.php | 4 +- .../Install/AbstractInstall.php | 4 +- src/PrestaShopBundle/Install/Database.php | 4 +- src/PrestaShopBundle/Install/Install.php | 4 +- src/PrestaShopBundle/Install/Language.php | 4 +- src/PrestaShopBundle/Install/LanguageList.php | 4 +- src/PrestaShopBundle/Install/Simplexml.php | 4 +- src/PrestaShopBundle/Install/SqlLoader.php | 4 +- src/PrestaShopBundle/Install/System.php | 6 +- src/PrestaShopBundle/Install/Upgrade.php | 4 +- src/PrestaShopBundle/Install/XmlLoader.php | 4 +- .../Model/AdminModelAdapter.php | 4 +- .../Model/Product/AdminModelAdapter.php | 4 +- src/PrestaShopBundle/PrestaShopBundle.php | 4 +- .../views/Admin/Category/categories.html.twig | 4 +- .../Common/_partials/_form_field.html.twig | 4 +- .../Common/_partials/_header_tab.html.twig | 4 +- .../Admin/Common/_partials/_sidebar.html.twig | 4 +- .../views/Admin/Common/pagination.html.twig | 4 +- .../Common/pagination_quicknav.html.twig | 4 +- .../Admin/Common/recommendedModules.html.twig | 4 +- .../Admin/Helpers/bootstrap_popup.html.twig | 4 +- .../Admin/Helpers/dropdown_menu.html.twig | 4 +- .../Admin/Helpers/range_inputs.html.twig | 4 +- .../Admin/Helpers/range_slider.html.twig | 4 +- .../Module/Includes/action_menu.html.twig | 4 +- .../Admin/Module/Includes/card_grid.html.twig | 4 +- .../Includes/card_grid_addons.html.twig | 6 +- .../Admin/Module/Includes/card_list.html.twig | 4 +- .../Includes/card_list_addons.html.twig | 6 +- .../Includes/card_manage_installed.html.twig | 4 +- .../card_notification_configure.html.twig | 4 +- .../card_notification_update.html.twig | 4 +- .../Module/Includes/categories_card.html.twig | 4 +- .../Module/Includes/categories_grid.html.twig | 4 +- .../Includes/dropdown_categories.html.twig | 4 +- .../Module/Includes/dropdown_status.html.twig | 4 +- .../Admin/Module/Includes/grid.html.twig | 4 +- .../Module/Includes/grid_loader.html.twig | 4 +- .../Includes/grid_manage_installed.html.twig | 4 +- .../grid_notification_configure.html.twig | 4 +- .../grid_notification_update.html.twig | 4 +- .../Admin/Module/Includes/menu_top.html.twig | 6 +- .../Includes/modal_addons_connect.html.twig | 4 +- .../Module/Includes/modal_confirm.html.twig | 4 +- .../modal_confirm_bulk_action.html.twig | 4 +- .../Module/Includes/modal_import.html.twig | 4 +- .../Module/Includes/modal_read_more.html.twig | 4 +- .../modal_read_more_content.html.twig | 4 +- .../Includes/notification_kpis.html.twig | 4 +- .../Admin/Module/Includes/sorting.html.twig | 4 +- .../Module/Includes/tab-module-line.html.twig | 4 +- .../views/Admin/Module/catalog.html.twig | 4 +- .../views/Admin/Module/manage.html.twig | 4 +- .../Admin/Module/notifications.html.twig | 4 +- .../Admin/Module/tab-modules-list.html.twig | 4 +- .../Include/catalog_order_carrets.html.twig | 4 +- .../Product/Include/form-categories.html.twig | 4 +- .../Include/form-specific-price.html.twig | 4 +- .../Include/form-supplier-choice.html.twig | 4 +- .../form-supplier-combination.html.twig | 4 +- .../form-warehouse-combination.html.twig | 4 +- .../Include/form_combination.html.twig | 4 +- .../Include/form_combinations.html.twig | 4 +- .../Include/form_custom_fields.html.twig | 4 +- .../Include/form_edit_dropdown.html.twig | 4 +- .../Product/Include/form_feature.html.twig | 4 +- .../Include/form_manufacturer.html.twig | 4 +- .../Include/form_related_products.html.twig | 4 +- .../Admin/Product/Include/form_seo.html.twig | 4 +- .../Product/Include/form_shipping.html.twig | 4 +- .../views/Admin/Product/catalog.html.twig | 4 +- .../Admin/Product/catalog_empty.html.twig | 4 +- .../views/Admin/Product/form.html.twig | 4 +- .../views/Admin/Product/formDisable.html.twig | 4 +- .../Product/form_combinations_bulk.html.twig | 4 +- .../views/Admin/Product/list.html.twig | 4 +- .../Admin/Product/list_quicknav.html.twig | 4 +- .../views/Admin/ProductImage/form.html.twig | 4 +- .../Admin/Security/compromised.html.twig | 4 +- .../button-go-to-pagination-bar.html.twig | 6 +- ...utton-toggle-messages-visibility.html.twig | 4 +- .../include/form-edit-message.html.twig | 4 +- .../include/pagination-bar.html.twig | 4 +- .../include/translations-form-end.html.twig | 4 +- .../include/translations-form-start.html.twig | 4 +- .../include/translations-forms.html.twig | 4 +- .../include/translations-tree.html.twig | 4 +- .../views/Admin/Translations/list.html.twig | 4 +- .../bootstrap_3_horizontal_layout.html.twig | 4 +- .../bootstrap_3_layout.html.twig | 4 +- .../form_div_layout.html.twig | 4 +- .../form_table_layout.html.twig | 4 +- .../prestashop_ui_kit.html.twig | 4 +- .../TwigTemplateForm/typeahead.html.twig | 4 +- .../Resources/views/Admin/layout.html.twig | 4 +- .../Resources/views/Admin/macros.html.twig | 4 +- .../Security/Admin/Employee.php | 10 +- .../Security/Admin/EmployeeProvider.php | 4 +- .../Security/Role/DynamicRoleHierarchy.php | 4 +- .../Security/Voter/ProductVoter.php | 4 +- .../Service/Cache/Refresh.php | 4 +- src/PrestaShopBundle/Service/Csv.php | 4 +- .../DataProvider/Admin/AddonsInterface.php | 4 +- .../DataProvider/Admin/CategoriesProvider.php | 4 +- .../DataProvider/Admin/ModuleInterface.php | 4 +- .../DataProvider/Admin/ProductInterface.php | 4 +- .../DataProvider/Admin/RecommendedModules.php | 4 +- .../DataProvider/Marketplace/ApiClient.php | 4 +- .../Service/DataProvider/StockInterface.php | 4 +- .../Service/DataProvider/UserProvider.php | 4 +- .../DataUpdater/Admin/ProductInterface.php | 4 +- .../Database/DoctrineNamingStrategy.php | 4 +- .../Hook/HookContentClassInterface.php | 4 +- .../Service/Hook/HookDispatcher.php | 4 +- .../Service/Hook/HookEvent.php | 4 +- .../Service/Hook/HookFinder.php | 4 +- .../Service/Hook/RenderingHookEvent.php | 4 +- .../Service/Log/LogHandler.php | 4 +- .../Service/ProductService.php | 6 +- .../Service/Routing/Router.php | 4 +- .../AdminPagePreferenceInterface.php | 4 +- .../AdminUrlGeneratorFactory.php | 4 +- .../Tests/Command/ExportThemeCommandTest.php | 4 +- .../Tests/Controller/ControllerTest.php | 4 +- .../Tests/Mock/AdapterSecurityAdminMock.php | 4 +- .../Tests/Mock/ProductVoter.php | 4 +- .../Model/Product/AdminModelAdapterTest.php | 4 +- .../Tests/Service/Hook/HookDispatcherTest.php | 4 +- .../Exporter/ThemeExporterTest.php | 4 +- .../Extractor/ThemeExtractorTest.php | 4 +- .../Factory/ThemeTranslationsFactoryTest.php | 4 +- .../Factory/TranslationsFactoryTest.php | 4 +- .../Provider/BackOfficeProviderTest.php | 4 +- .../Provider/FrontOfficeProviderTest.php | 4 +- .../Provider/ModulesProviderTest.php | 4 +- .../Provider/ThemeProviderTest.php | 4 +- .../themes/fake-theme/assets/css/theme.css | 4 +- .../themes/fake-theme/assets/js/theme.js | 4 +- .../fake-theme/templates/_partials/footer.tpl | 4 +- .../fake-theme/templates/_partials/head.tpl | 4 +- .../fake-theme/templates/_partials/header.tpl | 4 +- .../templates/_partials/notifications.tpl | 4 +- .../catalog/_partials/miniatures/product.tpl | 4 +- .../fake-theme/templates/catalog/product.tpl | 4 +- .../fake-theme/templates/checkout/cart.tpl | 4 +- .../templates/checkout/checkout.tpl | 4 +- .../themes/fake-theme/templates/page.tpl | 4 +- .../themes/fakeTheme2/assets/css/theme.css | 4 +- .../themes/fakeTheme2/assets/js/theme.js | 4 +- .../fakeTheme2/templates/_partials/footer.tpl | 4 +- .../fakeTheme2/templates/_partials/head.tpl | 4 +- .../fakeTheme2/templates/_partials/header.tpl | 4 +- .../templates/_partials/notifications.tpl | 4 +- .../catalog/_partials/miniatures/product.tpl | 4 +- .../fakeTheme2/templates/catalog/product.tpl | 4 +- .../fakeTheme2/templates/checkout/cart.tpl | 4 +- .../templates/checkout/checkout.tpl | 4 +- .../themes/fakeTheme2/templates/page.tpl | 4 +- .../Translation/Exporter/ThemeExporter.php | 4 +- .../Translation/Extractor/ThemeExtractor.php | 4 +- .../Factory/ProviderNotFoundException.php | 4 +- .../Factory/ThemeTranslationsFactory.php | 4 +- .../Factory/TranslationsFactory.php | 4 +- .../Factory/TranslationsFactoryInterface.php | 4 +- .../Loader/DatabaseTranslationLoader.php | 4 +- .../Loader/SqlTranslationLoader.php | 4 +- .../Translation/PrestaShopTranslatorTrait.php | 4 +- .../Translation/Provider/AbstractProvider.php | 4 +- .../Provider/BackOfficeProvider.php | 4 +- .../Provider/FrontOfficeProvider.php | 4 +- .../Translation/Provider/MailsProvider.php | 4 +- .../Translation/Provider/ModulesProvider.php | 4 +- .../Translation/Provider/OthersProvider.php | 4 +- .../Provider/ProviderInterface.php | 4 +- .../Translation/Provider/ThemeProvider.php | 4 +- .../Provider/TranslationFinderTrait.php | 4 +- .../Provider/UseDefaultCatalogueInterface.php | 4 +- .../Translation/Translator.php | 4 +- .../Translation/TranslatorComponent.php | 4 +- src/PrestaShopBundle/Twig/AdminExtension.php | 4 +- .../Twig/DataFormatterExtension.php | 4 +- src/PrestaShopBundle/Twig/HookExtension.php | 4 +- src/PrestaShopBundle/Twig/LayoutExtension.php | 4 +- .../Twig/TranslationsExtension.php | 4 +- src/PrestaShopBundle/Utils/ZipManager.php | 4 +- .../Adapter/AdapterDatabaseTest.php | 4 +- .../Foundation/Entity/EntityManagerTest.php | 4 +- .../Core/Foundation/Entity/EntityTest.php | 4 +- .../Core/Module/HookRepositoryTest.php | 4 +- .../Controller/Admin/ModuleControllerTest.php | 4 +- .../Admin/ProductControllerTest.php | 4 +- .../MarketPlace/ApiClientTest.php | 4 +- .../PrestaShopBundle/Test/WebTestCase.php | 4 +- tests/Integration/ProductURLsTest.php | 4 +- tests/Integration/SmartySettingsTest.php | 4 +- .../classes/CartGetOrderTotalTest.php | 4 +- .../classes/ConfigurationCoreTest.php | 4 +- tests/Integration/classes/MediaCoreTest.php | 4 +- tests/Integration/classes/ShopCoreTest.php | 4 +- tests/Integration/classes/db/DbTest.php | 4 +- .../classes/module/ModuleGetOverrideTest.php | 4 +- .../module/ModuleGetPossibleHooksListTest.php | 4 +- .../ModuleOverrideInstallUninstallTest.php | 4 +- tests/Selenium/commands/init.js | 4 +- tests/Selenium/fixtures.js | 4 +- tests/Selenium/helpers/random-user.js | 4 +- tests/Selenium/prepare-shop.php | 4 +- tests/Selenium/settings.dist.js | 4 +- tests/Selenium/settings.travis.js | 4 +- tests/TestCase/DatabaseDump.php | 4 +- tests/TestCase/FakeConfiguration.php | 4 +- tests/TestCase/FakeEntityMapper.php | 4 +- tests/TestCase/FakeLogger.php | 4 +- tests/TestCase/File.php | 4 +- tests/TestCase/IntegrationTestCase.php | 4 +- tests/TestCase/Module.php | 4 +- tests/TestCase/ReflexionHelper.php | 4 +- tests/TestCase/UnitTestCase.php | 4 +- .../Adapter/AdapterServiceLocatorTest.php | 4 +- tests/Unit/Adapter/Admin/UrlGeneratorTest.php | 4 +- .../Module/AdminModuleDataProviderTest.php | 4 +- .../Addon/Module/ModuleManagerInstallTest.php | 4 +- .../Core/Addon/Module/ModuleManagerTest.php | 4 +- .../Addon/Module/ModuleRepositoryTest.php | 4 +- .../Core/Addon/Theme/ThemeRepositoryTest.php | 4 +- .../Core/Addon/Theme/ThemeValidatorTest.php | 4 +- .../Checkout/TermsAndConditionsTest.php | 4 +- .../PaymentOptionFormDecoratorTest.php | 4 +- .../Business/Product/ProductPresenterTest.php | 4 +- .../Product/Search/PaginationTest.php | 4 +- .../Business/Product/Search/SortOrderTest.php | 4 +- .../Search/URLFragmentSerializerTest.php | 4 +- tests/Unit/Core/Cldr/RepositoryTest.php | 4 +- .../Core/Crypto/Core_Crypto_Hashing_Test.php | 4 +- ...ndation_Database_EntityRepository_Test.php | 4 +- ...tabase_EntityManager_QueryBuilder_Test.php | 4 +- ...e_Foundation_FileSystem_FileSystemTest.php | 4 +- .../Core_Foundation_IoC_Container_Test.php | 4 +- .../ClassDependingOnClosureBuiltDep.php | 4 +- .../Foundation/IoC/Fixtures/ClassWithDep.php | 4 +- .../IoC/Fixtures/ClassWithDepAndDefault.php | 4 +- .../Core/Foundation/IoC/Fixtures/CycleA.php | 4 +- .../Core/Foundation/IoC/Fixtures/CycleB.php | 4 +- .../IoC/Fixtures/DepBuiltByClosure.php | 4 +- .../Core/Foundation/IoC/Fixtures/Dummy.php | 4 +- .../Foundation/IoC/Fixtures/UnBuildable.php | 4 +- .../Unit/Core/Module/HookConfiguratorTest.php | 4 +- .../Core_Payment_PaymentOptionTest.php | 4 +- .../Stock/Core_Stock_StockManagerTest.php | 34 +- tests/Unit/classes/AssetsCoreTest.php | 4 +- tests/Unit/classes/CartTest.php | 4 +- tests/Unit/classes/HookTest.php | 4 +- .../classes/PhpEncryptionLegacyEngineTest.php | 4 +- tests/Unit/classes/PhpEncryptionTest.php | 4 +- tests/Unit/classes/PrestaShopAutoloadTest.php | 4 +- .../classes/Smarty/TemplateFinderTest.php | 4 +- tests/Unit/classes/ToolsCoreTest.php | 4 +- tests/Unit/classes/ValidateCoreTest.php | 4 +- .../checkout/CheckoutAddressesStepTest.php | 4 +- tests/Unit/classes/module/ModuleCoreTest.php | 4 +- .../AverageTaxOfProductsTaxCalculatorTest.php | 4 +- .../classes/tax/TaxCalculatorCoreTest.php | 4 +- .../tax/TaxRulesTaxManagerCoreTest.php | 4 +- .../admin/AdminTabsControllerTest.php | 4 +- tests/bootstrap-admin.php | 4 +- tests/bootstrap.php | 4 +- tests/index.php | 10 +- tests/resources/assets/core.js | 24 + tests/resources/assets/css/custom.css | 24 + tests/resources/assets/css/theme.css | 24 + tests/resources/assets/custom.css | 24 + tests/resources/assets/js/core.js | 24 + tests/resources/assets/js/theme.js | 24 + tests/resources/assets/theme.css | 24 + tests/resources/assets/theme.js | 24 + .../assets/css/theme.css | 4 +- .../assets/js/theme.js | 4 +- .../templates/_partials/footer.tpl | 4 +- .../templates/_partials/head.tpl | 4 +- .../templates/_partials/header.tpl | 4 +- .../templates/_partials/notifications.tpl | 4 +- .../templates/catalog/product-miniature.tpl | 4 +- .../templates/catalog/product.tpl | 4 +- .../templates/checkout/cart.tpl | 4 +- .../templates/checkout/checkout.tpl | 4 +- .../templates/page.tpl | 4 +- .../assets/css/theme.css | 4 +- .../assets/js/theme.js | 4 +- .../templates/_partials/footer.tpl | 4 +- .../templates/_partials/head.tpl | 4 +- .../templates/_partials/header.tpl | 4 +- .../templates/_partials/notifications.tpl | 4 +- .../templates/catalog/product-miniature.tpl | 4 +- .../templates/catalog/product.tpl | 4 +- .../templates/page.tpl | 4 +- .../minimal-valid-theme/assets/css/theme.css | 4 +- .../minimal-valid-theme/assets/js/theme.js | 4 +- .../templates/_partials/form-fields.tpl | 4 +- .../catalog/listing/product-list.tpl | 4 +- .../templates/catalog/product.tpl | 4 +- .../templates/checkout/cart-empty.tpl | 4 +- .../templates/checkout/cart.tpl | 4 +- .../templates/checkout/checkout.tpl | 4 +- .../templates/checkout/order-confirmation.tpl | 4 +- .../templates/cms/category.tpl | 4 +- .../templates/cms/page.tpl | 4 +- .../templates/cms/sitemap.tpl | 4 +- .../templates/cms/stores.tpl | 4 +- .../minimal-valid-theme/templates/contact.tpl | 4 +- .../templates/customer/address.tpl | 4 +- .../templates/customer/addresses.tpl | 4 +- .../templates/customer/authentication.tpl | 4 +- .../templates/customer/guest-login.tpl | 4 +- .../templates/customer/guest-tracking.tpl | 4 +- .../templates/customer/history.tpl | 4 +- .../templates/customer/identity.tpl | 4 +- .../templates/customer/my-account.tpl | 4 +- .../templates/customer/order-detail.tpl | 4 +- .../templates/customer/order-follow.tpl | 4 +- .../templates/customer/order-return.tpl | 4 +- .../templates/customer/order-slip.tpl | 4 +- .../templates/customer/registration.tpl | 4 +- .../templates/errors/404.tpl | 4 +- .../templates/errors/forbidden.tpl | 4 +- .../minimal-valid-theme/templates/index.tpl | 4 +- .../pscsx3241/override/classes/Cart.php | 4 +- .../admin/AdminProductsController.php | 4 +- .../resources/module/pscsx3241/pscsx3241.php | 4 +- .../pscsx32412/override/classes/Cart.php | 4 +- .../admin/AdminProductsController.php | 4 +- .../module/pscsx32412/pscsx32412.php | 4 +- tests/resources/modules/bankwire/bankwire.php | 4 +- tests/resources/modules/bankwire/index.php | 10 +- .../modules/ganalytics/ganalytics.php | 4 +- tests/resources/modules/ganalytics/index.php | 4 +- .../modules/ps_emailsubscription/index.php | 10 +- .../ps_emailsubscription.php | 4 +- .../modules/ps_featuredproducts/index.php | 4 +- .../ps_featuredproducts.php | 4 +- .../templates/catalog/listing/category-9.tpl | 4 +- .../templates/catalog/listing/category.tpl | 4 +- .../catalog/listing/product-list.tpl | 4 +- themes/_core/js/cart.js | 4 +- themes/_core/js/checkout-address.js | 4 +- themes/_core/js/checkout-delivery.js | 4 +- themes/_core/js/checkout-payment.js | 4 +- themes/_core/js/checkout.js | 4 +- themes/_core/js/common.js | 4 +- themes/_core/js/facets.js | 4 +- themes/_core/js/listing.js | 4 +- themes/_core/js/product.js | 4 +- themes/classic/_dev/js/checkout.js | 4 +- .../classic/_dev/js/components/block-cart.js | 4 +- .../classic/_dev/js/components/drop-down.js | 4 +- themes/classic/_dev/js/components/form.js | 4 +- .../_dev/js/components/product-miniature.js | 4 +- .../_dev/js/components/product-select.js | 4 +- themes/classic/_dev/js/components/top-menu.js | 4 +- themes/classic/_dev/js/customer.js | 4 +- .../_dev/js/lib/bootstrap-filestyle.min.js | 6 +- .../_dev/js/lib/jquery.scrollbox.min.js | 6 +- themes/classic/_dev/js/listing.js | 4 +- themes/classic/_dev/js/product.js | 4 +- themes/classic/_dev/js/responsive.js | 4 +- themes/classic/_dev/js/theme.js | 4 +- themes/classic/_dev/webpack.config.js | 4 +- themes/classic/assets/css/theme.css | 2 +- themes/classic/assets/css/theme.css.map | 2 +- themes/classic/assets/js/theme.js | 56 +-- themes/classic/assets/js/theme.js.map | 2 +- .../views/templates/hook/blockreassurance.tpl | 4 +- .../classic/modules/ps_banner/ps_banner.tpl | 4 +- .../modules/ps_bestsellers/views/index.php | 6 +- .../views/templates/hook/index.php | 6 +- .../views/templates/hook/ps_bestsellers.tpl | 4 +- .../ps_bestsellers/views/templates/index.php | 6 +- .../modules/ps_brandlist/views/index.php | 6 +- .../views/templates/_partials/brand_form.tpl | 4 +- .../views/templates/_partials/brand_text.tpl | 4 +- .../views/templates/_partials/index.php | 6 +- .../views/templates/hook/index.php | 6 +- .../views/templates/hook/ps_brandlist.tpl | 4 +- .../ps_brandlist/views/templates/index.php | 6 +- .../ps_categoryproducts/views/index.php | 6 +- .../views/templates/hook/index.php | 6 +- .../templates/hook/ps_categoryproducts.tpl | 4 +- .../views/templates/index.php | 6 +- .../views/templates/hook/ps_categorytree.tpl | 4 +- themes/classic/modules/ps_contactinfo/nav.tpl | 4 +- .../ps_contactinfo/ps_contactinfo-rich.tpl | 4 +- .../modules/ps_contactinfo/ps_contactinfo.tpl | 6 +- .../modules/ps_crossselling/views/index.php | 4 +- .../views/templates/hook/index.php | 4 +- .../views/templates/hook/ps_crossselling.tpl | 4 +- .../ps_crossselling/views/templates/index.php | 4 +- .../ps_currencyselector.tpl | 6 +- .../ps_customeraccountlinks.tpl | 4 +- .../modules/ps_emailalerts/views/index.php | 4 +- .../views/templates/hook/index.php | 4 +- .../templates/hook/my-account-footer.tpl | 4 +- .../views/templates/hook/my-account.tpl | 4 +- .../ps_emailalerts/views/templates/index.php | 4 +- .../templates/hook/ps_emailsubscription.tpl | 4 +- .../templates/hook/ps_featuredproducts.tpl | 4 +- .../views/templates/hook/slider.tpl | 4 +- .../ps_languageselector.tpl | 4 +- .../modules/ps_newproducts/views/index.php | 4 +- .../views/templates/hook/index.php | 4 +- .../views/templates/hook/ps_newproducts.tpl | 4 +- .../ps_newproducts/views/templates/index.php | 4 +- .../modules/ps_productinfo/views/index.php | 6 +- .../views/templates/hook/index.php | 6 +- .../views/templates/hook/ps_productinfo.tpl | 4 +- .../ps_productinfo/views/templates/index.php | 6 +- .../modules/ps_rssfeed/views/index.php | 12 +- .../ps_rssfeed/views/templates/hook/index.php | 12 +- .../views/templates/hook/ps_rssfeed.tpl | 4 +- .../ps_rssfeed/views/templates/index.php | 12 +- .../modules/ps_searchbar/ps_searchbar.tpl | 4 +- .../views/templates/hook/ps_sharebuttons.tpl | 4 +- .../ps_socialfollow/ps_socialfollow.tpl | 4 +- .../modules/ps_specials/views/index.php | 4 +- .../views/templates/hook/index.php | 4 +- .../views/templates/hook/ps_specials.tpl | 4 +- .../ps_specials/views/templates/index.php | 4 +- .../modules/ps_supplierlist/views/index.php | 10 +- .../views/templates/_partials/index.php | 10 +- .../templates/_partials/supplier_form.tpl | 4 +- .../templates/_partials/supplier_text.tpl | 4 +- .../views/templates/hook/index.php | 10 +- .../views/templates/hook/ps_supplierlist.tpl | 4 +- .../ps_supplierlist/views/templates/index.php | 10 +- .../modules/ps_viewedproduct/views/index.php | 4 +- .../views/template/hook/index.php | 4 +- .../views/template/hook/ps_viewedproduct.tpl | 4 +- .../ps_viewedproduct/views/template/index.php | 4 +- .../templates/_partials/breadcrumb.tpl | 4 +- themes/classic/templates/_partials/footer.tpl | 4 +- .../templates/_partials/form-errors.tpl | 4 +- .../templates/_partials/form-fields.tpl | 4 +- themes/classic/templates/_partials/head.tpl | 4 +- themes/classic/templates/_partials/header.tpl | 4 +- .../templates/_partials/javascript.tpl | 4 +- .../templates/_partials/notifications.tpl | 4 +- .../templates/_partials/pagination.tpl | 4 +- .../templates/_partials/stylesheets.tpl | 4 +- .../catalog/_partials/active_filters.tpl | 4 +- .../templates/catalog/_partials/facets.tpl | 4 +- .../catalog/_partials/miniatures/brand.tpl | 4 +- .../catalog/_partials/miniatures/category.tpl | 4 +- .../_partials/miniatures/pack-product.tpl | 4 +- .../catalog/_partials/miniatures/product.tpl | 4 +- .../catalog/_partials/product-activation.tpl | 4 +- .../catalog/_partials/product-add-to-cart.tpl | 4 +- .../_partials/product-cover-thumbnails.tpl | 4 +- .../_partials/product-customization.tpl | 4 +- .../catalog/_partials/product-discounts.tpl | 4 +- .../_partials/product-images-modal.tpl | 4 +- .../catalog/_partials/product-prices.tpl | 4 +- .../catalog/_partials/product-variants.tpl | 4 +- .../catalog/_partials/products-top.tpl | 4 +- .../templates/catalog/_partials/products.tpl | 4 +- .../templates/catalog/_partials/quickview.tpl | 4 +- .../catalog/_partials/sort-orders.tpl | 4 +- themes/classic/templates/catalog/brands.tpl | 4 +- .../templates/catalog/listing/category.tpl | 4 +- .../catalog/listing/manufacturer.tpl | 4 +- .../catalog/listing/product-list.tpl | 4 +- .../templates/catalog/listing/supplier.tpl | 4 +- .../templates/catalog/manufacturers.tpl | 4 +- themes/classic/templates/catalog/product.tpl | 4 +- .../classic/templates/catalog/suppliers.tpl | 4 +- .../_partials/address-selector-block.tpl | 4 +- .../_partials/cart-detailed-actions.tpl | 4 +- .../_partials/cart-detailed-product-line.tpl | 4 +- .../_partials/cart-detailed-totals.tpl | 4 +- .../checkout/_partials/cart-detailed.tpl | 4 +- .../_partials/cart-summary-items-subtotal.tpl | 4 +- .../_partials/cart-summary-product-line.tpl | 4 +- .../_partials/cart-summary-totals.tpl | 4 +- .../checkout/_partials/cart-summary.tpl | 4 +- .../checkout/_partials/cart-voucher.tpl | 4 +- .../checkout/_partials/customer-form.tpl | 4 +- .../templates/checkout/_partials/footer.tpl | 4 +- .../templates/checkout/_partials/header.tpl | 4 +- .../checkout/_partials/login-form.tpl | 4 +- .../_partials/order-confirmation-table.tpl | 4 +- .../_partials/order-final-summary-table.tpl | 4 +- .../_partials/order-final-summary.tpl | 4 +- .../checkout/_partials/steps/addresses.tpl | 4 +- .../_partials/steps/checkout-step.tpl | 4 +- .../checkout/_partials/steps/shipping.tpl | 4 +- .../checkout/_partials/steps/unreachable.tpl | 4 +- .../classic/templates/checkout/cart-empty.tpl | 4 +- themes/classic/templates/checkout/cart.tpl | 4 +- .../templates/checkout/checkout-process.tpl | 4 +- .../classic/templates/checkout/checkout.tpl | 4 +- .../cms/_partials/sitemap-nested-list.tpl | 4 +- themes/classic/templates/cms/category.tpl | 4 +- themes/classic/templates/cms/page.tpl | 8 +- themes/classic/templates/cms/sitemap.tpl | 4 +- themes/classic/templates/cms/stores.tpl | 4 +- themes/classic/templates/contact.tpl | 4 +- .../customer/_partials/address-form.tpl | 4 +- .../customer/_partials/block-address.tpl | 4 +- .../customer/_partials/customer-form.tpl | 4 +- .../customer/_partials/my-account-links.tpl | 4 +- .../_partials/order-detail-no-return.tpl | 6 +- .../_partials/order-detail-return.tpl | 4 +- .../customer/_partials/order-messages.tpl | 4 +- themes/classic/templates/customer/address.tpl | 4 +- .../classic/templates/customer/addresses.tpl | 4 +- .../templates/customer/authentication.tpl | 4 +- .../classic/templates/customer/discount.tpl | 4 +- .../templates/customer/guest-login.tpl | 4 +- .../templates/customer/guest-tracking.tpl | 4 +- themes/classic/templates/customer/history.tpl | 4 +- .../classic/templates/customer/my-account.tpl | 4 +- .../templates/customer/order-detail.tpl | 4 +- .../templates/customer/order-follow.tpl | 4 +- .../classic/templates/customer/order-slip.tpl | 4 +- themes/classic/templates/customer/page.tpl | 4 +- .../templates/customer/password-email.tpl | 4 +- .../templates/customer/password-infos.tpl | 4 +- .../templates/customer/password-new.tpl | 4 +- .../templates/customer/registration.tpl | 4 +- themes/classic/templates/errors/404.tpl | 4 +- themes/classic/templates/errors/forbidden.tpl | 4 +- .../classic/templates/errors/maintenance.tpl | 4 +- themes/classic/templates/errors/not-found.tpl | 4 +- .../templates/errors/restricted-country.tpl | 4 +- themes/classic/templates/index.tpl | 4 +- .../templates/layouts/layout-both-columns.tpl | 4 +- .../templates/layouts/layout-content-only.tpl | 4 +- .../templates/layouts/layout-full-width.tpl | 4 +- .../templates/layouts/layout-left-column.tpl | 4 +- .../templates/layouts/layout-right-column.tpl | 4 +- themes/classic/templates/page.tpl | 4 +- themes/core.js | 184 +++++++- themes/core.js.map | 8 +- themes/debug.tpl | 4 +- themes/index.php | 4 +- themes/javascript.tpl | 4 +- themes/webpack.config.js | 4 +- tools/htmlpurifier/index.php | 4 +- .../ConfigSchema/Builder/index.php | 4 +- .../ConfigSchema/Interchange/index.php | 4 +- .../HTMLPurifier/ConfigSchema/index.php | 4 +- .../ConfigSchema/schema/index.php | 4 +- .../HTMLPurifier/EntityLookup/index.php | 4 +- .../standalone/HTMLPurifier/Filter/index.php | 4 +- .../HTMLPurifier/Language/classes/index.php | 4 +- .../HTMLPurifier/Language/index.php | 4 +- .../HTMLPurifier/Language/messages/index.php | 4 +- .../standalone/HTMLPurifier/Lexer/index.php | 4 +- .../standalone/HTMLPurifier/Printer/index.php | 4 +- .../standalone/HTMLPurifier/index.php | 4 +- tools/htmlpurifier/standalone/index.php | 4 +- tools/index.php | 4 +- tools/parser_sql/builders/index.php | 4 +- tools/parser_sql/exceptions/index.php | 4 +- tools/parser_sql/index.php | 4 +- tools/parser_sql/lexer/index.php | 4 +- tools/parser_sql/positions/index.php | 4 +- tools/parser_sql/processors/index.php | 4 +- tools/parser_sql/utils/ExpressionToken.php | 6 +- tools/parser_sql/utils/index.php | 4 +- tools/profiling/Controller.php | 4 +- tools/profiling/Db.php | 4 +- tools/profiling/ObjectModel.php | 4 +- tools/profiling/Tools.php | 4 +- tools/profiling/index.php | 4 +- translations/export/index.php | 4 +- translations/index.php | 4 +- webservice/dispatcher.php | 4 +- webservice/index.php | 4 +- 2397 files changed, 6182 insertions(+), 5826 deletions(-) diff --git a/.github/contrib/install.php b/.github/contrib/install.php index c8b8bfa6b94..702aadae411 100644 --- a/.github/contrib/install.php +++ b/.github/contrib/install.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/.github/contrib/uninstall.php b/.github/contrib/uninstall.php index 5e8d2aeacbc..e6dd351b72c 100644 --- a/.github/contrib/uninstall.php +++ b/.github/contrib/uninstall.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 725428d49ab..ee8d53a229d 100755 --- a/admin-dev/ajax-tab.php +++ b/admin-dev/ajax-tab.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 5a345a336a8..a0db43a4a43 100644 --- a/admin-dev/ajax.php +++ b/admin-dev/ajax.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 2000d2c1937..07dd609c982 100644 --- a/admin-dev/ajax_products_list.php +++ b/admin-dev/ajax_products_list.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/autoupgrade/backup/index.php b/admin-dev/autoupgrade/backup/index.php index e0c4a9c75bf..45cfe5d1842 100644 --- a/admin-dev/autoupgrade/backup/index.php +++ b/admin-dev/autoupgrade/backup/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/autoupgrade/index.php b/admin-dev/autoupgrade/index.php index e34dbf52d6e..938c3971ab9 100644 --- a/admin-dev/autoupgrade/index.php +++ b/admin-dev/autoupgrade/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 e485b227e7e..3579bbe00e7 100644 --- a/admin-dev/backup.php +++ b/admin-dev/backup.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 e0c4a9c75bf..45cfe5d1842 100644 --- a/admin-dev/backups/index.php +++ b/admin-dev/backups/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/bootstrap.php b/admin-dev/bootstrap.php index 9d5f7844b0b..bb91aaf37c3 100644 --- a/admin-dev/bootstrap.php +++ b/admin-dev/bootstrap.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 fc4c0cf9f40..c049d37054c 100644 --- a/admin-dev/cron_currency_rates.php +++ b/admin-dev/cron_currency_rates.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 0c21838e6ef..996c61af6a3 100644 --- a/admin-dev/displayImage.php +++ b/admin-dev/displayImage.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 91ac313650a..f9a99414c91 100644 --- a/admin-dev/drawer.php +++ b/admin-dev/drawer.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 e0c4a9c75bf..45cfe5d1842 100644 --- a/admin-dev/export/index.php +++ b/admin-dev/export/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/config/index.php b/admin-dev/filemanager/config/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/config/index.php +++ b/admin-dev/filemanager/config/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/css/index.php b/admin-dev/filemanager/css/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/css/index.php +++ b/admin-dev/filemanager/css/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/img/ico/index.php b/admin-dev/filemanager/img/ico/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/img/ico/index.php +++ b/admin-dev/filemanager/img/ico/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/img/ico_dark/index.php b/admin-dev/filemanager/img/ico_dark/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/img/ico_dark/index.php +++ b/admin-dev/filemanager/img/ico_dark/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/img/index.php b/admin-dev/filemanager/img/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/img/index.php +++ b/admin-dev/filemanager/img/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/include/index.php b/admin-dev/filemanager/include/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/include/index.php +++ b/admin-dev/filemanager/include/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/index.php b/admin-dev/filemanager/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/index.php +++ b/admin-dev/filemanager/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/jPlayer/add-on/index.php b/admin-dev/filemanager/jPlayer/add-on/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/jPlayer/add-on/index.php +++ b/admin-dev/filemanager/jPlayer/add-on/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/jPlayer/index.php b/admin-dev/filemanager/jPlayer/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/jPlayer/index.php +++ b/admin-dev/filemanager/jPlayer/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/jPlayer/popcorn/index.php b/admin-dev/filemanager/jPlayer/popcorn/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/jPlayer/popcorn/index.php +++ b/admin-dev/filemanager/jPlayer/popcorn/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/jPlayer/skin/blue.monday/index.php b/admin-dev/filemanager/jPlayer/skin/blue.monday/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/jPlayer/skin/blue.monday/index.php +++ b/admin-dev/filemanager/jPlayer/skin/blue.monday/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/jPlayer/skin/index.php b/admin-dev/filemanager/jPlayer/skin/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/jPlayer/skin/index.php +++ b/admin-dev/filemanager/jPlayer/skin/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/js/index.php b/admin-dev/filemanager/js/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/js/index.php +++ b/admin-dev/filemanager/js/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/lang/index.php b/admin-dev/filemanager/lang/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/lang/index.php +++ b/admin-dev/filemanager/lang/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/filemanager/uploader/index.php b/admin-dev/filemanager/uploader/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/filemanager/uploader/index.php +++ b/admin-dev/filemanager/uploader/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/footer.inc.php b/admin-dev/footer.inc.php index 14047d4d79d..002d7c9d9f8 100644 --- a/admin-dev/footer.inc.php +++ b/admin-dev/footer.inc.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 2fa795aae3d..1d9915d0f25 100644 --- a/admin-dev/functions.php +++ b/admin-dev/functions.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 c990fa13f70..22de770b17d 100644 --- a/admin-dev/get-file-admin.php +++ b/admin-dev/get-file-admin.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 0f469b5f681..f8ef965414b 100644 --- a/admin-dev/grider.php +++ b/admin-dev/grider.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 54540c7d4f3..88c78aac944 100644 --- a/admin-dev/header.inc.php +++ b/admin-dev/header.inc.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 e0c4a9c75bf..45cfe5d1842 100644 --- a/admin-dev/import/index.php +++ b/admin-dev/import/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 91b0a8ade36..038f1c98e34 100644 --- a/admin-dev/index.php +++ b/admin-dev/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 d78eac9a705..a8089b1f466 100644 --- a/admin-dev/init.php +++ b/admin-dev/init.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 23cebc7bc67..ade5e61d5a1 100644 --- a/admin-dev/pdf.php +++ b/admin-dev/pdf.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.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 57e6cd5f950..a5b115c87f0 100644 --- a/admin-dev/searchcron.php +++ b/admin-dev/searchcron.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/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/bundle/module/drop.css b/admin-dev/themes/default/css/bundle/module/drop.css index a9bc7ddf600..17debc28e5f 100644 --- a/admin-dev/themes/default/css/bundle/module/drop.css +++ b/admin-dev/themes/default/css/bundle/module/drop.css @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/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/bundle/plugins/jquery.pstagger.css b/admin-dev/themes/default/css/bundle/plugins/jquery.pstagger.css index ae7adc95969..17e16b8baac 100644 --- a/admin-dev/themes/default/css/bundle/plugins/jquery.pstagger.css +++ b/admin-dev/themes/default/css/bundle/plugins/jquery.pstagger.css @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/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/font.css b/admin-dev/themes/default/css/font.css index dd7af6df8b7..be39009b10e 100644 --- a/admin-dev/themes/default/css/font.css +++ b/admin-dev/themes/default/css/font.css @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/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 4f389532be0..c9e1f28ee77 100755 --- a/admin-dev/themes/default/css/index.php +++ b/admin-dev/themes/default/css/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/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/schemes/index.php b/admin-dev/themes/default/css/schemes/index.php index e0c4a9c75bf..45cfe5d1842 100644 --- a/admin-dev/themes/default/css/schemes/index.php +++ b/admin-dev/themes/default/css/schemes/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/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/schemes_rtl/index.php b/admin-dev/themes/default/css/schemes_rtl/index.php index e0c4a9c75bf..45cfe5d1842 100644 --- a/admin-dev/themes/default/css/schemes_rtl/index.php +++ b/admin-dev/themes/default/css/schemes_rtl/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/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/vendor/index.php b/admin-dev/themes/default/css/vendor/index.php index e29275c24a6..45cfe5d1842 100755 --- a/admin-dev/themes/default/css/vendor/index.php +++ b/admin-dev/themes/default/css/vendor/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ - + header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - + header("Cache-Control: no-store, no-cache, must-revalidate"); header("Cache-Control: post-check=0, pre-check=0", false); header("Pragma: no-cache"); - + header("Location: ../"); -exit; \ No newline at end of file +exit; diff --git a/admin-dev/themes/default/fonts/index.php b/admin-dev/themes/default/fonts/index.php index e0c4a9c75bf..45cfe5d1842 100644 --- a/admin-dev/themes/default/fonts/index.php +++ b/admin-dev/themes/default/fonts/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/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 4f389532be0..45cfe5d1842 100755 --- a/admin-dev/themes/default/img/index.php +++ b/admin-dev/themes/default/img/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ - + header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - + header("Cache-Control: no-store, no-cache, must-revalidate"); header("Cache-Control: post-check=0, pre-check=0", false); header("Pragma: no-cache"); - + header("Location: ../"); exit; diff --git a/admin-dev/themes/default/img/patterns/index.php b/admin-dev/themes/default/img/patterns/index.php index e0c4a9c75bf..45cfe5d1842 100644 --- a/admin-dev/themes/default/img/patterns/index.php +++ b/admin-dev/themes/default/img/patterns/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/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 4f389532be0..c9e1f28ee77 100644 --- a/admin-dev/themes/default/index.php +++ b/admin-dev/themes/default/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/admin-theme.js b/admin-dev/themes/default/js/admin-theme.js index 63e56331fe8..22a746fa0a7 100644 --- a/admin-dev/themes/default/js/admin-theme.js +++ b/admin-dev/themes/default/js/admin-theme.js @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/bundle/category-tree.js b/admin-dev/themes/default/js/bundle/category-tree.js index 7719e5e7ec3..462cd93352f 100644 --- a/admin-dev/themes/default/js/bundle/category-tree.js +++ b/admin-dev/themes/default/js/bundle/category-tree.js @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/bundle/module/loader.js b/admin-dev/themes/default/js/bundle/module/loader.js index ebd9a47525d..68446fa277f 100644 --- a/admin-dev/themes/default/js/bundle/module/loader.js +++ b/admin-dev/themes/default/js/bundle/module/loader.js @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/bundle/pagination.js b/admin-dev/themes/default/js/bundle/pagination.js index 70e4d849007..010f18da1dd 100644 --- a/admin-dev/themes/default/js/bundle/pagination.js +++ b/admin-dev/themes/default/js/bundle/pagination.js @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/bundle/plugins/jquery.pstagger.js b/admin-dev/themes/default/js/bundle/plugins/jquery.pstagger.js index 54cdece0259..ca52c7a1f32 100644 --- a/admin-dev/themes/default/js/bundle/plugins/jquery.pstagger.js +++ b/admin-dev/themes/default/js/bundle/plugins/jquery.pstagger.js @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/bundle/product/catalog.js b/admin-dev/themes/default/js/bundle/product/catalog.js index 6df7008305d..c90bad2e2bd 100644 --- a/admin-dev/themes/default/js/bundle/product/catalog.js +++ b/admin-dev/themes/default/js/bundle/product/catalog.js @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/bundle/product/form.js b/admin-dev/themes/default/js/bundle/product/form.js index f7d9e076034..e7175883a64 100644 --- a/admin-dev/themes/default/js/bundle/product/form.js +++ b/admin-dev/themes/default/js/bundle/product/form.js @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/calendar.js b/admin-dev/themes/default/js/calendar.js index 8502fbcf09d..c4c8f838194 100644 --- a/admin-dev/themes/default/js/calendar.js +++ b/admin-dev/themes/default/js/calendar.js @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -460,4 +460,4 @@ $( document ).ready(function() { e.preventDefault; setPreviousYearPeriod(); }); -}); \ No newline at end of file +}); diff --git a/admin-dev/themes/default/js/help.js b/admin-dev/themes/default/js/help.js index c046d263a90..6da07191ee1 100755 --- a/admin-dev/themes/default/js/help.js +++ b/admin-dev/themes/default/js/help.js @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/index.php b/admin-dev/themes/default/js/index.php index e0c4a9c75bf..45cfe5d1842 100644 --- a/admin-dev/themes/default/js/index.php +++ b/admin-dev/themes/default/js/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/modernizr-loads.js b/admin-dev/themes/default/js/modernizr-loads.js index 3b71a520224..af167f1a4ac 100644 --- a/admin-dev/themes/default/js/modernizr-loads.js +++ b/admin-dev/themes/default/js/modernizr-loads.js @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -29,4 +29,4 @@ Modernizr.load([ }, baseAdminDir + "themes/default/js/vendor/enquire.min.js", baseAdminDir + "themes/default/js/admin-theme.js", -]); \ No newline at end of file +]); diff --git a/admin-dev/themes/default/js/theme.js b/admin-dev/themes/default/js/theme.js index 7784882d641..d93a75a8f81 100644 --- a/admin-dev/themes/default/js/theme.js +++ b/admin-dev/themes/default/js/theme.js @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/tree.js b/admin-dev/themes/default/js/tree.js index fe9018c7246..e112ffeda53 100644 --- a/admin-dev/themes/default/js/tree.js +++ b/admin-dev/themes/default/js/tree.js @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,226 +18,226 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ -var Tree = function (element, options) -{ - this.$element = $(element); - this.options = $.extend({}, $.fn.tree.defaults, options); - this.init(); -}; - -Tree.prototype = -{ - constructor: Tree, - - init: function () - { - var that = $(this); - var name = this.$element.parent().find('ul.tree input').first().attr('name'); - var idTree = this.$element.parent().find('.cattree.tree').first().attr('id'); - this.$element.find("label.tree-toggler, .icon-folder-close, .icon-folder-open").unbind('click'); - this.$element.find("label.tree-toggler, .icon-folder-close, .icon-folder-open").click( - function () - { - if ($(this).parent().parent().children("ul.tree").is(":visible")) - { - $(this).parent().children(".icon-folder-open") - .removeClass("icon-folder-open") - .addClass("icon-folder-close"); - - that.trigger('collapse'); - $(this).parent().parent().children("ul.tree").toggle(300); - } - else - { - $(this).parent().children(".icon-folder-close") - .removeClass("icon-folder-close") - .addClass("icon-folder-open"); - - var load_tree = (typeof(idTree) != 'undefined' - && $(this).parent().closest('.tree-folder').find('ul.tree .tree-toggler').first().html() == ''); - if (load_tree) - { - var category = $(this).parent().children('ul.tree input').first().val(); - var inputType = $(this).parent().children('ul.tree input').first().attr('type'); - var useCheckBox = 0; - if (inputType == 'checkbox') - { - useCheckBox = 1; - } - - var thatOne = $(this); - $.get( - 'ajax-tab.php', - {controller:'AdminProducts',token:currentToken,action:'getCategoryTree',type:idTree,category:category,inputName:name,useCheckBox:useCheckBox}, - function(content) - { - thatOne.parent().closest('.tree-folder').find('ul.tree').html(content); - $('#'+idTree).tree('collapse', thatOne.closest('.tree-folder').children("ul.tree")); - that.trigger('expand'); - thatOne.parent().parent().children("ul.tree").toggle(300); - $('#'+idTree).tree('init'); - } - ); - } - else - { - that.trigger('expand'); - $(this).parent().parent().children("ul.tree").toggle(300); - } - } - } - ); - this.$element.find("li").unbind('click'); - this.$element.find("li").click( - function () - { - $('.tree-selected').removeClass("tree-selected"); - $('li input:checked').parent().addClass("tree-selected"); - } - ); - - if (typeof(idTree) != 'undefined') - { - if ($('select#id_category_default').length) - { - this.$element.find(':input[type=checkbox]').unbind('click'); - this.$element.find(':input[type=checkbox]').click(function() - { - if ($(this).prop('checked')) - addDefaultCategory($(this)); - else - { - $('select#id_category_default option[value=' + $(this).val() + ']').remove(); - if ($('select#id_category_default option').length == 0) - { - $('select#id_category_default').closest('.form-group').hide(); - $('#no_default_category').show(); - } - } - }); - } - if (typeof(treeClickFunc) != 'undefined') - { - this.$element.find(":input[type=radio]").unbind('click'); - this.$element.find(":input[type=radio]").click(treeClickFunc); - } - } - - return $(this); - }, - - collapse : function(elem, $speed) - { - elem.find("label.tree-toggler").each( - function() - { - $(this).parent().children(".icon-folder-open") - .removeClass("icon-folder-open") - .addClass("icon-folder-close"); - $(this).parent().parent().children("ul.tree").hide($speed); - } - ); - - return $(this); - }, - - collapseAll : function($speed) - { - this.$element.find("label.tree-toggler").each( - function() - { - $(this).parent().children(".icon-folder-open") - .removeClass("icon-folder-open") - .addClass("icon-folder-close"); - $(this).parent().parent().children("ul.tree").hide($speed); - } - ); - - return $(this); - }, - - expandAll : function($speed) - { - var idTree = this.$element.parent().find('.cattree.tree').first().attr('id'); - if (typeof(idTree) != 'undefined' && !$('#'+idTree).hasClass('full_loaded')) - { - var selected = []; - that = this; - $('#'+idTree).find('.tree-selected input').each( - function() - { - selected.push($(this).val()); - } - ); - var name = $('#'+idTree).find('ul.tree input').first().attr('name'); - var inputType = $('#'+idTree).find('ul.tree input').first().attr('type'); - var useCheckBox = 0; - if (inputType == 'checkbox') - { - useCheckBox = 1; - } - - $.get( - 'ajax-tab.php', - {controller:'AdminProducts',token:currentToken,action:'getCategoryTree',type:idTree,fullTree:1,selected:selected, inputName:name,useCheckBox:useCheckBox}, - function(content) - { - $('#'+idTree).html(content); - $('#'+idTree).tree('init'); - that.$element.find("label.tree-toggler").each( - function() - { - $(this).parent().children(".icon-folder-close") - .removeClass("icon-folder-close") - .addClass("icon-folder-open"); - $(this).parent().parent().children("ul.tree").show($speed); - $('#'+idTree).addClass('full_loaded'); - } - ); - } - ); - } - else - { - this.$element.find("label.tree-toggler").each( - function() - { - $(this).parent().children(".icon-folder-close") - .removeClass("icon-folder-close") - .addClass("icon-folder-open"); - $(this).parent().parent().children("ul.tree").show($speed); - } - ); - } - - return $(this); - } -}; - -$.fn.tree = function (option, value) -{ - var methodReturn; - var $set = this.each( - function () - { - var $this = $(this); - var data = $this.data('tree'); - var options = typeof option === 'object' && option; - - if (!data){ - $this.data('tree', (data = new Tree(this, options))); - } - if (typeof option === 'string') { - methodReturn = data[option](value); - } - } - ); - - return (methodReturn === undefined) ? $set : methodReturn; -}; - -$.fn.tree.Constructor = Tree; \ No newline at end of file +var Tree = function (element, options) +{ + this.$element = $(element); + this.options = $.extend({}, $.fn.tree.defaults, options); + this.init(); +}; + +Tree.prototype = +{ + constructor: Tree, + + init: function () + { + var that = $(this); + var name = this.$element.parent().find('ul.tree input').first().attr('name'); + var idTree = this.$element.parent().find('.cattree.tree').first().attr('id'); + this.$element.find("label.tree-toggler, .icon-folder-close, .icon-folder-open").unbind('click'); + this.$element.find("label.tree-toggler, .icon-folder-close, .icon-folder-open").click( + function () + { + if ($(this).parent().parent().children("ul.tree").is(":visible")) + { + $(this).parent().children(".icon-folder-open") + .removeClass("icon-folder-open") + .addClass("icon-folder-close"); + + that.trigger('collapse'); + $(this).parent().parent().children("ul.tree").toggle(300); + } + else + { + $(this).parent().children(".icon-folder-close") + .removeClass("icon-folder-close") + .addClass("icon-folder-open"); + + var load_tree = (typeof(idTree) != 'undefined' + && $(this).parent().closest('.tree-folder').find('ul.tree .tree-toggler').first().html() == ''); + if (load_tree) + { + var category = $(this).parent().children('ul.tree input').first().val(); + var inputType = $(this).parent().children('ul.tree input').first().attr('type'); + var useCheckBox = 0; + if (inputType == 'checkbox') + { + useCheckBox = 1; + } + + var thatOne = $(this); + $.get( + 'ajax-tab.php', + {controller:'AdminProducts',token:currentToken,action:'getCategoryTree',type:idTree,category:category,inputName:name,useCheckBox:useCheckBox}, + function(content) + { + thatOne.parent().closest('.tree-folder').find('ul.tree').html(content); + $('#'+idTree).tree('collapse', thatOne.closest('.tree-folder').children("ul.tree")); + that.trigger('expand'); + thatOne.parent().parent().children("ul.tree").toggle(300); + $('#'+idTree).tree('init'); + } + ); + } + else + { + that.trigger('expand'); + $(this).parent().parent().children("ul.tree").toggle(300); + } + } + } + ); + this.$element.find("li").unbind('click'); + this.$element.find("li").click( + function () + { + $('.tree-selected').removeClass("tree-selected"); + $('li input:checked').parent().addClass("tree-selected"); + } + ); + + if (typeof(idTree) != 'undefined') + { + if ($('select#id_category_default').length) + { + this.$element.find(':input[type=checkbox]').unbind('click'); + this.$element.find(':input[type=checkbox]').click(function() + { + if ($(this).prop('checked')) + addDefaultCategory($(this)); + else + { + $('select#id_category_default option[value=' + $(this).val() + ']').remove(); + if ($('select#id_category_default option').length == 0) + { + $('select#id_category_default').closest('.form-group').hide(); + $('#no_default_category').show(); + } + } + }); + } + if (typeof(treeClickFunc) != 'undefined') + { + this.$element.find(":input[type=radio]").unbind('click'); + this.$element.find(":input[type=radio]").click(treeClickFunc); + } + } + + return $(this); + }, + + collapse : function(elem, $speed) + { + elem.find("label.tree-toggler").each( + function() + { + $(this).parent().children(".icon-folder-open") + .removeClass("icon-folder-open") + .addClass("icon-folder-close"); + $(this).parent().parent().children("ul.tree").hide($speed); + } + ); + + return $(this); + }, + + collapseAll : function($speed) + { + this.$element.find("label.tree-toggler").each( + function() + { + $(this).parent().children(".icon-folder-open") + .removeClass("icon-folder-open") + .addClass("icon-folder-close"); + $(this).parent().parent().children("ul.tree").hide($speed); + } + ); + + return $(this); + }, + + expandAll : function($speed) + { + var idTree = this.$element.parent().find('.cattree.tree').first().attr('id'); + if (typeof(idTree) != 'undefined' && !$('#'+idTree).hasClass('full_loaded')) + { + var selected = []; + that = this; + $('#'+idTree).find('.tree-selected input').each( + function() + { + selected.push($(this).val()); + } + ); + var name = $('#'+idTree).find('ul.tree input').first().attr('name'); + var inputType = $('#'+idTree).find('ul.tree input').first().attr('type'); + var useCheckBox = 0; + if (inputType == 'checkbox') + { + useCheckBox = 1; + } + + $.get( + 'ajax-tab.php', + {controller:'AdminProducts',token:currentToken,action:'getCategoryTree',type:idTree,fullTree:1,selected:selected, inputName:name,useCheckBox:useCheckBox}, + function(content) + { + $('#'+idTree).html(content); + $('#'+idTree).tree('init'); + that.$element.find("label.tree-toggler").each( + function() + { + $(this).parent().children(".icon-folder-close") + .removeClass("icon-folder-close") + .addClass("icon-folder-open"); + $(this).parent().parent().children("ul.tree").show($speed); + $('#'+idTree).addClass('full_loaded'); + } + ); + } + ); + } + else + { + this.$element.find("label.tree-toggler").each( + function() + { + $(this).parent().children(".icon-folder-close") + .removeClass("icon-folder-close") + .addClass("icon-folder-open"); + $(this).parent().parent().children("ul.tree").show($speed); + } + ); + } + + return $(this); + } +}; + +$.fn.tree = function (option, value) +{ + var methodReturn; + var $set = this.each( + function () + { + var $this = $(this); + var data = $this.data('tree'); + var options = typeof option === 'object' && option; + + if (!data){ + $this.data('tree', (data = new Tree(this, options))); + } + if (typeof option === 'string') { + methodReturn = data[option](value); + } + } + ); + + return (methodReturn === undefined) ? $set : methodReturn; +}; + +$.fn.tree.Constructor = Tree; diff --git a/admin-dev/themes/default/js/vendor/bootstrap/index.php b/admin-dev/themes/default/js/vendor/bootstrap/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/themes/default/js/vendor/bootstrap/index.php +++ b/admin-dev/themes/default/js/vendor/bootstrap/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/vendor/index.php b/admin-dev/themes/default/js/vendor/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/themes/default/js/vendor/index.php +++ b/admin-dev/themes/default/js/vendor/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/controllers/index.php b/admin-dev/themes/default/sass/controllers/index.php index e0c4a9c75bf..45cfe5d1842 100644 --- a/admin-dev/themes/default/sass/controllers/index.php +++ b/admin-dev/themes/default/sass/controllers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/index.php b/admin-dev/themes/default/sass/index.php index 4f389532be0..c9e1f28ee77 100755 --- a/admin-dev/themes/default/sass/index.php +++ b/admin-dev/themes/default/sass/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/modules/colors/index.php b/admin-dev/themes/default/sass/modules/colors/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/themes/default/sass/modules/colors/index.php +++ b/admin-dev/themes/default/sass/modules/colors/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/modules/index.php b/admin-dev/themes/default/sass/modules/index.php index 0abc42463df..45cfe5d1842 100755 --- a/admin-dev/themes/default/sass/modules/index.php +++ b/admin-dev/themes/default/sass/modules/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/partials/index.php b/admin-dev/themes/default/sass/partials/index.php index 4f389532be0..c9e1f28ee77 100755 --- a/admin-dev/themes/default/sass/partials/index.php +++ b/admin-dev/themes/default/sass/partials/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/schemes/index.php b/admin-dev/themes/default/sass/schemes/index.php index e0c4a9c75bf..45cfe5d1842 100644 --- a/admin-dev/themes/default/sass/schemes/index.php +++ b/admin-dev/themes/default/sass/schemes/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/schemes_rtl/index.php b/admin-dev/themes/default/sass/schemes_rtl/index.php index e0c4a9c75bf..45cfe5d1842 100644 --- a/admin-dev/themes/default/sass/schemes_rtl/index.php +++ b/admin-dev/themes/default/sass/schemes_rtl/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/vendor/bi-app/index.php b/admin-dev/themes/default/sass/vendor/bi-app/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/themes/default/sass/vendor/bi-app/index.php +++ b/admin-dev/themes/default/sass/vendor/bi-app/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/vendor/bootstrap-rtl-sass/index.php b/admin-dev/themes/default/sass/vendor/bootstrap-rtl-sass/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/themes/default/sass/vendor/bootstrap-rtl-sass/index.php +++ b/admin-dev/themes/default/sass/vendor/bootstrap-rtl-sass/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/vendor/bootstrap-sass/index.php b/admin-dev/themes/default/sass/vendor/bootstrap-sass/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/themes/default/sass/vendor/bootstrap-sass/index.php +++ b/admin-dev/themes/default/sass/vendor/bootstrap-sass/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/vendor/bootstrap-sass/mixins/index.php b/admin-dev/themes/default/sass/vendor/bootstrap-sass/mixins/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/themes/default/sass/vendor/bootstrap-sass/mixins/index.php +++ b/admin-dev/themes/default/sass/vendor/bootstrap-sass/mixins/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/vendor/font-awesome/index.php b/admin-dev/themes/default/sass/vendor/font-awesome/index.php index 816db9a4e61..4ccbaeecea3 100644 --- a/admin-dev/themes/default/sass/vendor/font-awesome/index.php +++ b/admin-dev/themes/default/sass/vendor/font-awesome/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/vendor/index.php b/admin-dev/themes/default/sass/vendor/index.php index e29275c24a6..45cfe5d1842 100755 --- a/admin-dev/themes/default/sass/vendor/index.php +++ b/admin-dev/themes/default/sass/vendor/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ - + header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - + header("Cache-Control: no-store, no-cache, must-revalidate"); header("Cache-Control: post-check=0, pre-check=0", false); header("Pragma: no-cache"); - + header("Location: ../"); -exit; \ No newline at end of file +exit; diff --git a/admin-dev/themes/default/template/content-legacy.tpl b/admin-dev/themes/default/template/content-legacy.tpl index d546ad3578b..7288495eee1 100644 --- a/admin-dev/themes/default/template/content-legacy.tpl +++ b/admin-dev/themes/default/template/content-legacy.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -33,4 +33,4 @@ {$content} {/if} - \ No newline at end of file + diff --git a/admin-dev/themes/default/template/content.tpl b/admin-dev/themes/default/template/content.tpl index d546ad3578b..7288495eee1 100644 --- a/admin-dev/themes/default/template/content.tpl +++ b/admin-dev/themes/default/template/content.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -33,4 +33,4 @@ {$content} {/if} - \ No newline at end of file + 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 ba8044cb25b..318d3a23a21 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/access/helpers/form/index.php b/admin-dev/themes/default/template/controllers/access/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/access/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/access/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/access/helpers/index.php b/admin-dev/themes/default/template/controllers/access/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/access/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/access/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/access/index.php b/admin-dev/themes/default/template/controllers/access/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/access/index.php +++ b/admin-dev/themes/default/template/controllers/access/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/addons_catalog/content.tpl b/admin-dev/themes/default/template/controllers/addons_catalog/content.tpl index 27229fa0421..0249deaeb0c 100644 --- a/admin-dev/themes/default/template/controllers/addons_catalog/content.tpl +++ b/admin-dev/themes/default/template/controllers/addons_catalog/content.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/addons_catalog/index.php b/admin-dev/themes/default/template/controllers/addons_catalog/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/addons_catalog/index.php +++ b/admin-dev/themes/default/template/controllers/addons_catalog/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl index c2c30b524a8..d4414630599 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-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/form/index.php b/admin-dev/themes/default/template/controllers/addresses/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/addresses/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/addresses/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/index.php b/admin-dev/themes/default/template/controllers/addresses/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/addresses/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/addresses/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/list/index.php b/admin-dev/themes/default/template/controllers/addresses/helpers/list/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/addresses/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/addresses/helpers/list/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/addresses/helpers/list/list_header.tpl index d8b6119c8bd..be906783e15 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/addresses/index.php b/admin-dev/themes/default/template/controllers/addresses/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/addresses/index.php +++ b/admin-dev/themes/default/template/controllers/addresses/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/attachments/helpers/list/list_action_delete.tpl b/admin-dev/themes/default/template/controllers/attachments/helpers/list/list_action_delete.tpl index bb6da573d09..a0e4ceda9fa 100644 --- a/admin-dev/themes/default/template/controllers/attachments/helpers/list/list_action_delete.tpl +++ b/admin-dev/themes/default/template/controllers/attachments/helpers/list/list_action_delete.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/attachments/index.php b/admin-dev/themes/default/template/controllers/attachments/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/attachments/index.php +++ b/admin-dev/themes/default/template/controllers/attachments/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 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 5d0f0163a71..f8044e9eed7 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-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/attribute_generator/index.php b/admin-dev/themes/default/template/controllers/attribute_generator/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/attribute_generator/index.php +++ b/admin-dev/themes/default/template/controllers/attribute_generator/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl index 59cdda34b0b..74a9443cf26 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -62,9 +62,9 @@ else $('.colorAttributeProperties').hide(); }; - + displayColorFieldsOption(); - + $('#id_attribute_group').change(displayColorFieldsOption); var shop_associations = {$fields[0]['form']['shop_associations']}; diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/form/index.php b/admin-dev/themes/default/template/controllers/attributes/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/attributes/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/attributes/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/index.php b/admin-dev/themes/default/template/controllers/attributes/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/attributes/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/attributes/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/attributes/index.php b/admin-dev/themes/default/template/controllers/attributes/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/attributes/index.php +++ b/admin-dev/themes/default/template/controllers/attributes/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl index 060b2707b9e..e116939f57a 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -30,4 +30,4 @@ {if $input.name == 'public_name'} {hook h="displayAttributeGroupForm" id_attribute_group=$form_id} {/if} -{/block} \ No newline at end of file +{/block} diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/index.php b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/index.php b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/index.php b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/list_header.tpl index d747d232652..1cf03f07e6c 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -30,4 +30,4 @@ $(location.hash).click(); }); -{/block} \ No newline at end of file +{/block} diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/view/index.php b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/index.php b/admin-dev/themes/default/template/controllers/attributes_groups/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/attributes_groups/index.php +++ b/admin-dev/themes/default/template/controllers/attributes_groups/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/backup/download/index.php b/admin-dev/themes/default/template/controllers/backup/download/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/backup/download/index.php +++ b/admin-dev/themes/default/template/controllers/backup/download/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/backup/download/view.tpl b/admin-dev/themes/default/template/controllers/backup/download/view.tpl index 3cf13e7aaa3..4909f5ebc1d 100644 --- a/admin-dev/themes/default/template/controllers/backup/download/view.tpl +++ b/admin-dev/themes/default/template/controllers/backup/download/view.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -33,7 +33,7 @@

- + {l s='Download the backup file (%s MB)' sprintf=[$backup_weight]}

@@ -57,7 +57,7 @@
diff --git a/admin-dev/themes/default/template/controllers/backup/helpers/index.php b/admin-dev/themes/default/template/controllers/backup/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/backup/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/backup/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/backup/helpers/list/index.php b/admin-dev/themes/default/template/controllers/backup/helpers/list/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/backup/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/backup/helpers/list/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl index 0c50fd1fd64..3a8f4878c5b 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/backup/helpers/view/index.php b/admin-dev/themes/default/template/controllers/backup/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/backup/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/backup/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl index 46e59474164..5efe49dfe93 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-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/backup/index.php b/admin-dev/themes/default/template/controllers/backup/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/backup/index.php +++ b/admin-dev/themes/default/template/controllers/backup/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl index 1cbe1673ce4..04122e92ab0 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl index c5d4f2c738c..6ed1098a548 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/index.php b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/index.php b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/index.php b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl index 2d66721fd4d..8461225c290 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -67,7 +67,7 @@ {/foreach} {foreach from=$wizard_contents.contents key=step_nbr item=content} -
+
{$content}
{/foreach} diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/index.php b/admin-dev/themes/default/template/controllers/carrier_wizard/index.php index e0c4a9c75bf..45cfe5d1842 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/index.php +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl index a72e0693585..f0afe7c39b3 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -47,7 +47,7 @@ $('#carrier_logo_remove').hide(); } } - + function uploadCarrierLogo() { $.ajaxFileUpload({ url: 'ajax-tab.php?tab=AdminCarrierWizard&token={$token|addslashes}&action=uploadLogo', @@ -68,4 +68,4 @@ } }); } - \ No newline at end of file + diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl index 039d1fd5dc8..75333330b31 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl index 7d11fdeb6ce..cb747456a07 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -29,7 +29,7 @@ ($("input[name='is_free']:checked").val() == 0) ? $('#shipping_costs_div').show('toggle'): $('#shipping_costs_div').hide(); $("input[name='is_free']").live('change', function() {ldelim} - ($("input[name='is_free']:checked").val() == 0) ? $('#shipping_costs_div').show('toggle'): $('#shipping_costs_div').hide(); + ($("input[name='is_free']:checked").val() == 0) ? $('#shipping_costs_div').show('toggle'): $('#shipping_costs_div').hide(); {rdelim}); {/block} diff --git a/admin-dev/themes/default/template/controllers/carriers/helpers/form/index.php b/admin-dev/themes/default/template/controllers/carriers/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/carriers/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/carriers/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/carriers/helpers/index.php b/admin-dev/themes/default/template/controllers/carriers/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/carriers/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/carriers/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/carriers/helpers/list/index.php b/admin-dev/themes/default/template/controllers/carriers/helpers/list/index.php index e0c4a9c75bf..45cfe5d1842 100644 --- a/admin-dev/themes/default/template/controllers/carriers/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/carriers/helpers/list/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/carriers/helpers/list/list_content.tpl b/admin-dev/themes/default/template/controllers/carriers/helpers/list/list_content.tpl index 03985344290..95a5687b262 100644 --- a/admin-dev/themes/default/template/controllers/carriers/helpers/list/list_content.tpl +++ b/admin-dev/themes/default/template/controllers/carriers/helpers/list/list_content.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -37,4 +37,4 @@ {else} > {/if} - {/block} \ No newline at end of file + {/block} diff --git a/admin-dev/themes/default/template/controllers/carriers/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/carriers/helpers/list/list_footer.tpl index 2e20106a42e..42f2acb27a6 100644 --- a/admin-dev/themes/default/template/controllers/carriers/helpers/list/list_footer.tpl +++ b/admin-dev/themes/default/template/controllers/carriers/helpers/list/list_footer.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/carriers/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/carriers/helpers/list/list_header.tpl index a25496bdc8d..33afd56fa5f 100644 --- a/admin-dev/themes/default/template/controllers/carriers/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/carriers/helpers/list/list_header.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/carriers/index.php b/admin-dev/themes/default/template/controllers/carriers/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/carriers/index.php +++ b/admin-dev/themes/default/template/controllers/carriers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl index 2651a30ce4d..b727f82d3ab 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl index 7d39dfc8e1e..532131a0a4f 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.js b/admin-dev/themes/default/template/controllers/cart_rules/form.js index 960db478280..d4272d10681 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/form.js +++ b/admin-dev/themes/default/template/controllers/cart_rules/form.js @@ -1,5 +1,5 @@ /** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl index e3f3c459a00..48b9695e49f 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -65,7 +65,7 @@ var timeText = '{l s='Time' js=1}'; var hourText = '{l s='Hour' js=1}'; var minuteText = '{l s='Minute' js=1}'; - + var languages = new Array(); {foreach from=$languages item=language key=k} languages[{$k}] = { diff --git a/admin-dev/themes/default/template/controllers/cart_rules/helpers/index.php b/admin-dev/themes/default/template/controllers/cart_rules/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/cart_rules/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/index.php b/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/list_header.tpl index 45f04b4610c..d96bf11392b 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/list_header.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/cart_rules/index.php b/admin-dev/themes/default/template/controllers/cart_rules/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/index.php +++ b/admin-dev/themes/default/template/controllers/cart_rules/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl index 800be68e852..749bca4a3f6 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl b/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl index 9a4c37aad42..02d8a1d45a0 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/cart_rules/product_rule_itemlist.tpl b/admin-dev/themes/default/template/controllers/cart_rules/product_rule_itemlist.tpl index 71c21ffe733..1cb073a5fb3 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/product_rule_itemlist.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/product_rule_itemlist.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -50,7 +50,7 @@
- + {/if} diff --git a/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/index.php b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/message.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/message.tpl index ec58168eb87..c63058c0714 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/message.tpl +++ b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/message.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/modal.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/modal.tpl index 7d398eeb5e4..82a08b7b0a7 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/modal.tpl +++ b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/modal.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -45,14 +45,14 @@ + diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/index.php b/admin-dev/themes/default/template/controllers/customers/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/customers/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/list/index.php b/admin-dev/themes/default/template/controllers/customers/helpers/list/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/customers/helpers/list/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl index d41db5d0cab..2b0479c0e10 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/required_fields.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/required_fields.tpl index 2368ba00378..5603718f58b 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/required_fields.tpl +++ b/admin-dev/themes/default/template/controllers/customers/helpers/required_fields.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/view/index.php b/admin-dev/themes/default/template/controllers/customers/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl index ec85140a921..49220d9b75b 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/customers/index.php b/admin-dev/themes/default/template/controllers/customers/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/customers/index.php +++ b/admin-dev/themes/default/template/controllers/customers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/index.php b/admin-dev/themes/default/template/controllers/dashboard/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/dashboard/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/dashboard/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/index.php b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl index 5e1341823e0..1ec3a1affa5 100644 --- a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/dashboard/index.php b/admin-dev/themes/default/template/controllers/dashboard/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/dashboard/index.php +++ b/admin-dev/themes/default/template/controllers/dashboard/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/emails/content.tpl b/admin-dev/themes/default/template/controllers/emails/content.tpl index b6e130c569b..9dee7244ba5 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-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,11 +18,11 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} {if isset($content)} {$content} -{/if} \ No newline at end of file +{/if} diff --git a/admin-dev/themes/default/template/controllers/emails/index.php b/admin-dev/themes/default/template/controllers/emails/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/emails/index.php +++ b/admin-dev/themes/default/template/controllers/emails/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl index 1d778e3a5ef..f56c4817647 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/employees/helpers/form/index.php b/admin-dev/themes/default/template/controllers/employees/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/employees/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/employees/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/employees/helpers/index.php b/admin-dev/themes/default/template/controllers/employees/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/employees/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/employees/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/employees/index.php b/admin-dev/themes/default/template/controllers/employees/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/employees/index.php +++ b/admin-dev/themes/default/template/controllers/employees/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl index 23469863a5e..871399be16e 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -29,4 +29,4 @@ {if $input.name == 'value'} {hook h="displayFeatureValueForm" id_feature_value=$feature_value->id|intval} {/if} -{/block} \ No newline at end of file +{/block} diff --git a/admin-dev/themes/default/template/controllers/feature_value/helpers/form/index.php b/admin-dev/themes/default/template/controllers/feature_value/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/feature_value/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/feature_value/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/feature_value/helpers/index.php b/admin-dev/themes/default/template/controllers/feature_value/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/feature_value/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/feature_value/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/feature_value/index.php b/admin-dev/themes/default/template/controllers/feature_value/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/feature_value/index.php +++ b/admin-dev/themes/default/template/controllers/feature_value/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl index fc71473590a..e4745431c5c 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/features/helpers/form/index.php b/admin-dev/themes/default/template/controllers/features/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/features/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/features/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/features/helpers/index.php b/admin-dev/themes/default/template/controllers/features/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/features/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/features/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/features/index.php b/admin-dev/themes/default/template/controllers/features/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/features/index.php +++ b/admin-dev/themes/default/template/controllers/features/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/geolocation/helpers/index.php b/admin-dev/themes/default/template/controllers/geolocation/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/geolocation/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/geolocation/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/geolocation/helpers/options/index.php b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/geolocation/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl index c5b23a5bd6f..262db879869 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-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/geolocation/index.php b/admin-dev/themes/default/template/controllers/geolocation/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/geolocation/index.php +++ b/admin-dev/themes/default/template/controllers/geolocation/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl index 427c1909d8f..7e5e5b1cad5 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/form/index.php b/admin-dev/themes/default/template/controllers/groups/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/groups/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/index.php b/admin-dev/themes/default/template/controllers/groups/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/groups/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/tree/index.php b/admin-dev/themes/default/template/controllers/groups/helpers/tree/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/tree/index.php +++ b/admin-dev/themes/default/template/controllers/groups/helpers/tree/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_categories.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_categories.tpl index 5bc5ed3ae44..108f63cca6c 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_categories.tpl +++ b/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_categories.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -106,4 +106,4 @@ ); {/if} }); - \ No newline at end of file + diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_folder_radio.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_folder_radio.tpl index b52302ef5a9..3821983a24d 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_folder_radio.tpl +++ b/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_folder_radio.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -31,4 +31,4 @@
    {$children|escape:'UTF-8'}
- \ No newline at end of file + diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_item_radio.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_item_radio.tpl index ef634367568..83ac0561f77 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_item_radio.tpl +++ b/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_item_radio.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/view/index.php b/admin-dev/themes/default/template/controllers/groups/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/groups/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl index 1c76197c236..bca16098121 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/groups/index.php b/admin-dev/themes/default/template/controllers/groups/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/groups/index.php +++ b/admin-dev/themes/default/template/controllers/groups/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 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 a9eae10ef7d..9b1c955920a 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-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/images/index.php b/admin-dev/themes/default/template/controllers/images/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/images/index.php +++ b/admin-dev/themes/default/template/controllers/images/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl index 96ed05052f7..5baf14caf91 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/index.php b/admin-dev/themes/default/template/controllers/import/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/import/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/import/helpers/index.php b/admin-dev/themes/default/template/controllers/import/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/import/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/import/helpers/view/index.php b/admin-dev/themes/default/template/controllers/import/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/import/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl index e6b3b5de243..528552b81b3 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/import/index.php b/admin-dev/themes/default/template/controllers/import/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/import/index.php +++ b/admin-dev/themes/default/template/controllers/import/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/import/modal_import_progress.tpl b/admin-dev/themes/default/template/controllers/import/modal_import_progress.tpl index e673939912f..07951716c96 100644 --- a/admin-dev/themes/default/template/controllers/import/modal_import_progress.tpl +++ b/admin-dev/themes/default/template/controllers/import/modal_import_progress.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/index.php b/admin-dev/themes/default/template/controllers/index.php index 1ea8f385644..b421cb0f845 100644 --- a/admin-dev/themes/default/template/controllers/index.php +++ b/admin-dev/themes/default/template/controllers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/information/helpers/index.php b/admin-dev/themes/default/template/controllers/information/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/information/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/information/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/information/helpers/view/index.php b/admin-dev/themes/default/template/controllers/information/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/information/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/information/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl index ddc56e22dc0..b2340bebac1 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-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/information/index.php b/admin-dev/themes/default/template/controllers/information/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/information/index.php +++ b/admin-dev/themes/default/template/controllers/information/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl index e0bfbf39c81..c50440234a5 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/invoices/helpers/form/index.php b/admin-dev/themes/default/template/controllers/invoices/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/invoices/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/invoices/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/invoices/helpers/index.php b/admin-dev/themes/default/template/controllers/invoices/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/invoices/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/invoices/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/invoices/index.php b/admin-dev/themes/default/template/controllers/invoices/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/invoices/index.php +++ b/admin-dev/themes/default/template/controllers/invoices/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl index d29ea1d6204..8e81aad695c 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/languages/helpers/form/index.php b/admin-dev/themes/default/template/controllers/languages/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/languages/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/languages/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/languages/helpers/index.php b/admin-dev/themes/default/template/controllers/languages/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/languages/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/languages/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/languages/index.php b/admin-dev/themes/default/template/controllers/languages/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/languages/index.php +++ b/admin-dev/themes/default/template/controllers/languages/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/localization/content.tpl b/admin-dev/themes/default/template/controllers/localization/content.tpl index 788ef77c358..2caabdc3074 100644 --- a/admin-dev/themes/default/template/controllers/localization/content.tpl +++ b/admin-dev/themes/default/template/controllers/localization/content.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -31,4 +31,4 @@ alert('Before changing the default currency, we strongly recommend that you enable maintenance mode because any change on default currency requires manual adjustment of the price of each product'); }); }); - \ No newline at end of file + diff --git a/admin-dev/themes/default/template/controllers/localization/index.php b/admin-dev/themes/default/template/controllers/localization/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/localization/index.php +++ b/admin-dev/themes/default/template/controllers/localization/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl index e6cac68cbe8..384c308911d 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-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/login/header.tpl b/admin-dev/themes/default/template/controllers/login/header.tpl index 9e3db79e745..d1ae2e8cfa2 100644 --- a/admin-dev/themes/default/template/controllers/login/header.tpl +++ b/admin-dev/themes/default/template/controllers/login/header.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/login/index.php b/admin-dev/themes/default/template/controllers/login/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/login/index.php +++ b/admin-dev/themes/default/template/controllers/login/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/login/layout.tpl b/admin-dev/themes/default/template/controllers/login/layout.tpl index 107277becd6..6c0fea60511 100644 --- a/admin-dev/themes/default/template/controllers/login/layout.tpl +++ b/admin-dev/themes/default/template/controllers/login/layout.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,11 +18,11 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} {$header} {$page} -{$footer} \ No newline at end of file +{$footer} diff --git a/admin-dev/themes/default/template/controllers/logs/employee_field.tpl b/admin-dev/themes/default/template/controllers/logs/employee_field.tpl index c30ecf2d07a..8147fa2a855 100644 --- a/admin-dev/themes/default/template/controllers/logs/employee_field.tpl +++ b/admin-dev/themes/default/template/controllers/logs/employee_field.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,11 +18,11 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -{$employee_name} \ No newline at end of file +{$employee_name} diff --git a/admin-dev/themes/default/template/controllers/logs/helpers/index.php b/admin-dev/themes/default/template/controllers/logs/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/logs/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/logs/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/logs/helpers/list/index.php b/admin-dev/themes/default/template/controllers/logs/helpers/list/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/logs/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/logs/helpers/list/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl index 25b9bda597a..0fa9839c6ef 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -41,4 +41,4 @@ -{/block} \ No newline at end of file +{/block} diff --git a/admin-dev/themes/default/template/controllers/logs/index.php b/admin-dev/themes/default/template/controllers/logs/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/logs/index.php +++ b/admin-dev/themes/default/template/controllers/logs/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/maintenance/helpers/index.php b/admin-dev/themes/default/template/controllers/maintenance/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/maintenance/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/maintenance/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/index.php b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl index 387c0efd81b..125d0e33214 100644 --- a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -40,4 +40,4 @@ {else} {$smarty.block.parent} {/if} -{/block} \ No newline at end of file +{/block} diff --git a/admin-dev/themes/default/template/controllers/maintenance/index.php b/admin-dev/themes/default/template/controllers/maintenance/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/maintenance/index.php +++ b/admin-dev/themes/default/template/controllers/maintenance/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/manufacturers/helpers/index.php b/admin-dev/themes/default/template/controllers/manufacturers/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/manufacturers/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/manufacturers/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/index.php b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl index 00dc8bb1ac7..0b05e722b61 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/manufacturers/index.php b/admin-dev/themes/default/template/controllers/manufacturers/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/manufacturers/index.php +++ b/admin-dev/themes/default/template/controllers/manufacturers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/marketing/helpers/index.php b/admin-dev/themes/default/template/controllers/marketing/helpers/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/marketing/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/marketing/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/marketing/helpers/view/index.php b/admin-dev/themes/default/template/controllers/marketing/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/marketing/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/marketing/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/marketing/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/marketing/helpers/view/view.tpl index 8f0ec2da5e0..00e50eea9be 100644 --- a/admin-dev/themes/default/template/controllers/marketing/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/marketing/helpers/view/view.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,9 +18,9 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -{$modules_list} \ No newline at end of file +{$modules_list} diff --git a/admin-dev/themes/default/template/controllers/marketing/index.php b/admin-dev/themes/default/template/controllers/marketing/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/marketing/index.php +++ b/admin-dev/themes/default/template/controllers/marketing/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/meta/helpers/index.php b/admin-dev/themes/default/template/controllers/meta/helpers/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/meta/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/meta/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/meta/index.php b/admin-dev/themes/default/template/controllers/meta/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/meta/index.php +++ b/admin-dev/themes/default/template/controllers/meta/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/modules/ad_bar.tpl b/admin-dev/themes/default/template/controllers/modules/ad_bar.tpl index 4004ac581ea..e02df63f34a 100644 --- a/admin-dev/themes/default/template/controllers/modules/ad_bar.tpl +++ b/admin-dev/themes/default/template/controllers/modules/ad_bar.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl b/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl index 380d1b46267..e8344c159c0 100644 --- a/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl +++ b/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -28,7 +28,7 @@ {if isset($display_multishop_checkbox) && $display_multishop_checkbox}

{l s='Configuration' d='Admin.Global'}

- isEnabledForShopContext()} checked="checked"{/if} + isEnabledForShopContext()} checked="checked"{/if} onclick="location.href = '{$current_url|regex_replace:$smarty.capture.default:''}&module_name={$module_name}&enable=' + (($(this).attr('checked')) ? 1 : 0);" /> {l s='Activate module for this shop context: %s.' sprintf=[$shop_context]}
diff --git a/admin-dev/themes/default/template/controllers/modules/configure.tpl b/admin-dev/themes/default/template/controllers/modules/configure.tpl index 9a4b753764f..4ef51ed8d98 100644 --- a/admin-dev/themes/default/template/controllers/modules/configure.tpl +++ b/admin-dev/themes/default/template/controllers/modules/configure.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules/content-legacy.tpl b/admin-dev/themes/default/template/controllers/modules/content-legacy.tpl index d9ca0e77d2a..665cf949926 100644 --- a/admin-dev/themes/default/template/controllers/modules/content-legacy.tpl +++ b/admin-dev/themes/default/template/controllers/modules/content-legacy.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules/favorites.tpl b/admin-dev/themes/default/template/controllers/modules/favorites.tpl index a423e2a0380..a21adcd5d31 100755 --- a/admin-dev/themes/default/template/controllers/modules/favorites.tpl +++ b/admin-dev/themes/default/template/controllers/modules/favorites.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -32,7 +32,7 @@
- {l s='Normal view'} + {l s='Normal view'} diff --git a/admin-dev/themes/default/template/controllers/modules/filters.tpl b/admin-dev/themes/default/template/controllers/modules/filters.tpl index abe6ed9d66f..6a691a44bcd 100644 --- a/admin-dev/themes/default/template/controllers/modules/filters.tpl +++ b/admin-dev/themes/default/template/controllers/modules/filters.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -71,10 +71,10 @@ diff --git a/admin-dev/themes/default/template/controllers/modules/index.php b/admin-dev/themes/default/template/controllers/modules/index.php index cc7da6d11ca..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/modules/index.php +++ b/admin-dev/themes/default/template/controllers/modules/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/modules/js.tpl b/admin-dev/themes/default/template/controllers/modules/js.tpl index 634db8b9d5f..f0c8b706d65 100644 --- a/admin-dev/themes/default/template/controllers/modules/js.tpl +++ b/admin-dev/themes/default/template/controllers/modules/js.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -71,7 +71,7 @@ if (module_name != '') $.uiTableFilter($('#moduleContainer').find('table'), module_name); - + $('#moduleQuicksearch').on('keyup', function(){ val = this.value; if ($('#filter_all').hasClass('active')) @@ -85,15 +85,15 @@ clearInterval(interval); interval = null; } - + }, 100); - - + + }).on('keydown', function(e){ if (e.keyCode == 13) return false; }); - + $('input[name="filtername"]').result(function(event, data, formatted) { $('#filternameForm').submit(); }); @@ -113,7 +113,7 @@ $(this).attr("rel", "false"); $("input[name=modules]").removeAttr("checked"); } - }); + }); // Method to reload filter in ajax $('.categoryModuleFilterLink').click(function() @@ -211,12 +211,12 @@ return false; } - $(document).on('change', '#module_type_filter, #module_install_filter, #module_status_filter, #country_module_value_filter', function() { - setFilter(); + $(document).on('change', '#module_type_filter, #module_install_filter, #module_status_filter, #country_module_value_filter', function() { + setFilter(); }); $('.moduleTabPreferencesChoise').change(function() - { + { var value_pref = $(this).val(); var module_pref = $(this).attr('name'); module_pref = module_pref.substring(2, module_pref.length); @@ -239,7 +239,7 @@ } }); }); - + // Method to save favorites preferences $('.moduleFavorite').change(function() { @@ -308,7 +308,7 @@ else $('#favorite-count').html(total_favorites-1); } - + }, error: function(res,textStatus,jqXHR) { diff --git a/admin-dev/themes/default/template/controllers/modules/list.tpl b/admin-dev/themes/default/template/controllers/modules/list.tpl index 8f02d9ec1d9..055566110e8 100644 --- a/admin-dev/themes/default/template/controllers/modules/list.tpl +++ b/admin-dev/themes/default/template/controllers/modules/list.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules/login_addons.tpl b/admin-dev/themes/default/template/controllers/modules/login_addons.tpl index cc955098913..b9ef768b434 100644 --- a/admin-dev/themes/default/template/controllers/modules/login_addons.tpl +++ b/admin-dev/themes/default/template/controllers/modules/login_addons.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules/modal_not_trusted.tpl b/admin-dev/themes/default/template/controllers/modules/modal_not_trusted.tpl index 37969eb1e4e..334bae5bf1c 100644 --- a/admin-dev/themes/default/template/controllers/modules/modal_not_trusted.tpl +++ b/admin-dev/themes/default/template/controllers/modules/modal_not_trusted.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules/modal_not_trusted_blocked.tpl b/admin-dev/themes/default/template/controllers/modules/modal_not_trusted_blocked.tpl index 6a11802cd53..3940a872867 100644 --- a/admin-dev/themes/default/template/controllers/modules/modal_not_trusted_blocked.tpl +++ b/admin-dev/themes/default/template/controllers/modules/modal_not_trusted_blocked.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules/modal_not_trusted_country.tpl b/admin-dev/themes/default/template/controllers/modules/modal_not_trusted_country.tpl index 886fb47feee..2026003778c 100644 --- a/admin-dev/themes/default/template/controllers/modules/modal_not_trusted_country.tpl +++ b/admin-dev/themes/default/template/controllers/modules/modal_not_trusted_country.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules/modal_translation.tpl b/admin-dev/themes/default/template/controllers/modules/modal_translation.tpl index bb9f804f0e9..0e4de587cff 100644 --- a/admin-dev/themes/default/template/controllers/modules/modal_translation.tpl +++ b/admin-dev/themes/default/template/controllers/modules/modal_translation.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -35,4 +35,4 @@ {/foreach}
- \ No newline at end of file + diff --git a/admin-dev/themes/default/template/controllers/modules/page.tpl b/admin-dev/themes/default/template/controllers/modules/page.tpl index 711626d20e1..d8ca9bfe161 100644 --- a/admin-dev/themes/default/template/controllers/modules/page.tpl +++ b/admin-dev/themes/default/template/controllers/modules/page.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules/page_header_toolbar-legacy.tpl b/admin-dev/themes/default/template/controllers/modules/page_header_toolbar-legacy.tpl index f082b689904..0374654ab2c 100644 --- a/admin-dev/themes/default/template/controllers/modules/page_header_toolbar-legacy.tpl +++ b/admin-dev/themes/default/template/controllers/modules/page_header_toolbar-legacy.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules/quickview.tpl b/admin-dev/themes/default/template/controllers/modules/quickview.tpl index c9f845db7a9..a0a712f316f 100644 --- a/admin-dev/themes/default/template/controllers/modules/quickview.tpl +++ b/admin-dev/themes/default/template/controllers/modules/quickview.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules/readmore-body.tpl b/admin-dev/themes/default/template/controllers/modules/readmore-body.tpl index e76413c091d..ecb17e6777f 100644 --- a/admin-dev/themes/default/template/controllers/modules/readmore-body.tpl +++ b/admin-dev/themes/default/template/controllers/modules/readmore-body.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules/readmore-header.tpl b/admin-dev/themes/default/template/controllers/modules/readmore-header.tpl index 90a153f2346..e74b306d9b1 100644 --- a/admin-dev/themes/default/template/controllers/modules/readmore-header.tpl +++ b/admin-dev/themes/default/template/controllers/modules/readmore-header.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl index d4f35f3de87..1f63928d8b9 100644 --- a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl +++ b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl b/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl index be7987c6623..4bf1b35e8a2 100644 --- a/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl +++ b/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl @@ -1,70 +1,70 @@ -{* -* 2007-2015 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -{if isset($tab_modules_list) && !empty($tab_modules_list)} -
-
- -
-
-
- {if count($tab_modules_list.not_installed)} -
- - {foreach from=$tab_modules_list.not_installed item=module} - {include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}} - {/foreach} -
-
- {/if} - {if count($tab_modules_list.installed)} -
- - {foreach from=$tab_modules_list.installed item=module} - {include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}} - {/foreach} -
-
- {/if} -
-{/if} -
- {l s='More modules on addons.prestashop.com'} -
+{* +* 2007-2017 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{if isset($tab_modules_list) && !empty($tab_modules_list)} +
+
+ +
+
+
+ {if count($tab_modules_list.not_installed)} +
+ + {foreach from=$tab_modules_list.not_installed item=module} + {include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}} + {/foreach} +
+
+ {/if} + {if count($tab_modules_list.installed)} +
+ + {foreach from=$tab_modules_list.installed item=module} + {include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}} + {/foreach} +
+
+ {/if} +
+{/if} +
+ {l s='More modules on addons.prestashop.com'} +
diff --git a/admin-dev/themes/default/template/controllers/modules/warning_module.tpl b/admin-dev/themes/default/template/controllers/modules/warning_module.tpl index a8ec08c0a50..43ad54e9cc7 100644 --- a/admin-dev/themes/default/template/controllers/modules/warning_module.tpl +++ b/admin-dev/themes/default/template/controllers/modules/warning_module.tpl @@ -1,5 +1,5 @@ {* -* 2007-2015 PrestaShop +* 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,8 +18,8 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA +* @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -{$text} \ No newline at end of file +{$text} 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 c03bfb38444..be8be902573 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-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/modules_positions/index.php b/admin-dev/themes/default/template/controllers/modules_positions/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/modules_positions/index.php +++ b/admin-dev/themes/default/template/controllers/modules_positions/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl index dba01ba9ce3..be5ae1ac40a 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-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 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 bff637b547d..1d3e6048a0f 100644 --- a/admin-dev/themes/default/template/controllers/not_found/content.tpl +++ b/admin-dev/themes/default/template/controllers/not_found/content.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -33,4 +33,4 @@ {l s='Go to the dashboard'} - \ No newline at end of file + diff --git a/admin-dev/themes/default/template/controllers/not_found/index.php b/admin-dev/themes/default/template/controllers/not_found/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/not_found/index.php +++ b/admin-dev/themes/default/template/controllers/not_found/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/order_preferences/helpers/index.php b/admin-dev/themes/default/template/controllers/order_preferences/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/order_preferences/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/order_preferences/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/index.php b/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/options.tpl index 4ade90c4a4a..01f0ecf336f 100644 --- a/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/options.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/order_preferences/index.php b/admin-dev/themes/default/template/controllers/order_preferences/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/order_preferences/index.php +++ b/admin-dev/themes/default/template/controllers/order_preferences/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl index 72f16b803eb..221fb43a01d 100644 --- a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl index ebc317ee352..4c71aa8aca2 100644 --- a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -84,7 +84,7 @@

@@ -107,4 +107,4 @@
- \ No newline at end of file + diff --git a/admin-dev/themes/default/template/controllers/orders/_documents.tpl b/admin-dev/themes/default/template/controllers/orders/_documents.tpl index 4639c80220f..564b6e5a881 100644 --- a/admin-dev/themes/default/template/controllers/orders/_documents.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_documents.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl index 2cb2600ec62..eabb5cb9099 100644 --- a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl b/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl index 3a23e9332d8..5c0cb72a40c 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl index f0ef3ccf585..965b7d2c5a1 100644 --- a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/orders/_select_payment.tpl b/admin-dev/themes/default/template/controllers/orders/_select_payment.tpl index 62f83e64e56..268b2454f11 100644 --- a/admin-dev/themes/default/template/controllers/orders/_select_payment.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_select_payment.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl index ed92bf683f9..85c0e0a63c6 100644 --- a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl index 6efdb1e9f09..5a84dcfdb94 100755 --- a/admin-dev/themes/default/template/controllers/orders/form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/form.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/orders/form_customization_feedback.tpl b/admin-dev/themes/default/template/controllers/orders/form_customization_feedback.tpl index 9726e5db5b9..f1eed462fa0 100644 --- a/admin-dev/themes/default/template/controllers/orders/form_customization_feedback.tpl +++ b/admin-dev/themes/default/template/controllers/orders/form_customization_feedback.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/index.php b/admin-dev/themes/default/template/controllers/orders/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/orders/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/orders/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/list/index.php b/admin-dev/themes/default/template/controllers/orders/helpers/list/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/orders/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/orders/helpers/list/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/list/list_header.tpl index d1ad7958d87..aeaf8c91516 100644 --- a/admin-dev/themes/default/template/controllers/orders/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/orders/helpers/list/list_header.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/index.php b/admin-dev/themes/default/template/controllers/orders/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/orders/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl index e60d7b25751..144958697d1 100644 --- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/orders/index.php b/admin-dev/themes/default/template/controllers/orders/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/orders/index.php +++ b/admin-dev/themes/default/template/controllers/orders/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/outstanding/_print_pdf_icon.tpl b/admin-dev/themes/default/template/controllers/outstanding/_print_pdf_icon.tpl index 10019fd36a9..dd02328b054 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -28,4 +28,4 @@ invoice -{/if} \ No newline at end of file +{/if} diff --git a/admin-dev/themes/default/template/controllers/outstanding/index.php b/admin-dev/themes/default/template/controllers/outstanding/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/outstanding/index.php +++ b/admin-dev/themes/default/template/controllers/outstanding/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/payment/helpers/index.php b/admin-dev/themes/default/template/controllers/payment/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/payment/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/payment/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/payment/helpers/view/index.php b/admin-dev/themes/default/template/controllers/payment/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/payment/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/payment/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl index 0bafc9bc710..2adc69b2b4b 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-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/payment/index.php b/admin-dev/themes/default/template/controllers/payment/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/payment/index.php +++ b/admin-dev/themes/default/template/controllers/payment/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/payment_preferences/helpers/index.php b/admin-dev/themes/default/template/controllers/payment_preferences/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/payment_preferences/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/payment_preferences/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/payment_preferences/helpers/view/index.php b/admin-dev/themes/default/template/controllers/payment_preferences/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/payment_preferences/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/payment_preferences/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/payment_preferences/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/payment_preferences/helpers/view/view.tpl index 2d0296573d6..144a87c8c2f 100644 --- a/admin-dev/themes/default/template/controllers/payment_preferences/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/payment_preferences/helpers/view/view.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/payment_preferences/index.php b/admin-dev/themes/default/template/controllers/payment_preferences/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/payment_preferences/index.php +++ b/admin-dev/themes/default/template/controllers/payment_preferences/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/payment_preferences/restrictions.tpl b/admin-dev/themes/default/template/controllers/payment_preferences/restrictions.tpl index cfa2995be2b..1f809599e8f 100644 --- a/admin-dev/themes/default/template/controllers/payment_preferences/restrictions.tpl +++ b/admin-dev/themes/default/template/controllers/payment_preferences/restrictions.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -110,7 +110,7 @@ {if $module->currencies && $module->currencies_mode == 'radio'} $list['name_id'])} checked="checked" - {/if} + {/if} /> {else} -- 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 b0751bfe27a..68dc210788e 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/performance/helpers/form/index.php b/admin-dev/themes/default/template/controllers/performance/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/performance/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/performance/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/performance/helpers/index.php b/admin-dev/themes/default/template/controllers/performance/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/performance/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/performance/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/performance/index.php b/admin-dev/themes/default/template/controllers/performance/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/performance/index.php +++ b/admin-dev/themes/default/template/controllers/performance/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/preferences/helpers/index.php b/admin-dev/themes/default/template/controllers/preferences/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/preferences/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/preferences/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/preferences/helpers/options/index.php b/admin-dev/themes/default/template/controllers/preferences/helpers/options/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/preferences/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/preferences/helpers/options/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/preferences/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/preferences/helpers/options/options.tpl index 805ff24adaf..b4a5eade168 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-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/preferences/index.php b/admin-dev/themes/default/template/controllers/preferences/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/preferences/index.php +++ b/admin-dev/themes/default/template/controllers/preferences/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/referrers/calendar.tpl b/admin-dev/themes/default/template/controllers/referrers/calendar.tpl index 9919396e3a4..32e3295591d 100644 --- a/admin-dev/themes/default/template/controllers/referrers/calendar.tpl +++ b/admin-dev/themes/default/template/controllers/referrers/calendar.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl b/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl index efda2373347..6adc277d947 100644 --- a/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl +++ b/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -98,4 +98,3 @@ - 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 ef3cb369ce8..1eaf242fcc7 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/form/index.php b/admin-dev/themes/default/template/controllers/referrers/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/referrers/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/referrers/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/index.php b/admin-dev/themes/default/template/controllers/referrers/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/referrers/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/referrers/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/list/index.php b/admin-dev/themes/default/template/controllers/referrers/helpers/list/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/referrers/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/referrers/helpers/list/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/list/list_header.tpl index f47438f1eed..7421c614aad 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -39,7 +39,7 @@ $('#calendar_form').submit(); }); } - + var btn_save_settings = $('span[class~="process-icon-save-settings"]').parent(); var btn_submit_settings = $('#submitSettings'); @@ -51,7 +51,7 @@ $('#settings_form').submit(); }); } - + var btn_save_refresh_index = $('span[class~="process-icon-refresh-index"]').parent(); var btn_submit_refresh_index = $('#submitRefreshIndex'); @@ -63,7 +63,7 @@ $('#refresh_index_form').submit(); }); } - + var btn_save_refresh_cache = $('span[class~="process-icon-refresh-cache"]').parent(); var btn_submit_refresh_cache = $('#submitRefreshCache'); @@ -81,4 +81,4 @@ {$calendar_form} {$settings_form} {/if} -{/block} \ No newline at end of file +{/block} diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/view/index.php b/admin-dev/themes/default/template/controllers/referrers/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/referrers/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/referrers/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl index df3add5a1c9..bb69af83649 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-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -67,7 +67,7 @@ } ) } - + function fillProducts(filter) { var form = document.layers ? document.forms.product_referrers : document.product_referrers; @@ -82,7 +82,7 @@ filter:filter }, function(j) { - + form.selectProduct.length = j.length + 1; for (var i = 0; i < j.length; i++) { diff --git a/admin-dev/themes/default/template/controllers/referrers/index.php b/admin-dev/themes/default/template/controllers/referrers/index.php index 393840ddf7d..1db4ff9034c 100644 --- a/admin-dev/themes/default/template/controllers/referrers/index.php +++ b/admin-dev/themes/default/template/controllers/referrers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl index a6d71a5a868..2b24e2a3983 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 @@ -1,5 +1,5 @@ {** - * 2007-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -51,7 +51,7 @@ - + {/block} {block name="script"} diff --git a/admin-dev/themes/default/template/controllers/request_sql/helpers/form/index.php b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/request_sql/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/request_sql/helpers/index.php b/admin-dev/themes/default/template/controllers/request_sql/helpers/index.php index 936cccc17f8..fa55eee1714 100644 --- a/admin-dev/themes/default/template/controllers/request_sql/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/request_sql/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/request_sql/helpers/view/index.php b/admin-dev/themes/default/template/controllers/request_sql/helpers/view/index.php index c9181a4e2dd..9877bc2c946 100644 --- a/admin-dev/themes/default/template/controllers/request_sql/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/request_sql/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/request_sql/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/request_sql/helpers/view/view.tpl index f63c5ea6bd8..91565b5dc2c 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-2016 PrestaShop + * 2007-2017 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2017 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -53,7 +53,7 @@ {/foreach} - + @@ -46,7 +46,7 @@ $(document).ready(function() {
- +
',i=t.createElement(n),"FORM"!==this.element.tagName?(s=t.createElement('
'),s.appendChild(i)):(this.element.setAttribute("enctype","multipart/form-data"),this.element.setAttribute("method",this.options.method)),null!=s?s:i)},t.prototype.getExistingFallback=function(){var e,t,i,n,s,a;for(t=function(e){var t,i,n;for(i=0,n=e.length;i0){for(r=["TB","GB","MB","KB","b"],i=o=0,l=r.length;o=t){n=e/Math.pow(this.options.filesizeBase,4-i),s=a;break}n=Math.round(10*n)/10}return""+n+" "+s},t.prototype._updateMaxFilesReachedClass=function(){return null!=this.options.maxFiles&&this.getAcceptedFiles().length>=this.options.maxFiles?(this.getAcceptedFiles().length===this.options.maxFiles&&this.emit("maxfilesreached",this.files),this.element.classList.add("dz-max-files-reached")):this.element.classList.remove("dz-max-files-reached")},t.prototype.drop=function(e){var t,i;e.dataTransfer&&(this.emit("drop",e),t=e.dataTransfer.files,this.emit("addedfiles",t),t.length&&(i=e.dataTransfer.items,i&&i.length&&null!=i[0].webkitGetAsEntry?this._addFilesFromItems(i):this.handleFiles(t)))},t.prototype.paste=function(e){var t,i;if(null!=(null!=e&&null!=(i=e.clipboardData)?i.items:void 0))return this.emit("paste",e),t=e.clipboardData.items,t.length?this._addFilesFromItems(t):void 0},t.prototype.handleFiles=function(e){var t,i,n,s;for(s=[],i=0,n=e.length;i0){for(a=0,r=i.length;a1024*this.options.maxFilesize*1024?i(this.options.dictFileTooBig.replace("{{filesize}}",Math.round(e.size/1024/10.24)/100).replace("{{maxFilesize}}",this.options.maxFilesize)):t.isValidFile(e,this.options.acceptedFiles)?null!=this.options.maxFiles&&this.getAcceptedFiles().length>=this.options.maxFiles?(i(this.options.dictMaxFilesExceeded.replace("{{maxFiles}}",this.options.maxFiles)),this.emit("maxfilesexceeded",e)):this.options.accept.call(this,e,i):i(this.options.dictInvalidFileType)},t.prototype.addFile=function(e){return e.upload={progress:0,total:e.size,bytesSent:0},this.files.push(e),e.status=t.ADDED,this.emit("addedfile",e),this._enqueueThumbnail(e),this.accept(e,function(t){return function(i){return i?(e.accepted=!1,t._errorProcessing([e],i)):(e.accepted=!0,t.options.autoQueue&&t.enqueueFile(e)),t._updateMaxFilesReachedClass()}}(this))},t.prototype.enqueueFiles=function(e){var t,i,n;for(i=0,n=e.length;i=t)&&(n=this.getQueuedFiles(),n.length>0)){if(this.options.uploadMultiple)return this.processFiles(n.slice(0,t-i));for(;e=O;u=0<=O?++H:--H)a.append(this._getParamName(u),e[u],this._renameFilename(e[u].name));return this.submitRequest(L,a,e)},t.prototype.submitRequest=function(e,t,i){return e.send(t)},t.prototype._finished=function(e,i,n){var s,a,r;for(a=0,r=e.length;au;)t=s[4*(l-1)+3],0===t?a=l:u=l,l=a+u>>1;return d=l/r,0===d?1:d},r=function(e,t,i,n,s,r,o,l,d,u){var c;return c=a(t),e.drawImage(t,i,n,s,r,o,l,d,u/c)},s=function(e,t){var i,n,s,a,r,o,l,d,u;if(s=!1,u=!0,n=e.document,d=n.documentElement,i=n.addEventListener?"addEventListener":"attachEvent",l=n.addEventListener?"removeEventListener":"detachEvent",o=n.addEventListener?"":"on",a=function(i){if("readystatechange"!==i.type||"complete"===n.readyState)return("load"===i.type?e:n)[l](o+i.type,a,!1),!s&&(s=!0)?t.call(e,i.type||i):void 0},r=function(){var e;try{d.doScroll("left")}catch(t){return e=t,void setTimeout(r,50)}return a("poll")},"complete"!==n.readyState){if(n.createEventObject&&d.doScroll){try{u=!e.frameElement}catch(e){}u&&r()}return n[i](o+"DOMContentLoaded",a,!1),n[i](o+"readystatechange",a,!1),e[i](o+"load",a,!1)}},t._autoDiscoverFunction=function(){if(t.autoDiscover)return t.discover()},s(window,t._autoDiscoverFunction)}).call(this)}).call(window)},function(e,t,i){(function(t){var n=!1,s=!1;(function(){!function(t,a){"function"==typeof n&&n.amd?n("typeahead.js",["jquery"],function(e){return a(e)}):"object"==typeof s?e.exports=a(i(3)):a(jQuery)}(this,function(e){var i=function(){"use strict";return{isMsie:function(){return!!/(msie|trident)/i.test(navigator.userAgent)&&navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2]},isBlankString:function(e){return!e||/^\s*$/.test(e)},escapeRegExChars:function(e){return e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")},isString:function(e){return"string"==typeof e},isNumber:function(e){return"number"==typeof e},isArray:e.isArray,isFunction:e.isFunction,isObject:e.isPlainObject,isUndefined:function(e){return"undefined"==typeof e},isElement:function(e){return!(!e||1!==e.nodeType)},isJQuery:function(t){return t instanceof e},toStr:function(e){return i.isUndefined(e)||null===e?"":e+""},bind:e.proxy,each:function(t,i){function n(e,t){return i(t,e)}e.each(t,n)},map:e.map,filter:e.grep,every:function(t,i){var n=!0;return t?(e.each(t,function(e,s){if(!(n=i.call(null,s,e,t)))return!1}),!!n):n},some:function(t,i){var n=!1;return t?(e.each(t,function(e,s){if(n=i.call(null,s,e,t))return!1}),!!n):n},mixin:e.extend,identity:function(e){return e},clone:function(t){return e.extend(!0,{},t)},getIdGenerator:function(){var e=0;return function(){return e++}},templatify:function(t){function i(){return String(t)}return e.isFunction(t)?t:i},defer:function(e){setTimeout(e,0)},debounce:function(e,t,i){var n,s;return function(){var a,r,o=this,l=arguments;return a=function(){n=null,i||(s=e.apply(o,l))},r=i&&!n,clearTimeout(n),n=setTimeout(a,t),r&&(s=e.apply(o,l)),s}},throttle:function(e,t){var i,n,s,a,r,o;return r=0,o=function(){r=new Date,s=null,a=e.apply(i,n)},function(){var l=new Date,d=t-(l-r);return i=this,n=arguments,d<=0?(clearTimeout(s),s=null,r=l,a=e.apply(i,n)):s||(s=setTimeout(o,d)),a}},stringify:function(e){return i.isString(e)?e:JSON.stringify(e)},noop:function(){}}}(),n=function(){"use strict";function e(e){var r,o;return o=i.mixin({},a,e),r={css:s(),classes:o,html:t(o),selectors:n(o)},{css:r.css,html:r.html,classes:r.classes,selectors:r.selectors,mixin:function(e){i.mixin(e,r)}}}function t(e){return{wrapper:'',menu:'
'}}function n(e){var t={};return i.each(e,function(e,i){t[i]="."+e}),t}function s(){var e={wrapper:{position:"relative",display:"inline-block"},hint:{position:"absolute",top:"0",left:"0",borderColor:"transparent",boxShadow:"none",opacity:"1"},input:{position:"relative",verticalAlign:"top",backgroundColor:"transparent"},inputWithNoHint:{position:"relative",verticalAlign:"top"},menu:{position:"absolute",top:"100%",left:"0",zIndex:"100",display:"none"},ltr:{left:"0",right:"auto"},rtl:{left:"auto",right:" 0"}};return i.isMsie()&&i.mixin(e.input,{backgroundImage:"url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)"}),e}var a={wrapper:"twitter-typeahead",input:"tt-input",hint:"tt-hint",menu:"tt-menu",dataset:"tt-dataset",suggestion:"tt-suggestion",selectable:"tt-selectable",empty:"tt-empty",open:"tt-open",cursor:"tt-cursor",highlight:"tt-highlight"};return e}(),s=function(){"use strict";function t(t){t&&t.el||e.error("EventBus initialized without el"),this.$el=e(t.el)}var n,s;return n="typeahead:",s={render:"rendered",cursorchange:"cursorchanged",select:"selected",autocomplete:"autocompleted"},i.mixin(t.prototype,{_trigger:function(t,i){var s;return s=e.Event(n+t),(i=i||[]).unshift(s),this.$el.trigger.apply(this.$el,i),s},before:function(e){var t,i;return t=[].slice.call(arguments,1),i=this._trigger("before"+e,t),i.isDefaultPrevented()},trigger:function(e){var t;this._trigger(e,[].slice.call(arguments,1)),(t=s[e])&&this._trigger(t,[].slice.call(arguments,1))}}),t}(),a=function(){"use strict";function e(e,t,i,n){var s;if(!i)return this;for(t=t.split(d),i=n?l(i,n):i,this._callbacks=this._callbacks||{};s=t.shift();)this._callbacks[s]=this._callbacks[s]||{sync:[],async:[]},this._callbacks[s][e].push(i);return this}function i(t,i,n){return e.call(this,"async",t,i,n)}function n(t,i,n){return e.call(this,"sync",t,i,n)}function s(e){var t;if(!this._callbacks)return this;for(e=e.split(d);t=e.shift();)delete this._callbacks[t];return this}function a(e){var t,i,n,s,a;if(!this._callbacks)return this;for(e=e.split(d),n=[].slice.call(arguments,1);(t=e.shift())&&(i=this._callbacks[t]);)s=r(i.sync,this,[t].concat(n)),a=r(i.async,this,[t].concat(n)),s()&&u(a);return this}function r(e,t,i){function n(){for(var n,s=0,a=e.length;!n&&s