diff --git a/admin-dev/themes/template/address.tpl b/admin-dev/themes/template/address.tpl
index a2eadb41e..41e6d38a3 100644
--- a/admin-dev/themes/template/address.tpl
+++ b/admin-dev/themes/template/address.tpl
@@ -24,4 +24,4 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{$list}
\ No newline at end of file
+{$content}
\ No newline at end of file
diff --git a/admin-dev/themes/template/layout.tpl b/admin-dev/themes/template/layout.tpl
index 70eb4fae5..bc9ab21ac 100644
--- a/admin-dev/themes/template/layout.tpl
+++ b/admin-dev/themes/template/layout.tpl
@@ -71,6 +71,6 @@
 	</div>
 {/if}
 
-{$content}
+{$page}
 
 {include file='footer.tpl'}
diff --git a/classes/AdminController.php b/classes/AdminController.php
index 2f47d32f1..e3b8880fd 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -32,6 +32,8 @@ class AdminControllerCore extends Controller
 	/** @var string Security token */
 	public $token;
 
+	protected $_object;
+
 	/** @var string shop | group_shop */
 	public $shopLinkType;
 
@@ -80,7 +82,9 @@ class AdminControllerCore extends Controller
 	protected $noLink;
 	protected $specificConfirmDelete;
 	protected $colorOnBackground;
-
+	/** @string Action to perform : 'edit', 'view', 'add', ... */
+	protected $action;
+	protected $_includeContainer = true;
 
 	public function __construct()
 	{
@@ -97,6 +101,7 @@ class AdminControllerCore extends Controller
 			$controller = substr($controller,0,-10);
 
 		parent::__construct();
+
 		// if this->template is empty,
 		// generate the filename from the classname, without "Controller" suffix
 		if (empty($this->template))
@@ -127,6 +132,8 @@ class AdminControllerCore extends Controller
 		);
 		if (!$this->identifier) $this->identifier = 'id_'.$this->table;
 		if (!$this->_defaultOrderBy) $this->_defaultOrderBy = $this->identifier;
+		$this->tabAccess = Profile::getProfileAccess($this->context->employee->id_profile, $this->id);
+
 		// Fix for AdminHome
 		if ($controller == 'AdminHome')
 			$_POST['token'] = $this->token;
@@ -387,7 +394,6 @@ class AdminControllerCore extends Controller
 						{
 							$object = new $this->className();
 							$this->copyFromPost($object, $this->table);
-	//					d($object);
 							if (!$object->add())
 								$this->_errors[] = Tools::displayError('An error occurred while creating object.').' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>';
 							elseif (($_POST[$this->identifier] = $object->id /* voluntary */) AND $this->postImage($object->id) AND !sizeof($this->_errors) AND $this->_redirect)
@@ -516,6 +522,77 @@ class AdminControllerCore extends Controller
 		}
 	}
 
+	/**
+	 * Display form
+	 */
+	public function displayForm($firstCall = true)
+	{
+		$content = '';
+		$allowEmployeeFormLang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
+		if ($allowEmployeeFormLang && !$this->context->cookie->employee_form_lang)
+			$this->context->cookie->employee_form_lang = (int)(Configuration::get('PS_LANG_DEFAULT'));
+		$useLangFromCookie = false;
+		$this->_languages = Language::getLanguages(false);
+		if ($allowEmployeeFormLang)
+			foreach ($this->_languages AS $lang)
+				if ($this->context->cookie->employee_form_lang == $lang['id_lang'])
+					$useLangFromCookie = true;
+		if (!$useLangFromCookie)
+			$this->_defaultFormLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
+		else
+			$this->_defaultFormLanguage = (int)($this->context->cookie->employee_form_lang);
+
+		// Only if it is the first call to displayForm, otherwise it has already been defined
+		if ($firstCall)
+		{
+			$content .='
+			<script type="text/javascript">
+				$(document).ready(function() {
+					id_language = '.$this->_defaultFormLanguage.';
+					languages = new Array();';
+			foreach ($this->_languages AS $k => $language)
+				$content .= '
+					languages['.$k.'] = {
+						id_lang: '.(int)$language['id_lang'].',
+						iso_code: \''.$language['iso_code'].'\',
+						name: \''.htmlentities($language['name'], ENT_COMPAT, 'UTF-8').'\'
+					};';
+			$content .= '
+					displayFlags(languages, id_language, '.$allowEmployeeFormLang.');
+				});
+			</script>';
+		}
+		return $content;
+	}
+
+	/**
+	 * Load class object using identifier in $_GET (if possible)
+	 * otherwise return an empty object, or die
+	 *
+	 * @param boolean $opt Return an empty object if load fail
+	 * @return object
+	 */
+	protected function loadObject($opt = false)
+	{
+		if ($id = (int)(Tools::getValue($this->identifier)) AND Validate::isUnsignedId($id))
+		{
+			if (!$this->_object)
+				$this->_object = new $this->className($id);
+			if (Validate::isLoadedObject($this->_object))
+				return $this->_object;
+			$this->_errors[] = Tools::displayError('Object cannot be loaded (not found)');
+		}
+		elseif ($opt)
+		{
+			$this->_object = new $this->className();
+			return $this->_object;
+		}
+		else
+			$this->_errors[] = Tools::displayError('Object cannot be loaded (identifier missing or invalid)');
+
+		$this->displayErrors();
+	}
+
 	/**
 	 * Check if the token is valid, else display a warning page
 	 */
