From b990e12ead6fe9af0bb52a01ae121b1b6697cb01 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Thu, 29 Dec 2011 17:29:06 +0000 Subject: [PATCH] // Fix tpl files for some controllers --- .../template/accounting_export/menu.tpl | 2 +- .../template/addons_catalog/content.tpl | 25 +++++++++++++++++ .../template/addons_my_account/content.tpl | 25 +++++++++++++++++ .../default/template/cart_rules/actions.tpl | 27 ++++++++++++++++++- .../template/cart_rules/conditions.tpl | 27 ++++++++++++++++++- .../default/template/cart_rules/form.js | 10 +++---- .../default/template/cart_rules/form.tpl | 27 ++++++++++++++++++- .../template/cart_rules/informations.tpl | 27 ++++++++++++++++++- .../template/cart_rules/product_rule.tpl | 27 ++++++++++++++++++- .../cart_rules/product_rule_itemlist.tpl | 27 ++++++++++++++++++- .../template/customer_threads/options.tpl | 25 +++++++++++++++++ .../default/template/not_found/content.tpl | 25 +++++++++++++++++ .../template/orders/_discount_form.tpl | 27 ++++++++++++++++++- .../default/template/orders/_documents.tpl | 25 +++++++++++++++++ .../default/template/orders/_new_product.tpl | 25 +++++++++++++++++ .../default/template/orders/_shipping.tpl | 27 ++++++++++++++++++- .../admin/AdminAccountingExportController.php | 5 ++-- .../admin/AdminEmployeesController.php | 2 +- controllers/admin/AdminStatusesController.php | 2 +- modules/bankwire/bankwireController.php | 8 +++--- modules/cheque/chequeController.php | 8 +++--- themes/default/lang/fr.php | 7 +++-- themes/default/pdf/supply-order-footer.tpl | 6 ++--- themes/default/pdf/supply-order.tpl | 8 +++--- 24 files changed, 388 insertions(+), 36 deletions(-) diff --git a/admin-dev/themes/default/template/accounting_export/menu.tpl b/admin-dev/themes/default/template/accounting_export/menu.tpl index c3e2f61a3..69334b544 100644 --- a/admin-dev/themes/default/template/accounting_export/menu.tpl +++ b/admin-dev/themes/default/template/accounting_export/menu.tpl @@ -114,4 +114,4 @@ {/foreach} - \ No newline at end of file + diff --git a/admin-dev/themes/default/template/addons_catalog/content.tpl b/admin-dev/themes/default/template/addons_catalog/content.tpl index 5bd3128aa..8e137176e 100644 --- a/admin-dev/themes/default/template/addons_catalog/content.tpl +++ b/admin-dev/themes/default/template/addons_catalog/content.tpl @@ -1,3 +1,28 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*}
 
diff --git a/admin-dev/themes/default/template/addons_my_account/content.tpl b/admin-dev/themes/default/template/addons_my_account/content.tpl index 2c7143eef..bd755e69f 100644 --- a/admin-dev/themes/default/template/addons_my_account/content.tpl +++ b/admin-dev/themes/default/template/addons_my_account/content.tpl @@ -1,2 +1,27 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*}
 
diff --git a/admin-dev/themes/default/template/cart_rules/actions.tpl b/admin-dev/themes/default/template/cart_rules/actions.tpl index 9b56d434b..bec6570bc 100644 --- a/admin-dev/themes/default/template/cart_rules/actions.tpl +++ b/admin-dev/themes/default/template/cart_rules/actions.tpl @@ -1,3 +1,28 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 8971 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*}
   @@ -82,4 +107,4 @@
