From 4d2a15d74ad8fac9fe98322af09384d457a8402d Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Tue, 16 Oct 2012 09:58:13 +0000
Subject: [PATCH] [-] FO : fixed bug #PSCFV-4702

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17871 b9a71923-0436-4b27-9f14-aed3839534dd
---
 controllers/front/AddressController.php | 1 +
 controllers/front/AuthController.php    | 1 +
 themes/default/address.tpl              | 4 +++-
 themes/default/authentication.tpl       | 6 ++++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php
index a5a0b4573..eac11a436 100644
--- a/controllers/front/AddressController.php
+++ b/controllers/front/AddressController.php
@@ -264,6 +264,7 @@ class AddressControllerCore extends FrontController
 
 		// Assign common vars
 		$this->context->smarty->assign(array(
+			'onr_phone_at_least' => (int)Configuration::get('PS_ONE_PHONE_AT_LEAST'),
 			'ajaxurl' => _MODULE_DIR_,
 			'errors' => $this->errors,
 			'token' => Tools::getToken(false),
diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index e80b6eafc..cc9c5249e 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -167,6 +167,7 @@ class AuthControllerCore extends FrontController
 		$days = Tools::dateDays();
 
 		$this->context->smarty->assign(array(
+				'onr_phone_at_least' => (int)Configuration::get('PS_ONE_PHONE_AT_LEAST'),
 				'years' => $years,
 				'sl_year' => (isset($selectedYears) ? $selectedYears : 0),
 				'months' => $months,
diff --git a/themes/default/address.tpl b/themes/default/address.tpl
index 319512c28..b881fd72d 100644
--- a/themes/default/address.tpl
+++ b/themes/default/address.tpl
@@ -215,7 +215,9 @@ $(function(){ldelim}
 			<label for="other">{l s='Additional information'}</label>
 			<textarea id="other" name="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{else}{if isset($address->other)}{$address->other}{/if}{/if}</textarea>
 		</p>
-		<p class="inline-infos required">{l s='You must register at least one phone number'} <sup class="required">*</sup></p>
+		{if $onr_phone_at_least}
+			<p class="inline-infos required">{l s='You must register at least one phone number'} <sup class="required">*</sup></p>
+		{/if}
 		<p class="text">
 			<label for="phone">{l s='Home phone'}</label>
 			<input type="text" id="phone" name="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{else}{if isset($address->phone)}{$address->phone}{/if}{/if}" />
diff --git a/themes/default/authentication.tpl b/themes/default/authentication.tpl
index abcea54a3..85da8a72b 100644
--- a/themes/default/authentication.tpl
+++ b/themes/default/authentication.tpl
@@ -546,13 +546,15 @@ $(function(){ldelim}
 			<label for="other">{l s='Additional information'}</label>
 			<textarea name="other" id="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{/if}</textarea>
 		</p>
-		<p class="inline-infos">{l s='You must register at least one phone number'}</p>
+		{if $onr_phone_at_least}
+			<p class="inline-infos">{l s='You must register at least one phone number'}</p>
+		{/if}
 		<p class="text">
 			<label for="phone">{l s='Home phone'}</label>
 			<input type="text" class="text" name="phone" id="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{/if}" />
 		</p>
 		<p class="text">
-			<label for="phone_mobile">{l s='Mobile phone'} <sup>*</sup></label>
+			<label for="phone_mobile">{l s='Mobile phone'} {if $onr_phone_at_least}<sup>*</sup>{/if}</label>
 			<input type="text" class="text" name="phone_mobile" id="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{/if}" />
 		</p>
 		<p class="required text" id="address_alias">