@@ -562,8 +639,7 @@ class AdminControllerCore extends Controller
 	}
 	public function display()
 	{
-		if(!empty($this->content))
-			$this->context->smarty->assign('content', $this->content);
+		$this->context->smarty->assign('content', $this->content);
 
 		$this->context->smarty->assign('meta_title',$this->meta_title);
 
@@ -574,24 +650,23 @@ class AdminControllerCore extends Controller
 			$default_tpl = substr($class_name,0,-10).'.tpl';
 			if (file_exists($this->context->smarty->template_dir.'/'.$default_tpl))
 			{
-				$this->template = $default_tpl;
+				$this->template = $default_tpladdress;
 			}
 			else
 				$this->template = 'content.tpl';
 		}
 		else
-			$content = $this->context->smarty->fetch($this->template);
+			$page = $this->context->smarty->fetch($this->template);
 
 		if ($this->content_only)
-			echo $content;
+			echo $page;
 		else
 		{
 			$this->context->smarty->assign('warnings',$this->warnings);
-			$content = $this->context->smarty->fetch($this->template);
-
+			$page = $this->context->smarty->fetch($this->template);
 		}
 
-		$this->context->smarty->assign('content',$content);
+		$this->context->smarty->assign('page', $page);
 		$this->context->smarty->display($this->layout);
 	}
 
