From 05305ab8214865ae2d3d8fa455139a742a52a77d Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Thu, 23 Aug 2012 08:49:33 +0000
Subject: [PATCH] // Fix addresses format

---
 classes/AddressFormat.php               | 2 +-
 install-dev/data/xml/address_format.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/AddressFormat.php b/classes/AddressFormat.php
index 74ac2b9cd..4132b41c2 100644
--- a/classes/AddressFormat.php
+++ b/classes/AddressFormat.php
@@ -45,7 +45,7 @@ class AddressFormatCore extends ObjectModel
 		'table' => 'address_format',
 		'primary' => 'id_country',
 		'fields' => array(
-			'format' => 	array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true),
+			'format' => 	array('type' => self::TYPE_HTML, 'validate' => 'isGenericName', 'required' => true),
 			'id_country' => array('type' => self::TYPE_INT),
 		),
 	);
diff --git a/install-dev/data/xml/address_format.xml b/install-dev/data/xml/address_format.xml
index 92fd69c14..466bb5720 100644
--- a/install-dev/data/xml/address_format.xml
+++ b/install-dev/data/xml/address_format.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_address_format>
-  <fields primary="id_country">
+  <fields primary="id_country" class="AddressFormat">
     <field name="id_country" relation="country"/>
     <field name="format"/>
   </fields>