From 6d46644cc4f5d9aaf7ad330e64908b9d342fab2f Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Wed, 16 Jan 2013 18:24:11 +0100
Subject: [PATCH] [-] BO : fixed bug #PSCFV-5601 - AddressFormat wrongly forbid
 the 'other' field from the Address to be part of the address format

---
 classes/AddressFormat.php                      | 1 -
 controllers/admin/AdminCountriesController.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/classes/AddressFormat.php b/classes/AddressFormat.php
index d97819c79..6c71581c3 100644
--- a/classes/AddressFormat.php
+++ b/classes/AddressFormat.php
@@ -61,7 +61,6 @@ class AddressFormatCore extends ObjectModel
 	public static $forbiddenPropertyList = array(
 		'deleted',
 		'date_add',
-		'other',
 		'alias',
 		'secure_key',
 		'note',
diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php
index 24047c491..ac8a01fae 100644
--- a/controllers/admin/AdminCountriesController.php
+++ b/controllers/admin/AdminCountriesController.php
@@ -442,7 +442,7 @@ class AdminCountriesControllerCore extends AdminController
 			$html .= '<li>
 				<a href="javascript:void(0);" onClick="displayAvailableFields(\''.$class_name.'\')">'.$class_name.'</a>';
 			foreach (AddressFormat::getValidateFields($class_name) as $name)
-				$fields[] = '<a style="color:#4B8;" href="javascript:void(0);" class="addPattern" id="'.$class_name.':'.$name.'">
+				$fields[] = '<a style="color:#4B8;" href="javascript:void(0);" class="addPattern" '.$name.' id="'.($class_name == 'Address' ? $name : $class_name.':'.$name).'">
 					'.$name.'</a>';
 			$html .= '
 				<div class="availableFieldsList" id="availableListFieldsFor_'.$class_name.'" style="width:300px;">