@@ -764,6 +839,41 @@ class AdminControllerCore extends Controller
 	 */
 	public function initContent()
 	{
+		if ($this->_errors)
+			$this->content = $this->displayErrors();
+		else
+		{
+			if ($this->action == 'edit' && $this->id_entity)
+			{
+				$this->content .= $this->displayForm();
+				if ($this->tabAccess['view']){
+					if (Tools::getValue('back'))
+						$this->context->smarty->assign('back', Tools::safeOutput(Tools::getValue('back')));
+					else
+						$this->context->smarty->assign('back', Tools::safeOutput(Tools::getValue(self::$currentIndex.'&token='.$this->token)));
+				}
+				// move to form.tpl
+				$this->content .= '<br /><br /><a href="'.((Tools::getValue('back')) ? Tools::getValue('back') : self::$currentIndex.'&token='.$this->token).'"><img src="../img/admin/arrow2.gif" /> '.((Tools::getValue('back')) ? $this->l('Back') : $this->l('Back to list')).'</a><br />';
+			}
+			elseif ($this->action == 'list')
+			{
+				$this->getList($this->context->language->id);
+
+				$helper = new HelperList();
+				$helper->view = $this->view;
+				$helper->edit = $this->edit;
+				$helper->delete = $this->delete;
+				$helper->duplicate = $this->duplicate;
+				$helper::$currentIndex = self::$currentIndex;
+				$helper->table = $this->table;
+				$helper->shopLink = $this->shopLink;
+				$helper->shopLinkType = $this->shopLinkType;
+				$helper->identifier = $this->identifier;
+				$helper->token = $this->token;
+				$this->content .= $helper->generateList($this->_list, $this->fieldsDisplay);
+			}
+		}
+
 	}
 
 	/**
@@ -916,11 +1026,52 @@ class AdminControllerCore extends Controller
 				}
 				elseif (strncmp($key, $this->table.'OrderBy', 7) === 0 OR strncmp($key, $this->table.'Orderway', 12) === 0)
 					$this->context->cookie->$key = $value;
+
+		// Code from postProcess
+		if (isset($_GET['update'.$this->table]) && isset($_GET['id_'.$this->table]))
+		{
+			if ($this->tabAccess['edit'] === '1' OR ($this->table == 'employee' AND $this->context->employee->id == Tools::getValue('id_employee')))
+			{
+				$this->action = 'edit';
+				$this->id_entity = (int)$_GET['id_'.$this->table];
+			}
+			else
+				$this->_errors[] = Tools::displayError('You do not have permission to edit here.');
+		}
 	}
 
+	/**
+	 * Display errors
+	 */
 	public function displayErrors()
 	{
-		p($this->_errors);
+		if ($nbErrors = count($this->_errors) AND $this->_includeContainer)
+		{
+			$content = '<script type="text/javascript">
+				$(document).ready(function() {
+					$(\'#hideError\').unbind(\'click\').click(function(){
+						$(\'.error\').hide(\'slow\', function (){
+							$(\'.error\').remove();
+						});
+						return false;
+					});
+				});
+			  </script>
+			<div class="error"><span style="float:right"><a id="hideError" href=""><img alt="X" src="../img/admin/close.png" /></a></span><img src="../img/admin/error2.png" />';
+			if (count($this->_errors) == 1)
+				$content .= $this->_errors[0];
+			else
+			{
+				$content .= $nbErrors.' '.$this->l('errors').'<br /><ol>';
+				foreach ($this->_errors AS $error)
+					$content .= '<li>'.$error.'</li>';
+				$content .= '</ol>';
+			}
+			$content .= '</div>';
+		}
+		// @TODO includesubtab
+		$this->includeSubTab('displayErrors');
+		return $content;
 	}
 
 	/**
@@ -1027,4 +1178,214 @@ class AdminControllerCore extends Controller
 		$this->_list = Db::getInstance()->ExecuteS($sql);
 		$this->_listTotal = Db::getInstance()->getValue('SELECT FOUND_ROWS() AS `'._DB_PREFIX_.$this->table.'`');
 	}
+
+	/**
+	 * Return field value if possible (both classical and multilingual fields)
+	 *
+	 * Case 1 : Return value if present in $_POST / $_GET
+	 * Case 2 : Return object value
+	 *
+	 * @param object $obj Object
+	 * @param string $key Field name
+	 * @param integer $id_lang Language id (optional)
+	 * @return string
+	 */
+	protected function getFieldValue($obj, $key, $id_lang = NULL)
+	{
+		if ($id_lang)
+			$defaultValue = ($obj->id AND isset($obj->{$key}[$id_lang])) ? $obj->{$key}[$id_lang] : '';
+		else
+			$defaultValue = isset($obj->{$key}) ? $obj->{$key} : '';
+
+		return Tools::getValue($key.($id_lang ? '_'.$id_lang : ''), $defaultValue);
+	}
+
+	/**
+	 * Manage page display (form, list...)
+	 *
+	 * @param string $className Allow to validate a different class than the current one
+	 */
+	public function validateRules($className = false)
+	{
+		if (!$className)
+			$className = $this->className;
+
+		/* Class specific validation rules */
+		$rules = call_user_func(array($className, 'getValidationRules'), $className);
+
+		if ((sizeof($rules['requiredLang']) OR sizeof($rules['sizeLang']) OR sizeof($rules['validateLang'])))
+		{
+			/* Language() instance determined by default language */
+			$defaultLanguage = new Language((int)(Configuration::get('PS_LANG_DEFAULT')));
+
+			/* All availables languages */
+			$languages = Language::getLanguages(false);
+		}
+
+		/* Checking for required fields */
+		foreach ($rules['required'] AS $field)
+			if (($value = Tools::getValue($field)) == false AND (string)$value != '0')
+				if (!Tools::getValue($this->identifier) OR ($field != 'passwd' AND $field != 'no-picture'))
+					$this->_errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), $field, $className).'</b> '.$this->l('is required');
+
+		/* Checking for multilingual required fields */
+		foreach ($rules['requiredLang'] AS $fieldLang)
+			if (($empty = Tools::getValue($fieldLang.'_'.$defaultLanguage->id)) === false OR $empty !== '0' AND empty($empty))
+				$this->_errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), $fieldLang, $className).'</b> '.$this->l('is required at least in').' '.$defaultLanguage->name;
+
+		/* Checking for maximum fields sizes */
+		foreach ($rules['size'] AS $field => $maxLength)
+			if (Tools::getValue($field) !== false AND Tools::strlen(Tools::getValue($field)) > $maxLength)
+				$this->_errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), $field, $className).'</b> '.$this->l('is too long').' ('.$maxLength.' '.$this->l('chars max').')';
+
+		/* Checking for maximum multilingual fields size */
+		foreach ($rules['sizeLang'] AS $fieldLang => $maxLength)
+			foreach ($languages AS $language)
+				if (Tools::getValue($fieldLang.'_'.$language['id_lang']) !== false AND Tools::strlen(Tools::getValue($fieldLang.'_'.$language['id_lang'])) > $maxLength)
+					$this->_errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), $fieldLang, $className).' ('.$language['name'].')</b> '.$this->l('is too long').' ('.$maxLength.' '.$this->l('chars max, html chars including').')';
+
+		/* Overload this method for custom checking */
+		$this->_childValidation();
+
+		/* Checking for fields validity */
+		foreach ($rules['validate'] AS $field => $function)
+			if (($value = Tools::getValue($field)) !== false AND ($field != 'passwd'))
+				if (!Validate::$function($value))
+					$this->_errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), $field, $className).'</b> '.$this->l('is invalid');
+
+		/* Checking for passwd_old validity */
+		if (($value = Tools::getValue('passwd')) != false)
+		{
+			if ($className == 'Employee' AND !Validate::isPasswdAdmin($value))
+				$this->_errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), 'passwd', $className).'</b> '.$this->l('is invalid');
+			elseif ($className == 'Customer' AND !Validate::isPasswd($value))
+				$this->_errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), 'passwd', $className).'</b> '.$this->l('is invalid');
+		}
+
+		/* Checking for multilingual fields validity */
+		foreach ($rules['validateLang'] AS $fieldLang => $function)
+			foreach ($languages AS $language)
+				if (($value = Tools::getValue($fieldLang.'_'.$language['id_lang'])) !== false AND !empty($value))
+					if (!Validate::$function($value))
+						$this->_errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), $fieldLang, $className).' ('.$language['name'].')</b> '.$this->l('is invalid');
+	}
+
+	/**
+	 * Overload this method for custom checking
+	 */
+	protected function _childValidation() { }
+
+	/**
+	 * Display object details
+	 */
+	public function viewDetails() {}
+
+	/**
+	 * Called before deletion
+	 *
+	 * @param object $object Object
+	 * @return boolean
+	 */
+	protected function beforeDelete($object) { return true; }
+
+	/**
+	 * Called before deletion
+	 *
+	 * @param object $object Object
+	 * @return boolean
+	 */
+	protected function afterDelete($object, $oldId) { return true; }
+
+	protected function afterAdd($object) { return true; }
+
+	protected function afterUpdate($object) { return true; }
+
+	/**
+	 * Check rights to view the current tab
+	 *
+	 * @return boolean
+	 */
+
+	protected function afterImageUpload() {
+		return true;
+	}
+
+	/**
+	 * Copy datas from $_POST to object
+	 *
+	 * @param object &$object Object
+	 * @param string $table Object table
+	 */
+	protected function copyFromPost(&$object, $table)
+	{
+		/* Classical fields */
+		foreach ($_POST AS $key => $value)
+			if (key_exists($key, $object) AND $key != 'id_'.$table)
+			{
+				/* Do not take care of password field if empty */
+				if ($key == 'passwd' AND Tools::getValue('id_'.$table) AND empty($value))
+					continue;
+				/* Automatically encrypt password in MD5 */
+				if ($key == 'passwd' AND !empty($value))
+					$value = Tools::encrypt($value);
+				$object->{$key} = $value;
+			}
+
+		/* Multilingual fields */
+		$rules = call_user_func(array(get_class($object), 'getValidationRules'), get_class($object));
+		if (sizeof($rules['validateLang']))
+		{
+			$languages = Language::getLanguages(false);
+			foreach ($languages AS $language)
+				foreach (array_keys($rules['validateLang']) AS $field)
+					if (isset($_POST[$field.'_'.(int)($language['id_lang'])]))
+						$object->{$field}[(int)($language['id_lang'])] = $_POST[$field.'_'.(int)($language['id_lang'])];
+		}
+	}
+
+	protected function updateAssoShop($id_object = false)
+	{
+		if (!Shop::isMultiShopActivated())
+			return ;
+
+		$shopAsso = Shop::getAssoTables();
+		$groupShopAsso = GroupShop::getAssoTables();
+		if (isset($shopAsso[$this->table]) && $shopAsso[$this->table]['type'] == 'shop')
+			$type = 'shop';
+		else if (isset($groupShopAsso[$this->table]) && $groupShopAsso[$this->table]['type'] == 'group_shop')
+			$type = 'group_shop';
+		else
+			return ;
+
+		$assos = array();
+		foreach ($_POST AS $k => $row)
+		{
+			if (!preg_match('/^checkBox'.Tools::toCamelCase($type, true).'Asso_'.$this->table.'_([0-9]+)?_([0-9]+)$/Ui', $k, $res))
+				continue;
+			$id_asso_object = (!empty($res[1]) ? $res[1] : $id_object);
+			$assos[] = array('id_object' => (int)$id_asso_object, 'id_'.$type => (int)$res[2]);
+		}
+
+		Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.$this->table.'_'.$type.($id_object ? ' WHERE `'.$this->identifier.'`='.(int)$id_object : ''));
+		foreach ($assos AS $asso)
+			Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.$this->table.'_'.$type.' (`'.pSQL($this->identifier).'`, id_'.$type.')
+											VALUES('.(int)$asso['id_object'].', '.(int)$asso['id_'.$type].')');
+	}
+
+	/**
+	 * Overload this method for custom checking
+	 *
+	 * @param integer $id Object id used for deleting images
+	 * @return boolean
+	 */
+	protected function postImage($id)
+	{
+		if (isset($this->fieldImageSettings['name']) AND isset($this->fieldImageSettings['dir']))
+			return $this->uploadImage($id, $this->fieldImageSettings['name'], $this->fieldImageSettings['dir'].'/');
+		elseif (!empty($this->fieldImageSettings))
+			foreach ($this->fieldImageSettings AS $image)
+				if (isset($image['name']) AND isset($image['dir']))
+					$this->uploadImage($id, $image['name'], $image['dir'].'/');
+		return !sizeof($this->_errors) ? true : false;
+	}
 }
diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php
index 2e8f80a5d..0d939212b 100644
--- a/controllers/admin/AdminAddressesController.php
+++ b/controllers/admin/AdminAddressesController.php
@@ -157,6 +157,9 @@ class AdminAddressesControllerCore extends AdminController
 			else
 				Tools::redirectAdmin(Tools::getValue('back').'&conf=4');
 		}
+
+		if (!isset($this->action))
+			$this->action = 'list';
 	}
 
 	public function getList($id_lang, $orderBy = NULL, $orderWay = NULL, $start = 0, $limit = NULL, $id_lang_shop = NULL)
@@ -223,12 +226,12 @@ class AdminAddressesControllerCore extends AdminController
 
 	public function displayForm($isMainTab = true)
 	{
-		parent::displayForm();
+		$content = parent::displayForm();
 		if (!($obj = $this->loadObject(true)))
 			return;
 
-		echo '
-		<form action="'.$this->$currentIndex.'&submitAdd'.$this->table.'=1&token='.$this->token.'" method="post">
+		$content .= '
+		<form action="'.self::$currentIndex.'&submitAdd'.$this->table.'=1&token='.$this->token.'" method="post">
 		'.((int)($obj->id) ? '<input type="hidden" name="id_'.$this->table.'" value="'.(int)($obj->id).'" />' : '').'
 		'.(($id_order = (int)(Tools::getValue('id_order'))) ? '<input type="hidden" name="id_order" value="'.(int)($id_order).'" />' : '').'
 		'.(($address_type = (int)(Tools::getValue('address_type'))) ? '<input type="hidden" name="address_type" value="'.(int)($address_type).'" />' : '').'
@@ -238,17 +241,17 @@ class AdminAddressesControllerCore extends AdminController
 		switch ($this->addressType)
 		{
 			case 'manufacturer':
-				echo '<label>'.$this->l('Choose manufacturer').'</label>
+				$content .= '<label>'.$this->l('Choose manufacturer').'</label>
 				<div class="margin-form">';
 				$manufacturers = Manufacturer::getManufacturers();
-				echo '<select name="id_manufacturer">';
+				$content .= '<select name="id_manufacturer">';
 				if (!sizeof($manufacturers))
-					echo '<option value="0">'.$this->l('No manufacturer available').'&nbsp</option>';
+					$content .= '<option value="0">'.$this->l('No manufacturer available').'&nbsp</option>';
 				foreach ($manufacturers as $manufacturer)
-					echo '<option value="'.(int)($manufacturer['id_manufacturer']).'"'.($this->getFieldValue($obj, 'id_manufacturer') == $manufacturer['id_manufacturer'] ? ' selected="selected"' : '').'>'.$manufacturer['name'].'&nbsp</option>';
-				echo	'</select>';
-				echo '</div>';
-				echo '<input type="hidden" name="alias" value="manufacturer">';
+					$content .= '<option value="'.(int)($manufacturer['id_manufacturer']).'"'.($this->getFieldValue($obj, 'id_manufacturer') == $manufacturer['id_manufacturer'] ? ' selected="selected"' : '').'>'.$manufacturer['name'].'&nbsp</option>';
+				$content .=	'</select>';
+				$content .= '</div>';
+				$content .= '<input type="hidden" name="alias" value="manufacturer">';
 				break;
 			case 'customer':
 			default:
@@ -256,7 +259,7 @@ class AdminAddressesControllerCore extends AdminController
 				{
 					$customer = new Customer($obj->id_customer);
 					$tokenCustomer = Tools::getAdminToken('AdminCustomers'.(int)(Tab::getIdFromClassName('AdminCustomers')).(int)$this->context->employee->id);
-					echo '
+					$content .= '
 					<label>'.$this->l('Customer').'</label>
 					<div class="margin-form"><a style="display: block; padding-top: 4px;" href="?tab=AdminCustomers&id_customer='.$customer->id.'&viewcustomer&token='.$tokenCustomer.'">'.$customer->lastname.' '.$customer->firstname.' ('.$customer->email.')</a></div>
 					<input type="hidden" name="id_customer" value="'.$customer->id.'" />
@@ -264,20 +267,20 @@ class AdminAddressesControllerCore extends AdminController
 				}
 				else
 				{
-					echo
+					$content .=
 					'<label>'.$this->l('Customer e-mail').'</label>
 					<div class="margin-form">
 						<input type="text" size="33" name="email" value="'.htmlentities(Tools::getValue('email'), ENT_COMPAT, 'UTF-8').'" style="text-transform: lowercase;" /> <sup>*</sup>
 					</div>';
 				}
-				echo '
+				$content .= '
 					<label for="dni">'.$this->l('Identification Number').'</label>
 					<div class="margin-form">
 					<input type="text" name="dni" id="dni" value="'.htmlentities($this->getFieldValue($obj, 'dni'), ENT_COMPAT, 'UTF-8').'" />
 					<p>'.$this->l('DNI / NIF / NIE').'</p>
 					</div>';
 
-				echo '<label>'.$this->l('Alias').'</label>
+				$content .= '<label>'.$this->l('Alias').'</label>
 				<div class="margin-form">
 					<input type="text" size="33" name="alias" value="'.htmlentities($this->getFieldValue($obj, 'alias'), ENT_COMPAT, 'UTF-8').'" /> <sup>*</sup>
 					<span class="hint" name="help_box">'.$this->l('Invalid characters:').' <>;=#{}<span class="hint-pointer">&nbsp;</span></span>
@@ -296,20 +299,20 @@ class AdminAddressesControllerCore extends AdminController
 			{
 				if ($this->addressType != 'manufacturer')
 				{
-					echo '<label>'.$this->l('Company').'</label>
+					$content .= '<label>'.$this->l('Company').'</label>
 						<div class="margin-form">
 						<input type="text" size="33" name="company" value="'.htmlentities($this->getFieldValue($obj, 'company'), ENT_COMPAT, 'UTF-8').'" />
 						<span class="hint" name="help_box">'.$this->l('Invalid characters:').' <>;=#{}<span class="hint-pointer">&nbsp;</span></span>
 						</div>';
 
 					if ((Configuration::get('VATNUMBER_MANAGEMENT') AND file_exists(_PS_MODULE_DIR_.'vatnumber/vatnumber.php')) && VatNumber::isApplicable(Configuration::get('PS_COUNTRY_DEFAULT')))
-						echo '<div id="vat_area" style="display: visible">';
+						$content .= '<div id="vat_area" style="display: visible">';
 					else if(Configuration::get('VATNUMBER_MANAGEMENT'))
-						echo '<div id="vat_area" style="display: hidden">';
+						$content .= '<div id="vat_area" style="display: hidden">';
 					else
-						echo'<div style="display: none;">';
+						$content .='<div style="display: none;">';
 
-					echo '<label>'.$this->l('VAT number').'</label>
+					$content .= '<label>'.$this->l('VAT number').'</label>
 						<div class="margin-form">
 						<input type="text" size="33" name="vat_number" value="'.htmlentities($this->getFieldValue($obj, 'vat_number'), ENT_COMPAT, 'UTF-8').'" />
 						</div>
@@ -318,7 +321,7 @@ class AdminAddressesControllerCore extends AdminController
 			}
 			elseif ($addr_field_item == 'lastname')
 			{
-				echo '
+				$content .= '
 					<label>'.$this->l('Last name').'</label>
 					<div class="margin-form">
 					<input type="text" size="33" name="lastname" value="'.htmlentities($this->getFieldValue($obj, 'lastname'), ENT_COMPAT, 'UTF-8').'" /> <sup>*</sup>
@@ -328,7 +331,7 @@ class AdminAddressesControllerCore extends AdminController
 			elseif ($addr_field_item == 'firstname')
 			{
 
-				echo '
+				$content .= '
 					<label>'.$this->l('First name').'</label>
 					<div class="margin-form">
 					<input type="text" size="33" name="firstname" value="'.htmlentities($this->getFieldValue($obj, 'firstname'), ENT_COMPAT, 'UTF-8').'" /> <sup>*</sup>
@@ -338,7 +341,7 @@ class AdminAddressesControllerCore extends AdminController
 			elseif ($addr_field_item == 'address1')
 			{
 
-				echo '
+				$content .= '
 					<label>'.$this->l('Address').'</label>
 					<div class="margin-form">
 					<input type="text" size="33" name="address1" value="'.htmlentities($this->getFieldValue($obj, 'address1'), ENT_COMPAT, 'UTF-8').'" /> <sup>*</sup>
@@ -347,7 +350,7 @@ class AdminAddressesControllerCore extends AdminController
 			elseif ($addr_field_item == 'address2')
 			{
 
-				echo '
+				$content .= '
 					<label>'.$this->l('Address').' (2)</label>
 									     <div class="margin-form">
 												      <input type="text" size="33" name="address2" value="'.htmlentities($this->getFieldValue($obj, 'address2'), ENT_COMPAT, 'UTF-8').'" />
@@ -356,7 +359,7 @@ class AdminAddressesControllerCore extends AdminController
 			elseif ($addr_field_item == 'postcode')
 			{
 
-				echo '
+				$content .= '
 					<label>'.$this->l('Postcode/ Zip Code').'</label>
 					<div class="margin-form">
 					<input type="text" size="33" name="postcode" value="'.htmlentities($this->getFieldValue($obj, 'postcode'), ENT_COMPAT, 'UTF-8').'" />
@@ -365,7 +368,7 @@ class AdminAddressesControllerCore extends AdminController
 			elseif ($addr_field_item == 'city')
 			{
 
-				echo '
+				$content .= '
 					<label>'.$this->l('City').'</label>
 					<div class="margin-form">
 					<input type="text" size="33" name="city" value="'.htmlentities($this->getFieldValue($obj, 'city'), ENT_COMPAT, 'UTF-8').'" style="text-transform: uppercase;" /> <sup>*</sup>
@@ -374,18 +377,18 @@ class AdminAddressesControllerCore extends AdminController
 			elseif ($addr_field_item == 'country' || $addr_field_item == 'Country:name')
 			{
 
-				echo '
+				$content .= '
 					<label>'.$this->l('Country').'</label>
 					<div class="margin-form">
 					<select name="id_country" id="id_country" />';
 				$selectedCountry = $this->getFieldValue($obj, 'id_country');
 				foreach ($this->countriesArray AS $id_country => $name)
-					echo '		<option value="'.$id_country.'"'.((!$selectedCountry AND Configuration::get('PS_COUNTRY_DEFAULT') == $id_country) ? ' selected="selected"' : ($selectedCountry == $id_country ? ' selected="selected"' : '')).'>'.$name.'</option>';
-				echo '		</select> <sup>*</sup>
+					$content .= '		<option value="'.$id_country.'"'.((!$selectedCountry AND Configuration::get('PS_COUNTRY_DEFAULT') == $id_country) ? ' selected="selected"' : ($selectedCountry == $id_country ? ' selected="selected"' : '')).'>'.$name.'</option>';
+				$content .= '		</select> <sup>*</sup>
 					</div>';
 
 
-			echo '
+			$content .= '
 				<div id="contains_states" '.(!Country::containsStates((int)$selectedCountry) ? 'style="display:none;"' : '').'>
 				<label>'.$this->l('State').'</label>
 				<div class="margin-form">
@@ -398,7 +401,7 @@ class AdminAddressesControllerCore extends AdminController
 
 				$id_country_ajax = (int)$this->getFieldValue($obj, 'id_country');
 
-				echo '
+				$content .= '
 					<script type="text/javascript">
 					$(document).ready(function(){
 							ajaxStates ();
@@ -427,7 +430,7 @@ class AdminAddressesControllerCore extends AdminController
 										}
 									}); ';
 		if (file_exists(_PS_MODULE_DIR_.'vatnumber/ajax.php'))
-			echo '	$.ajax({
+			$content .= '	$.ajax({
 					type: "GET",
 					url: "'._MODULE_DIR_.'vatnumber/ajax.php?id_country="+$(\'#id_country\').val(),
 					success: function(isApplicable)
@@ -438,38 +441,40 @@ class AdminAddressesControllerCore extends AdminController
 								$(\'#vat_area\').hide();
 						}
 					});';
-		echo '	}; }); </script>';
+		$content .= '	}; }); </script>';
 		}
 
 	} // End foreach
-			echo '
+			$content .= '
 				<label>'.$this->l('Home phone').'</label>
 				<div class="margin-form">
 					<input type="text" size="33" name="phone" value="'.htmlentities($this->getFieldValue($obj, 'phone'), ENT_COMPAT, 'UTF-8').'" />
 				</div>';
 
-			echo '
+			$content .= '
 				<label>'.$this->l('Mobile phone').'</label>
 				<div class="margin-form">
 					<input type="text" size="33" name="phone_mobile" value="'.htmlentities($this->getFieldValue($obj, 'phone_mobile'), ENT_COMPAT, 'UTF-8').'" />
 				</div>';
 
 
-			echo '
+			$content .= '
 				<label>'.$this->l('Other').'</label>
 				<div class="margin-form">
 					<textarea name="other" cols="36" rows="4">'.htmlentities($this->getFieldValue($obj, 'other'), ENT_COMPAT, 'UTF-8').'</textarea>
 					<span class="hint" name="help_box">'.$this->l('Forbidden characters:').' <>;=#{}<span class="hint-pointer">&nbsp;</span></span>
 				</div>';
 
-			echo '
+			$content .= '
 				<div class="margin-form">
 					<input type="submit" value="'.$this->l('   Save   ').'" name="submitAdd'.$this->table.'" class="button" />
 				</div>
 				<div class="small"><sup>*</sup> '.$this->l('Required field').'</div>
 			</fieldset>';
-		echo '
+		$content .= '
 		</form>';
+
+		return $content;
 	}
 
 	protected function processAddressFormat()
@@ -501,7 +506,7 @@ class AdminAddressesControllerCore extends AdminController
 		return $out;
 	}
 
-	public function display()
+	/*public function initContent()
 	{
 		$this->getList($this->context->language->id);
 
@@ -515,9 +520,8 @@ class AdminAddressesControllerCore extends AdminController
 		$helper->identifier = $this->identifier;
 		$helper->token = $this->token;
 		$this->context->smarty->assign(array('list' => $helper->generateList($this->_list, $this->fieldsDisplay)));
+	}*/
 
-		parent::display();
-	}
 }