- \ No newline at end of file + diff --git a/admin-dev/themes/default/template/cart_rules/conditions.tpl b/admin-dev/themes/default/template/cart_rules/conditions.tpl index c3bd43426..5455cf5f6 100644 --- a/admin-dev/themes/default/template/cart_rules/conditions.tpl +++ b/admin-dev/themes/default/template/cart_rules/conditions.tpl @@ -1,3 +1,28 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 8971 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*}
@@ -185,4 +210,4 @@ {$product_rule} {/foreach} -
\ No newline at end of file + diff --git a/admin-dev/themes/default/template/cart_rules/form.js b/admin-dev/themes/default/template/cart_rules/form.js index 67d262a0e..20842c3ce 100644 --- a/admin-dev/themes/default/template/cart_rules/form.js +++ b/admin-dev/themes/default/template/cart_rules/form.js @@ -3,10 +3,10 @@ * * NOTICE OF LICENSE * -* This source file is subject to the Open Software License (OSL 3.0) +* 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/osl-3.0.php +* 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. @@ -19,8 +19,8 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 6844 $ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @version Release: $Revision: 7040 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -327,4 +327,4 @@ $('.datepicker').datepicker({ prevText: '', nextText: '', dateFormat: 'yy-mm-dd ' + hours + ':' + mins + ':' + secs -}); \ No newline at end of file +}); diff --git a/admin-dev/themes/default/template/cart_rules/form.tpl b/admin-dev/themes/default/template/cart_rules/form.tpl index 05fc3b5d0..7d447a49a 100644 --- a/admin-dev/themes/default/template/cart_rules/form.tpl +++ b/admin-dev/themes/default/template/cart_rules/form.tpl @@ -1,3 +1,28 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 8971 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} {if $show_toolbar}
@@ -68,4 +93,4 @@ {/foreach} displayFlags(languages, {$defaultLanguage}); - \ No newline at end of file + diff --git a/admin-dev/themes/default/template/cart_rules/informations.tpl b/admin-dev/themes/default/template/cart_rules/informations.tpl index 6fdfba679..13cf2f998 100644 --- a/admin-dev/themes/default/template/cart_rules/informations.tpl +++ b/admin-dev/themes/default/template/cart_rules/informations.tpl @@ -1,3 +1,28 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 8971 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} -
@@ -54,4 +79,4 @@
\ No newline at end of file + diff --git a/admin-dev/themes/default/template/cart_rules/product_rule.tpl b/admin-dev/themes/default/template/cart_rules/product_rule.tpl index fb78f6506..56f9c981e 100644 --- a/admin-dev/themes/default/template/cart_rules/product_rule.tpl +++ b/admin-dev/themes/default/template/cart_rules/product_rule.tpl @@ -1,3 +1,28 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 8971 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} @@ -33,4 +58,4 @@ \ No newline at end of file + diff --git a/admin-dev/themes/default/template/cart_rules/product_rule_itemlist.tpl b/admin-dev/themes/default/template/cart_rules/product_rule_itemlist.tpl index f00ecdd57..9d4aa1722 100644 --- a/admin-dev/themes/default/template/cart_rules/product_rule_itemlist.tpl +++ b/admin-dev/themes/default/template/cart_rules/product_rule_itemlist.tpl @@ -1,3 +1,28 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 8971 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*}
@@ -29,4 +54,4 @@ $('#product_rule_select_{$product_rule_id}_remove').click(function() { removeCartRuleOption(this); updateProductRuleShortDescription(this); }); $('#product_rule_select_{$product_rule_id}_add').click(function() { addCartRuleOption(this); updateProductRuleShortDescription(this); }); $(document).ready(function() { updateProductRuleShortDescription($('#product_rule_select_{$product_rule_id}_add')); }); - \ No newline at end of file + diff --git a/admin-dev/themes/default/template/customer_threads/options.tpl b/admin-dev/themes/default/template/customer_threads/options.tpl index 2d70cfd00..0289341f1 100644 --- a/admin-dev/themes/default/template/customer_threads/options.tpl +++ b/admin-dev/themes/default/template/customer_threads/options.tpl @@ -1,3 +1,28 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} {extends file="helper/options/options.tpl"} {block name="after"} {if $use_sync} diff --git a/admin-dev/themes/default/template/not_found/content.tpl b/admin-dev/themes/default/template/not_found/content.tpl index 1a46b3c27..ba5971e0d 100644 --- a/admin-dev/themes/default/template/not_found/content.tpl +++ b/admin-dev/themes/default/template/not_found/content.tpl @@ -1,3 +1,28 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*}

{l s='The controller'} {$controller} {l s='is missing or invalid. '}

  • {l s='Go to Dashboard'}
    • diff --git a/admin-dev/themes/default/template/orders/_discount_form.tpl b/admin-dev/themes/default/template/orders/_discount_form.tpl index ee8880223..05c392322 100644 --- a/admin-dev/themes/default/template/orders/_discount_form.tpl +++ b/admin-dev/themes/default/template/orders/_discount_form.tpl @@ -1,3 +1,28 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 9856 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*}
    @@ -49,4 +74,4 @@   {l s='Cancel'}

    - \ No newline at end of file + diff --git a/admin-dev/themes/default/template/orders/_documents.tpl b/admin-dev/themes/default/template/orders/_documents.tpl index 58805ea96..83a927c63 100644 --- a/admin-dev/themes/default/template/orders/_documents.tpl +++ b/admin-dev/themes/default/template/orders/_documents.tpl @@ -1,3 +1,28 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 9856 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} diff --git a/admin-dev/themes/default/template/orders/_new_product.tpl b/admin-dev/themes/default/template/orders/_new_product.tpl index 5ebeeaa75..e95ce7e8b 100644 --- a/admin-dev/themes/default/template/orders/_new_product.tpl +++ b/admin-dev/themes/default/template/orders/_new_product.tpl @@ -1,3 +1,28 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 9856 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*}
    diff --git a/controllers/admin/AdminAccountingExportController.php b/controllers/admin/AdminAccountingExportController.php index eec5f6957..08a73ba9e 100644 --- a/controllers/admin/AdminAccountingExportController.php +++ b/controllers/admin/AdminAccountingExportController.php @@ -58,14 +58,13 @@ class AdminAccountingExportControllerCore extends AdminController public function __construct() { $this->className = 'Accounting'; - - $this->pathAccountExportTpl = _PS_ADMIN_DIR_.'/themes/template/accounting_export/'; $this->content = ''; $this->downloadDir = _PS_ADMIN_DIR_.'/export/'; $this->exportSelected = 'global_export'; - + $this->initExportFieldList(); parent::__construct(); + $this->pathAccountExportTpl = 'accounting_export/'; } /** diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php index 8f63605cd..9eaba14db 100644 --- a/controllers/admin/AdminEmployeesController.php +++ b/controllers/admin/AdminEmployeesController.php @@ -121,7 +121,7 @@ class AdminEmployeesControllerCore extends AdminController $path = _PS_ADMIN_DIR_.'/themes/'; foreach (scandir($path) as $theme) - if (file_exists($path.$theme.'/admin.css')) + if (file_exists($path.$theme.'/css/admin.css')) $this->themes[] = $theme; $this->fields_form = array( diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php index b6dd37c4b..5a9da4aa5 100644 --- a/controllers/admin/AdminStatusesController.php +++ b/controllers/admin/AdminStatusesController.php @@ -173,7 +173,7 @@ class AdminStatusesControllerCore extends AdminController 'action' => self::$cache_lang['editaddresses'], )); - return $this->context->smarty->fetch(_PS_ADMIN_DIR_.'/themes/template/manufacturers/list_action_edit_adresses.tpl'); + return $this->context->smarty->fetch('manufacturers/list_action_edit_adresses.tpl'); } public function renderForm() diff --git a/modules/bankwire/bankwireController.php b/modules/bankwire/bankwireController.php index af112658b..44b534c34 100644 --- a/modules/bankwire/bankwireController.php +++ b/modules/bankwire/bankwireController.php @@ -1,13 +1,13 @@ * @copyright 2007-2011 PrestaShop SA * @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/cheque/chequeController.php b/modules/cheque/chequeController.php index 41a581371..fc51f4bb4 100644 --- a/modules/cheque/chequeController.php +++ b/modules/cheque/chequeController.php @@ -1,13 +1,13 @@ * @copyright 2007-2011 PrestaShop SA * @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/themes/default/lang/fr.php b/themes/default/lang/fr.php index 42e584258..91599afe6 100644 --- a/themes/default/lang/fr.php +++ b/themes/default/lang/fr.php @@ -26,9 +26,9 @@ $_LANG['address_57d056ed0984166336b7879c2af3657f'] = 'Ville'; $_LANG['address_59716c97497eb9694541f7c3d37b1a4d'] = 'Pays'; $_LANG['address_46a2a41cc6e552044816a2d04634545d'] = 'Etat'; $_LANG['address_0f68b904e33d9ac04605aecc958bcf52'] = 'Informations supplémentaires'; -$_LANG['address_39916f579f264041641c122e68e545d5'] = 'Vous devez enregistrer au moins un numéro de téléphone'; $_LANG['address_fe66abce284ec8589e7d791185b5c442'] = 'Téléphone domicile'; $_LANG['address_41c2fff4867cc204120f001e7af20f7a'] = 'Téléphone portable'; +$_LANG['address_39916f579f264041641c122e68e545d5'] = 'Vous devez enregistrer au moins un numéro de téléphone'; $_LANG['address_6c1c4d5a22e3d6ed8385e7287233396f'] = 'Donnez un titre à cette adresse pour la retrouver plus facilement'; $_LANG['address_ae7bdef7fe2bbbbf02c11e92c5fceb40'] = 'Mon adresse'; $_LANG['address_c9cc8cce247e49bae79f15173ce97354'] = 'Valider'; @@ -102,9 +102,9 @@ $_LANG['authentication_6a1fdb6502fefe71937a62c4d03a810e'] = 'Numéro dans la rue $_LANG['authentication_846a54955f32846032981f8fe48c35ff'] = 'Adresse (2)'; $_LANG['authentication_092daa39d2b825e4a7fe9b31c2080ecb'] = 'Appartement, suite, l\'unité, bâtiment, étage, etc'; $_LANG['authentication_0f68b904e33d9ac04605aecc958bcf52'] = 'Informations complémentaires'; -$_LANG['authentication_39916f579f264041641c122e68e545d5'] = 'Vous devez enregistrer au moins un numéro de téléphone'; $_LANG['authentication_fe66abce284ec8589e7d791185b5c442'] = 'Téléphone domicile'; $_LANG['authentication_41c2fff4867cc204120f001e7af20f7a'] = 'Téléphone portable'; +$_LANG['authentication_39916f579f264041641c122e68e545d5'] = 'Vous devez enregistrer au moins un numéro de téléphone'; $_LANG['authentication_6c1c4d5a22e3d6ed8385e7287233396f'] = 'Donnez un titre à cette adresse pour la retrouver plus facilement'; $_LANG['authentication_0ba7583639a274c434bbe6ef797115a4'] = 'S\'inscrire'; $_LANG['best-sales_3cb29f0ccc5fd220a97df89dafe46290'] = 'Meilleures ventes'; @@ -338,6 +338,8 @@ $_LANG['order-carrier_1f87346a16cf80c372065de3c54c86d9'] = 'TTC'; $_LANG['order-carrier_21034ae6d01a83e702839a72ba8a77b0'] = 'HT'; $_LANG['order-carrier_c7ffdc38ef6b1ecee2c12c01aa7566b0'] = 'Il n\'y a pas de transporteurs disponibles pour certaines de vos adresses.'; $_LANG['order-carrier_8f90815af11493295587f91f571c2f95'] = 'Il n\'y a pas de transporteur disponible qui délivre à cette adresse.'; +$_LANG['order-carrier_21034ae6d01a83e702839a72ba8a77b0'] = 'HT'; +$_LANG['order-carrier_8f90815af11493295587f91f571c2f95'] = 'Il n\'y a pas de transporteur disponible qui délivre à cette adresse.'; $_LANG['order-carrier_0d9175fe89fb80d815e7d03698b6e83a'] = 'Cadeau'; $_LANG['order-carrier_ea3bd794dfeb4537c194ee43899516ed'] = 'Je souhaite que ma commande soit emballée dans un papier-cadeau.'; $_LANG['order-carrier_5c2dfd55fea1f5c6adef500fcb6403b4'] = 'Supp. de'; @@ -654,6 +656,7 @@ $_LANG['product_7dcd185f890fd28f69d1ed210292d77f'] = 'Fiche technique'; $_LANG['product_801ab24683a4a8c433c6eb40c48bcd9d'] = 'Télécharger'; $_LANG['product_98edb85b00d9527ad5acebe451b3fae6'] = 'Accessoires'; $_LANG['product_54c02ba7929b1fda4847991a45b58a48'] = 'Personnalisation'; +$_LANG['product_98edb85b00d9527ad5acebe451b3fae6'] = 'Accessoires'; $_LANG['product_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Plus'; $_LANG['product_4351cfebe4b61d8aa5efa1d020710005'] = 'Voir'; $_LANG['product_cb3c718c905f00adbb6735f55bfb38ef'] = 'Disponible avec différentes options'; diff --git a/themes/default/pdf/supply-order-footer.tpl b/themes/default/pdf/supply-order-footer.tpl index 5712f163c..5a7a1e6eb 100755 --- a/themes/default/pdf/supply-order-footer.tpl +++ b/themes/default/pdf/supply-order-footer.tpl @@ -3,10 +3,10 @@ * * NOTICE OF LICENSE * -* This source file is subject to the Open Software License (OSL 3.0) +* 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/osl-3.0.php +* 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. @@ -20,7 +20,7 @@ * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA * @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/themes/default/pdf/supply-order.tpl b/themes/default/pdf/supply-order.tpl index c343bbaad..63e74b7f3 100644 --- a/themes/default/pdf/supply-order.tpl +++ b/themes/default/pdf/supply-order.tpl @@ -3,10 +3,10 @@ * * NOTICE OF LICENSE * -* This source file is subject to the Open Software License (OSL 3.0) +* 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/osl-3.0.php +* 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. @@ -20,7 +20,7 @@ * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA * @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *}
    @@ -165,4 +165,4 @@
    - \ No newline at end of file +