diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php
index 1b2e3b520..f171ff0f1 100644
--- a/admin-dev/ajax.php
+++ b/admin-dev/ajax.php
@@ -193,10 +193,8 @@ if ($step = (int)(Tools::getValue('ajaxProductTab')))
 
 if (Tools::isSubmit('getAvailableFields') AND Tools::isSubmit('entity'))
 {
-	AdminTab::$currentIndex = 'index.php?tab=AdminImport';
 	$jsonArray = array();
-	require_once(dirname(__FILE__).'/tabs/AdminImport.php');
-	$import = new AdminImport();
+	$import = new AdminImportController();
 
 	$languages = Language::getLanguages(false);
 	$defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
diff --git a/admin-dev/tabs/AdminImport.php b/admin-dev/tabs/AdminImport.php
deleted file mode 100644
index 5720b258f..000000000
--- a/admin-dev/tabs/AdminImport.php
+++ /dev/null
@@ -1,1867 +0,0 @@
-<?php
-/*
-* 2007-2011 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 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
-* 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 <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 7310 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-include_once(_PS_ADMIN_DIR_.'/../images.inc.php');
-@ini_set('max_execution_time', 0);
-// No max line limit since the lines can be more than 4096. Performance impact is not significant.
-define('MAX_LINE_SIZE', 0);
-
-define('UNFRIENDLY_ERROR', false); // Used for validatefields diying without user friendly error or not
-
-// this value set the number of columns visible on each page
-define('MAX_COLUMNS', 6);
-// correct Mac error on eof
-@ini_set('auto_detect_line_endings', '1');
-
-class AdminImport extends AdminTab
-{
-	public static $column_mask;
-
-	public $entities = array();
-
-	public $available_fields = array();
-
-	public static $required_fields = array('name');
-
-	public static $default_values = array();
-
-	public $_warnings = array();
-
-	public static $validators = array(
-		'active' => array('AdminImport', 'getBoolean'),
-		'tax_rate' => array('AdminImport', 'getPrice'),
-		'price_tex' => array('AdminImport', 'getPrice'), // Tax excluded
-		'price_tin' => array('AdminImport', 'getPrice'), // Tax included
-		'reduction_price' => array('AdminImport', 'getPrice'),
-		'reduction_percent' => array('AdminImport', 'getPrice'),
-		'wholesale_price' => array('AdminImport', 'getPrice'),
-		'ecotax' => array('AdminImport', 'getPrice'),
-		'name' => array('AdminImport', 'createMultiLangField'),
-		'description' => array('AdminImport', 'createMultiLangField'),
-		'description_short' => array('AdminImport', 'createMultiLangField'),
-		'meta_title' => array('AdminImport', 'createMultiLangField'),
-		'meta_keywords' => array('AdminImport', 'createMultiLangField'),
-		'meta_description' => array('AdminImport', 'createMultiLangField'),
-		'link_rewrite' => array('AdminImport', 'createMultiLangField'),
-		'available_now' => array('AdminImport', 'createMultiLangField'),
-		'available_later' => array('AdminImport', 'createMultiLangField'),
-		'category' => array('AdminImport', 'split'),
-		'online_only' => array('AdminImport', 'getBoolean')
-		);
-
-	public function __construct()
-	{
-		$this->entities = array_flip(array($this->l('Categories'), $this->l('Products'), $this->l('Combinations'), $this->l('Customers'), $this->l('Addresses'), $this->l('Manufacturers'), $this->l('Suppliers')));
-
-		switch ((int)(Tools::getValue('entity')))
-		{
-			case $this->entities[$this->l('Combinations')]:
-				self::$required_fields = array('id_product', 'group', 'attribute');
-				$this->available_fields = array(
-					'no' => array('label' => $this->l('Ignore this column')),
-					'id_product' => array('label' => $this->l('Product ID').'*'),
-					'group' => array('label' => $this->l('Group (Name:Position)').'*',
-						'help' => $this->l('Position of the group attribute.')),
-					'attribute' => array('label' => $this->l('Attribute (Value:Position)').'*',
-						'help' => $this->l('Position of the attribute in the attribute group.')),
-					'reference' => array('label' => $this->l('Reference')),
-					'supplier_reference' => array('label' => $this->l('Supplier reference')),
-					'ean13' => array('label' => $this->l('EAN13')),
-					'upc' => array('label' => $this->l('UPC')),
-					'wholesale_price' => array('label' => $this->l('Wholesale price')),
-					'price' => array('label' => $this->l('Price')),
-					'ecotax' => array('label' => $this->l('Ecotax')),
-					'quantity' => array('label' => $this->l('Quantity')),
-					'weight' => array('label' => $this->l('Weight')),
-					'default_on' => array('label' => $this->l('Default')),
-					'image_position' => array('label' => $this->l('Image position'),
-						'help' => $this->l('Position of the product image to use for this combination. If you use this field, leave image URL empty.')),
-					'image_url' => array('label' => $this->l('Image URL')),
-					'delete_existing_images' => array(
-											'label' => $this->l('Delete existing images (0 = no, 1 = yes)'),
-											'help' => $this->l('If you do not specify this column and you specify the column images, all images of the product will be replaced by those specified in the import file')),
-				);
-
-				self::$default_values = array(
-					'reference' => '',
-					'supplier_reference' => '',
-					'ean13' => '',
-					'upc' => '',
-					'wholesale_price' => 0,
-					'price' => 0,
-					'ecotax' => 0,
-					'quantity' => 0,
-					'weight' => 0,
-					'default_on' => 0
-				);
-			break;
-
-			case $this->entities[$this->l('Categories')]:
-				$this->available_fields = array(
-					'no' => array('label' => $this->l('Ignore this column')),
-					'id' => array('label' => $this->l('ID')),
-					'active' => array('label' => $this->l('Active (0/1)')),
-					'name' => array('label' => $this->l('Name *')),
-					'parent' => array('label' => $this->l('Parent category')),
-					'description' => array('label' => $this->l('Description')),
-					'meta_title' => array('label' => $this->l('Meta-title')),
-					'meta_keywords' => array('label' => $this->l('Meta-keywords')),
-					'meta_description' => array('label' => $this->l('Meta-description')),
-					'link_rewrite' => array('label' => $this->l('URL rewritten')),
-					'image' => array('label' => $this->l('Image URL')),
-				);
-
-				self::$default_values = array('active' => '1', 'parent' => '1', 'link_rewrite' => '');
-			break;
-
-			case $this->entities[$this->l('Products')]:
-				self::$validators['image'] = array('AdminImport', 'split');
-
-				$this->available_fields = array(
-					'no' => array('label' => $this->l('Ignore this column')),
-					'id' => array('label' => $this->l('ID')),
-					'active' => array('label' => $this->l('Active (0/1)')),
-					'name' => array('label' => $this->l('Name *')),
-					'category' => array('label' => $this->l('Categories (x,y,z...)')),
-					'price_tex' => array('label' => $this->l('Price tax excl.')),
-					'price_tin' => array('label' => $this->l('Price tax incl.')),
-					'id_tax_rules_group' => array('label' => $this->l('Tax rules id')),
-					'wholesale_price' => array('label' => $this->l('Wholesale price')),
-					'on_sale' => array('label' => $this->l('On sale (0/1)')),
-					'reduction_price' => array('label' => $this->l('Discount amount')),
-					'reduction_percent' => array('label' => $this->l('Discount percent')),
-					'reduction_from' => array('label' => $this->l('Discount from (yyyy-mm-dd)')),
-					'reduction_to' => array('label' => $this->l('Discount to (yyyy-mm-dd)')),
-					'reference' => array('label' => $this->l('Reference #')),
-					'supplier_reference' => array('label' => $this->l('Supplier reference #')),
-					'supplier' => array('label' => $this->l('Supplier')),
-					'manufacturer' => array('label' => $this->l('Manufacturer')),
-					'ean13' => array('label' => $this->l('EAN13')),
-					'upc' => array('label' => $this->l('UPC')),
-					'ecotax' => array('label' => $this->l('Ecotax')),
-					'weight' => array('label' => $this->l('Weight')),
-					'quantity' => array('label' => $this->l('Quantity')),
-					'description_short' => array('label' => $this->l('Short description')),
-					'description' => array('label' => $this->l('Description')),
-					'tags' => array('label' => $this->l('Tags (x,y,z...)')),
-					'meta_title' => array('label' => $this->l('Meta-title')),
-					'meta_keywords' => array('label' => $this->l('Meta-keywords')),
-					'meta_description' => array('label' => $this->l('Meta-description')),
-					'link_rewrite' => array('label' => $this->l('URL rewritten')),
-					'available_now' => array('label' => $this->l('Text when in-stock')),
-					'available_later' => array('label' => $this->l('Text if back-order allowed')),
-				'available_for_order' => array('label' => $this->l('Available for order')),
-				'date_add' => array('label' => $this->l('Date add product')),
-				'show_price' => array('label' => $this->l('Show price')),
-					'image' => array('label' => $this->l('Image URLs (x,y,z...)')),
-					'delete_existing_images' => array(
-						'label' => $this->l('Delete existing images (0 = no, 1 = yes)'),
-						'help' => $this->l('If you do not specify this column and you specify the column images, all images of the product will be replaced by those specified in the import file')
-					),
-					'features' => array('label' => $this->l('Feature(Name:Value:Position)'),
-						'help' => $this->l('Position of the feature.')),
-					'online_only' => array('label' => $this->l('Only available online')),
-					'condition' => array('label' => $this->l('Condition')),
-					'shop' => array(
-						'label' => $this->l('ID / Name of shop'),
-						'help' => $this->l('Ignore this field if you don\'t use multishop tool. If you leave this field empty, default shop will be used'),
-					),
-				);
-
-				self::$default_values = array(
-					'id_category' => array(1),
-					'id_category_default' => 1,
-					'active' => '1',
-					'quantity' => 0,
-					'price' => 0,
-					'id_tax_rules_group' => 0,
-					'description_short' => array((int)(Configuration::get('PS_LANG_DEFAULT')) => ''),
-					'link_rewrite' => array((int)(Configuration::get('PS_LANG_DEFAULT')) => ''),
-					'online_only' => 0,
-					'condition' => 'new',
-					'shop' => Configuration::get('PS_SHOP_DEFAULT'),
-					'date_add' => date('Y-m-d H:i:s'),
-					'condition' => 'new',
-				);
-			break;
-
-			case $this->entities[$this->l('Customers')]:
-				//Overwrite required_fields AS only email is required whereas other entities
-				self::$required_fields = array('email', 'passwd', 'lastname', 'firstname');
-
-				$this->available_fields = array(
-					'no' => array('label' => $this->l('Ignore this column')),
-					'id' => array('label' => $this->l('ID')),
-					'active' => array('label' => $this->l('Active  (0/1)')),
-					'id_gender' => array('label' => $this->l('Gender ID (Mr = 1, Ms = 2, else 0)')),
-					'email' => array('label' => $this->l('E-mail *')),
-					'passwd' => array('label' => $this->l('Password *')),
-					'birthday' => array('label' => $this->l('Birthday (yyyy-mm-dd)')),
-					'lastname' => array('label' => $this->l('Lastname *')),
-					'firstname' => array('label' => $this->l('Firstname *')),
-					'newsletter' => array('label' => $this->l('Newsletter (0/1)')),
-					'optin' => array('label' => $this->l('Opt in (0/1)')),
-					'id_shop' => array(
-						'label' => $this->l('ID / Name of shop'),
-						'help' => $this->l('Ignore this field if you don\'t use multishop tool. If you leave this field empty, default shop will be used'),
-					),
-				);
-
-				self::$default_values = array(
-					'active' => '1',
-					'id_shop' => Configuration::get('PS_SHOP_DEFAULT'),
-				);
-			break;
-
-			case $this->entities[$this->l('Addresses')]:
-				//Overwrite required_fields
-				self::$required_fields = array('lastname', 'firstname', 'address1', 'postcode', 'country', 'city');
-
-				$this->available_fields = array(
-					'no' => array('label' => $this->l('Ignore this column')),
-					'id' => array('label' => $this->l('ID')),
-					'alias' => array('label' => $this->l('Alias *')),
-					'active' => array('label' => $this->l('Active  (0/1)')),
-					'customer_email' => array('label' => $this->l('Customer e-mail')),
-					'manufacturer' => array('label' => $this->l('Manufacturer')),
-					'supplier' => array('label' => $this->l('Supplier')),
-					'company' => array('label' => $this->l('Company')),
-					'lastname' => array('label' => $this->l('Lastname *')),
-					'firstname' => array('label' => $this->l('Firstname *')),
-					'address1' => array('label' => $this->l('Address 1 *')),
-					'address2' => array('label' => $this->l('Address 2')),
-					'postcode' => array('label' => $this->l('Postcode*/ Zipcode*')),
-					'city' => array('label' => $this->l('City *')),
-					'country' => array('label' => $this->l('Country *')),
-					'state' => array('label' => $this->l('State')),
-					'other' => array('label' => $this->l('Other')),
-					'phone' => array('label' => $this->l('Phone')),
-					'phone_mobile' => array('label' => $this->l('Mobile Phone')),
-					'vat_number' => array('label' => $this->l('VAT number')),
-				);
-
-				self::$default_values = array('alias' => 'Alias', 'postcode' => 'X');
-			break;
-
-			case $this->entities[$this->l('Manufacturers')]:
-			case $this->entities[$this->l('Suppliers')]:
-				//Overwrite validators AS name is not MultiLangField
-				self::$validators = array(
-					'description' => array('AdminImport', 'createMultiLangField'),
-					'description_short' => array('AdminImport', 'createMultiLangField'),
-					'meta_title' => array('AdminImport', 'createMultiLangField'),
-					'meta_keywords' => array('AdminImport', 'createMultiLangField'),
-					'meta_description' => array('AdminImport', 'createMultiLangField'),
-				);
-
-				$this->available_fields = array(
-					'no' => array('label' => $this->l('Ignore this column')),
-					'id' => array('label' => $this->l('ID')),
-					'active' => array('label' => $this->l('Active (0/1)')),
-					'name' => array('label' => $this->l('Name *')),
-					'description' => array('label' => $this->l('Description')),
-					'short_description' => array('label' => $this->l('Short description')),
-					'meta_title' => array('label' => $this->l('Meta-title')),
-					'meta_keywords' => array('label' => $this->l('Meta-keywords')),
-					'meta_description' => array('label' => $this->l('Meta-description')),
-					'shop' => array(
-						'label' => $this->l('ID / Name of group shop'),
-						'help' => $this->l('Ignore this field if you don\'t use multishop tool. If you leave this field empty, default shop will be used'),
-					),
-				);
-
-				self::$default_values = array(
-					'shop' => Shop::getGroupFromShop(Configuration::get('PS_SHOP_DEFAULT')),
-				);
-			break;
-		}
-		parent::__construct();
-	}
-
-	private static function rewindBomAware($handle)
-	{
-		// A rewind wrapper that skip BOM signature wrongly
-		rewind($handle);
-		if (($bom = fread($handle,3)) != "\xEF\xBB\xBF") {
-			rewind($handle);
-		}
-	}
-
-	private static function getBoolean($field)
-	{
-		return (boolean)$field;
-	}
-
-	private static function getPrice($field)
-	{
-		$field = ((float)(str_replace(',', '.', $field)));
-		$field = ((float)(str_replace('%', '', $field)));
-		return $field;
-	}
-
-	private static function split($field)
-	{
-		if (empty($field))
-			return array();
-		$separator = ((is_null(Tools::getValue('multiple_value_separator')) OR trim(Tools::getValue('multiple_value_separator')) == '' ) ? ',' : Tools::getValue('multiple_value_separator'));
-		$temp = tmpfile();
-		fwrite($temp,$field);
-		rewind($temp);
-		$tab = fgetcsv($temp, MAX_LINE_SIZE, $separator);
-		fclose($temp);
-		if (empty($tab) || (!is_array($tab)))
-			return array();
-		return $tab;
-
-	}
-
-	private static function createMultiLangField($field)
-	{
-		$languages = Language::getLanguages(false);
-		$res = array();
-		foreach ($languages AS $lang)
-			$res[$lang['id_lang']] = $field;
-		return $res;
-	}
-
-	private function getTypeValuesOptions($nb_c)
-	{
-		$i = 0;
-		$noPreSelect = array('price_tin', 'feature');
-
-		$options = '';
-		foreach ($this->available_fields AS $k => $field)
-		{
-			$options .= '<option value="'.$k.'"';
-			if ($k === 'price_tin')
-				++$nb_c;
-			if ($i === ($nb_c + 1) AND (!in_array($k, $noPreSelect)))
-				$options .= ' selected="selected"';
-			$options .= '>'.$field['label'].'</option>';
-			++$i;
-		}
-		return $options;
-	}
-
-	/*
-	* Return fields to be display AS piece of advise
-	*
-	* @param $inArray boolean
-	* @return string or return array
-	*/
-	public function getAvailableFields($inArray = false)
-	{
-		$i = 0;
-		$fields = array();
-		foreach ($this->available_fields AS $k => $field)
-		{
-			if ($k === 'no')
-				continue;
-			if ($k === 'price_tin')
-			{
-				$fields[$i-1]['label'] = $fields[$i-1]['label'].' '.$this->l('or').' '.$field['label'];
-			}
-			else
-				$fields[] = '<div>'.(isset($field['help']) ? '<a href="#" class="info" title="'.$this->l('Info').'|'.$field['help'].'"><img src="'._PS_ADMIN_IMG_.'information.png"></a>' : '<span style="margin-left:16px"></span>').$field['label'].'</div>';
-			++$i;
-		}
-		if ($inArray)
-			return $fields;
-		else
-			return implode("\n\r", $fields);
-	}
-
-	private function receiveTab()
-	{
-		$type_value = Tools::getValue('type_value') ? Tools::getValue('type_value') : array();
-		foreach ($type_value AS $nb => $type)
-			if ($type != 'no')
-				self::$column_mask[$type] = $nb;
-	}
-
-	public static function getMaskedRow($row)
-	{
-		$res = array();
-		foreach (self::$column_mask AS $type => $nb)
-			$res[$type] = isset($row[$nb]) ? $row[$nb] : null;
-		return $res;
-	}
-
-	private static function setDefaultValues(&$info)
-	{
-		foreach (self::$default_values AS $k => $v)
-			if (!isset($info[$k]) OR $info[$k] == '')
-				$info[$k] = $v;
-	}
-
-	private static function setEntityDefaultValues(&$entity)
-	{
-		$members = get_object_vars($entity);
-		foreach (self::$default_values AS $k => $v)
-			if ((array_key_exists($k, $members) AND $entity->$k === NULL) OR !array_key_exists($k, $members))
-				$entity->$k = $v;
-	}
-
-	private static function fillInfo($infos, $key, &$entity)
-	{
-		if (isset(self::$validators[$key][1]) && self::$validators[$key][1] == 'createMultiLangField' && Tools::getValue('iso_lang'))
-		{
-			$id_lang = Language::getIdByIso(Tools::getValue('iso_lang'));
-			$tmp = call_user_func(self::$validators[$key], $infos);
-			foreach ($tmp as $id_lang_tmp => $value)
-				if (empty($entity->{$key}[$id_lang_tmp]) OR $id_lang_tmp == $id_lang)
-					$entity->{$key}[$id_lang_tmp] = $value;
-		}
-		else
-			$entity->{$key} = isset(self::$validators[$key]) ? call_user_func(self::$validators[$key], $infos) : $infos;
-		return true;
-	}
-
-	public static function array_walk(&$array, $funcname, &$user_data = false)
-	{
-		if (!is_callable($funcname)) return false;
-
-		foreach ($array AS $k => $row)
-			if (!call_user_func_array($funcname, array($row, $k, $user_data)))
-				return false;
-		return true;
-	}
-
-	/**
-	 * copyImg copy an image located in $url and save it in a path
-	 * according to $entity->$id_entity .
-	 * $id_image is used if we need to add a watermark
-	 *
-	 * @param int $id_entity id of product or category (set in entity)
-	 * @param int $id_image (default null) id of the image if watermark enabled.
-	 * @param string $url path or url to use
-	 * @param string entity 'products' or 'categories'
-	 * @return void
-	 */
-	private static function copyImg($id_entity, $id_image = NULL, $url, $entity = 'products')
-	{
-		$tmpfile = tempnam(_PS_TMP_IMG_DIR_, 'ps_import');
-		$watermark_types = explode(',', Configuration::get('WATERMARK_TYPES'));
-
-		switch($entity)
-		{
-			default:
-			case 'products':
-				$imageObj = new Image($id_image);
-				$path = $imageObj->getPathForCreation();
-			break;
-			case 'categories':
-				$path = _PS_CAT_IMG_DIR_.(int)($id_entity);
-			break;
-		}
-		if (copy(str_replace(' ', '%20', trim($url)), $tmpfile))
-		{
-			imageResize($tmpfile, $path.'.jpg');
-			$imagesTypes = ImageType::getImagesTypes($entity);
-			foreach ($imagesTypes AS $k => $imageType)
-				imageResize($tmpfile, $path.'-'.stripslashes($imageType['name']).'.jpg', $imageType['width'], $imageType['height']);
-			if (in_array($imageType['id_image_type'], $watermark_types))
-				Hook::exec('watermark', array('id_image' => $id_image, 'id_product' => $id_entity));
-		}
-		else
-		{
-			unlink($tmpfile);
-			return false;
-		}
-		unlink($tmpfile);
-		return true;
-	}
-
-	public function categoryImport()
-	{
-		$catMoved = array();
-
-		$this->receiveTab();
-		$handle = $this->openCsvFile();
-		$defaultLanguageId = (int)Configuration::get('PS_LANG_DEFAULT');
-		self::setLocale();
-		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
-		{
-			if (Tools::getValue('convert'))
-				$line = $this->utf8_encode_array($line);
-			$info = self::getMaskedRow($line);
-
-			self::setDefaultValues($info);
-			$category = new Category();
-			self::array_walk($info, array('AdminImport', 'fillInfo'), $category);
-
-			if (isset($category->parent) AND is_numeric($category->parent))
-			{
-				if (isset($catMoved[$category->parent]))
-					$category->parent = $catMoved[$category->parent];
-				$category->id_parent = $category->parent;
-			}
-			elseif (isset($category->parent) AND is_string($category->parent))
-			{
-				$categoryParent = Category::searchByName($defaultLanguageId, $category->parent, true);
-				if ($categoryParent['id_category'])
-					$category->id_parent =	(int)($categoryParent['id_category']);
-				else
-				{
-					$categoryToCreate= new Category();
-					$categoryToCreate->name = self::createMultiLangField($category->parent);
-					$categoryToCreate->active = 1;
-					$categoryToCreate->id_parent = 1; // Default parent is home for unknown category to create
-					if (($fieldError = $categoryToCreate->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $categoryToCreate->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true AND $categoryToCreate->add())
-						$category->id_parent = $categoryToCreate->id;
-					else
-					{
-						$this->_errors[] = $categoryToCreate->name[$defaultLanguageId].(isset($categoryToCreate->id) ? ' ('.$categoryToCreate->id.')' : '').' '.Tools::displayError('Cannot be saved');
-						$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError();
-					}
-				}
-			}
-			if (isset($category->link_rewrite) AND !empty($category->link_rewrite[$defaultLanguageId]))
-				$valid_link = Validate::isLinkRewrite($category->link_rewrite[$defaultLanguageId]);
-			else
-				$valid_link = false;
-
-			$bak = $category->link_rewrite[$defaultLanguageId];
-			if ((isset($category->link_rewrite) AND empty($category->link_rewrite[$defaultLanguageId])) OR !$valid_link)
-			{
-				$category->link_rewrite = Tools::link_rewrite($category->name[$defaultLanguageId]);
-				if ($category->link_rewrite == '')
-				{
-					$category->link_rewrite = 'friendly-url-autogeneration-failed';
-					$this->_warnings[] = Tools::displayError('URL rewriting failed to auto-generate a friendly URL for: ').$category->name[$defaultLanguageId];
-				}
-				$category->link_rewrite = self::createMultiLangField($category->link_rewrite);
-			}
-
-			if (!$valid_link)
-				$this->_warnings[] = Tools::displayError('Rewrite link for').' '.$bak.(isset($info['id']) ? ' (ID '.$info['id'].') ' : '').' '.Tools::displayError('was re-written as').' '.$category->link_rewrite[$defaultLanguageId];
-			$res = false;
-			if (($fieldError = $category->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $category->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
-			{
-				$categoryAlreadyCreated = Category::searchByNameAndParentCategoryId($defaultLanguageId, $category->name[$defaultLanguageId], $category->id_parent);
-
-				// If category already in base, get id category back
-				if ($categoryAlreadyCreated['id_category'])
-				{
-					$catMoved[$category->id] = (int)($categoryAlreadyCreated['id_category']);
-					$category->id =	(int)($categoryAlreadyCreated['id_category']);
-				}
-
-				/* No automatic nTree regeneration for import */
-				$category->doNotRegenerateNTree = true;
-
-				// If id category AND id category already in base, trying to update
-				if ($category->id AND $category->categoryExists($category->id))
-					$res = $category->update();
-
-				// If no id_category or update failed
-				if (!$res)
-					$res = $category->add();
-			}
-			//copying images of categories
-			if (isset($category->image) AND !empty($category->image))
-				if (!(self::copyImg($category->id, NULL, $category->image, 'categories')))
-					$this->_warnings[] = $category->image.' '.Tools::displayError('Cannot be copied');
-			// If both failed, mysql error
-			if (!$res)
-			{
-				$this->_errors[] = $info['name'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved');
-				$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError();
-			}
-		}
-
-		/* Import has finished, we can regenerate the categories nested tree */
-		Category::regenerateEntireNtree();
-
-		$this->closeCsvFile($handle);
-	}
-
-	public function productImport()
-	{
-		$this->receiveTab();
-		$handle = $this->openCsvFile();
-		$defaultLanguageId = (int)(Configuration::get('PS_LANG_DEFAULT'));
-		self::setLocale();
-		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
-		{
-			if (Tools::getValue('convert'))
-				$line = $this->utf8_encode_array($line);
-			$info = self::getMaskedRow($line);
-			if (array_key_exists('id', $info) AND (int)($info['id']) AND Product::existsInDatabase((int)($info['id']), 'product'))
-			{
-				$product = new Product((int)($info['id']));
-				$categoryData = Product::getProductCategories((int)($product->id));
-				foreach ($categoryData as $tmp)
-					$product->category[] = $tmp;
-			}
-			else
-				$product = new Product();
-			self::setEntityDefaultValues($product);
-			self::array_walk($info, array('AdminImport', 'fillInfo'), $product);
-
-			if ((int)$product->id_tax_rules_group != 0)
-			{
-				if(Validate::isLoadedObject(new TaxRulesGroup($product->id_tax_rules_group)))
-			    $product->tax_rate = TaxRulesGroup::getTaxesRate((int)$product->id_tax_rules_group, Configuration::get('PS_COUNTRY_DEFAULT'), 0, 0);
-				else
-					$this->_addProductWarning('id_tax_rules_group', $product->id_tax_rules_group, Tools::displayError('Invalid tax rule group ID, you first need a group with this ID.'));
-			}
-			if (isset($product->manufacturer) AND is_numeric($product->manufacturer) AND Manufacturer::manufacturerExists((int)($product->manufacturer)))
-				$product->id_manufacturer = (int)($product->manufacturer);
-			elseif (isset($product->manufacturer) AND is_string($product->manufacturer) AND !empty($product->manufacturer))
-			{
-				if ($manufacturer = Manufacturer::getIdByName($product->manufacturer))
-					$product->id_manufacturer = (int)($manufacturer);
-				else
-				{
-					$manufacturer = new Manufacturer();
-					$manufacturer->name = $product->manufacturer;
-					if (($fieldError = $manufacturer->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $manufacturer->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true AND $manufacturer->add())
-						$product->id_manufacturer = (int)($manufacturer->id);
-					else
-					{
-						$this->_errors[] = $manufacturer->name.(isset($manufacturer->id) ? ' ('.$manufacturer->id.')' : '').' '.Tools::displayError('Cannot be saved');
-						$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError();
-					}
-				}
-			}
-
-			if (isset($product->supplier) AND is_numeric($product->supplier) AND Supplier::supplierExists((int)($product->supplier)))
-				$product->id_supplier = (int)($product->supplier);
-			elseif (isset($product->supplier) AND is_string($product->supplier) AND !empty($product->supplier))
-			{
-				if ($supplier = Supplier::getIdByName($product->supplier))
-					$product->id_supplier = (int)($supplier);
-				else
-				{
-					$supplier = new Supplier();
-					$supplier->name = $product->supplier;
-					if (($fieldError = $supplier->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $supplier->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true AND $supplier->add())
-						$product->id_supplier = (int)($supplier->id);
-					else
-					{
-						$this->_errors[] = $supplier->name.(isset($supplier->id) ? ' ('.$supplier->id.')' : '').' '.Tools::displayError('Cannot be saved');
-						$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError();
-					}
-				}
-			}
-
-			if (isset($product->price_tex) AND !isset($product->price_tin))
-				$product->price = $product->price_tex;
-			elseif (isset($product->price_tin) AND !isset($product->price_tex))
-			{
-				$product->price = $product->price_tin;
-				// If a tax is already included in price, withdraw it from price
-				if ($product->tax_rate)
-					$product->price = (float)(number_format($product->price / (1 + $product->tax_rate / 100), 6, '.', ''));
-			}
-			elseif (isset($product->price_tin) AND isset($product->price_tex))
-				$product->price = $product->price_tex;
-
-			if (isset($product->category) AND is_array($product->category) and sizeof($product->category))
-			{
-				$product->id_category = array(); // Reset default values array
-
-				foreach ($product->category AS $value)
-				{
-					if (is_numeric($value))
-					{
-						if (Category::categoryExists((int)($value)))
-							$product->id_category[] = (int)($value);
-						else
-						{
-							$categoryToCreate= new Category();
-							$categoryToCreate->id = (int)($value);
-							$categoryToCreate->name = self::createMultiLangField($value);
-							$categoryToCreate->active = 1;
-							$categoryToCreate->id_parent = 1; // Default parent is home for unknown category to create
-							if (($fieldError = $categoryToCreate->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $categoryToCreate->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true AND $categoryToCreate->add())
-								$product->id_category[] = (int)($categoryToCreate->id);
-							else
-							{
-								$this->_errors[] = $categoryToCreate->name[$defaultLanguageId].(isset($categoryToCreate->id) ? ' ('.$categoryToCreate->id.')' : '').' '.Tools::displayError('Cannot be saved');
-								$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError();
-							}
-						}
-					}
-					elseif (is_string($value) AND !empty($value))
-					{
-						$category = Category::searchByName($defaultLanguageId, $value, true);
-						if ($category['id_category'])
-						{
-							$product->id_category[] =	(int)($category['id_category']);
-						}
-						else
-						{
-							$categoryToCreate= new Category();
-							$categoryToCreate->name = self::createMultiLangField($value);
-							$categoryToCreate->active = 1;
-							$categoryToCreate->id_parent = 1; // Default parent is home for unknown category to create
-							if (($fieldError = $categoryToCreate->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $categoryToCreate->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true AND $categoryToCreate->add())
-								$product->id_category[] = (int)($categoryToCreate->id);
-							else
-							{
-								$this->_errors[] = $categoryToCreate->name[$defaultLanguageId].(isset($categoryToCreate->id) ? ' ('.$categoryToCreate->id.')' : '').' '.Tools::displayError('Cannot be saved');
-								$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError();
-							}
-						}
-					}
-				}
-			}
-
-			$product->id_category_default = isset($product->id_category[0]) ? (int)($product->id_category[0]) : '';
-			$link_rewrite = (is_array($product->link_rewrite) && count($product->link_rewrite)) ? $product->link_rewrite[$defaultLanguageId] : '';
-
-			$valid_link = Validate::isLinkRewrite($link_rewrite);
-
-			if ((isset($product->link_rewrite[$defaultLanguageId]) AND empty($product->link_rewrite[$defaultLanguageId])) OR !$valid_link)
-			{
-				$link_rewrite = Tools::link_rewrite($product->name[$defaultLanguageId]);
-				if ($link_rewrite == '')
-					$link_rewrite = 'friendly-url-autogeneration-failed';
-			}
-			if (!$valid_link)
-				$this->_warnings[] = Tools::displayError('Rewrite link for'). ' '.$link_rewrite.(isset($info['id']) ? ' (ID '.$info['id'].') ' : '').' '.Tools::displayError('was re-written as').' '.$link_rewrite;
-
-			$product->link_rewrite = self::createMultiLangField($link_rewrite);
-
-			$res = false;
-			$fieldError = $product->validateFields(UNFRIENDLY_ERROR, true);
-			$langFieldError = $product->validateFieldsLang(UNFRIENDLY_ERROR, true);
-			if ($fieldError === true AND $langFieldError === true)
-			{
-				// check quantity
-				if ($product->quantity == NULL)
-					$product->quantity = 0;
-
-				// If match ref is specified AND ref product AND ref product already in base, trying to update
-				if (Tools::getValue('match_ref') == 1 AND $product->reference AND Product::existsRefInDatabase($product->reference))
-				{
-					$datas = Db::getInstance()->getRow('SELECT `date_add`, `id_product` FROM `'._DB_PREFIX_.'product` WHERE `reference` = "'.$product->reference.'"');
-					$product->id = pSQL($datas['id_product']);
-					$product->date_add = pSQL($datas['date_add']);
-					$res = $product->update();
-				} // Else If id product AND id product already in base, trying to update
-				elseif ($product->id AND Product::existsInDatabase((int)($product->id), 'product'))
-				{
-					$datas = Db::getInstance()->getRow('SELECT `date_add` FROM `'._DB_PREFIX_.'product` WHERE `id_product` = '.(int)($product->id));
-					$product->date_add = pSQL($datas['date_add']);
-					$res = $product->update();
-				}
-				// If no id_product or update failed
-				if (!$res)
-				{
-					if (isset($product->date_add) && $product->date_add != '')
-						$res = $product->add(false);
-					else
-					$res = $product->add();
-				}
-			}
-			// If both failed, mysql error
-			if (!$res)
-			{
-				$this->_errors[] = $info['name'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved');
-				$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError();
-
-			}
-			else
-			{
-				// Associate product to shop
-				if (Shop::isFeatureActive() && $product->shop)
-				{
-					$product->shop = explode(',', $product->shop);
-					$shops = array();
-					foreach ($product->shop as $shop)
-					{
-						$shop = trim($shop);
-						if (!is_numeric($shop))
-							$shop = Shop::getIdByName($shop);
-						$shops[] = $shop;
-					}
-					$product->associateTo($shops);
-				}
-
-				// SpecificPrice (only the basic reduction feature is supported by the import)
-				if ((isset($info['reduction_price']) AND $info['reduction_price'] > 0) OR (isset($info['reduction_percent']) AND $info['reduction_percent'] > 0))
-				{
-					$specificPrice = new SpecificPrice();
-					$specificPrice->id_product = (int)($product->id);
-					// @todo multishop specific price import
-					$specificPrice->id_shop = $this->context->shop->getID(true);
-					$specificPrice->id_currency = 0;
-					$specificPrice->id_country = 0;
-					$specificPrice->id_group = 0;
-					$specificPrice->price = 0.00;
-					$specificPrice->from_quantity = 1;
-					$specificPrice->reduction = (isset($info['reduction_price']) AND $info['reduction_price']) ? $info['reduction_price'] : $info['reduction_percent'] / 100;
-					$specificPrice->reduction_type = (isset($info['reduction_price']) AND $info['reduction_price']) ? 'amount' : 'percentage';
-					$specificPrice->from = (isset($info['reduction_from']) AND Validate::isDate($info['reduction_from'])) ? $info['reduction_from'] : '0000-00-00 00:00:00';
-					$specificPrice->to = (isset($info['reduction_to']) AND Validate::isDate($info['reduction_to']))  ? $info['reduction_to'] : '0000-00-00 00:00:00';
-					if (!$specificPrice->add())
-						$this->_addProductWarning($info['name'], $product->id, $this->l('Discount is invalid'));
-				}
-
-				if (isset($product->tags) AND !empty($product->tags))
-				{
-					// Delete tags for this id product, for no duplicating error
-					Tag::deleteTagsForProduct($product->id);
-
-					$tag = new Tag();
-					if (!is_array($product->tags))
-					{
-						$product->tags = self::createMultiLangField($product->tags);
-						foreach($product->tags AS $key => $tags)
-						{
-							$isTagAdded = $tag->addTags($key, $product->id, $tags);
-							if (!$isTagAdded)
-							{
-								$this->_addProductWarning($info['name'], $product->id, $this->l('Tags list').' '.$this->l('is invalid'));
-								break;
-							}
-						}
-
-					}
-					else
-					{
-						foreach ($product->tags AS $key => $tags)
-						{
-							$str = '';
-							foreach($tags AS $one_tag)
-								$str .= $one_tag.',';
-							$str = rtrim($str, ',');
-
-							$isTagAdded = $tag->addTags($key, $product->id, $str);
-							if (!$isTagAdded)
-							{
-								$this->_addProductWarning($info['name'], $product->id,'Invalid tag(s) ('.$str.')');
-								break;
-							}
-						}
-					}
-				}
-				//delete existing images if "delete_existing_images" is set to 1
-				if (isset($product->delete_existing_images))
-					if ((bool)$product->delete_existing_images)
-						$product->deleteImages();
-				elseif (isset($product->image) AND is_array($product->image) AND sizeof($product->image))
-					$product->deleteImages();
-
-				if (isset($product->image) AND is_array($product->image) and sizeof($product->image))
-				{
-					$productHasImages = (bool)Image::getImages($this->context->language->id, (int)($product->id));
-					foreach ($product->image AS $key => $url)
-						if (!empty($url))
-						{
-							$image = new Image();
-							$image->id_product = (int)($product->id);
-							$image->position = Image::getHighestPosition($product->id) + 1;
-							$image->cover = (!$key AND !$productHasImages) ? true : false;
-							$image->legend = self::createMultiLangField($product->name[$defaultLanguageId]);
-							if (($fieldError = $image->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $image->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true AND $image->add())
-							{
-								if (!self::copyImg($product->id, $image->id, $url))
-									$this->_warnings[] = Tools::displayError('Error copying image: ').$url;
-							}
-							else
-							{
-								$this->_warnings[] = $image->legend[$defaultLanguageId].(isset($image->id_product) ? ' ('.$image->id_product.')' : '').' '.Tools::displayError('Cannot be saved');
-								$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError();
-							}
-						}
-				}
-				if (isset($product->id_category))
-					$product->updateCategories(array_map('intval', $product->id_category));
-
-				// Features import
-				$features = get_object_vars($product);
-				foreach (explode(',', $features['features']) as $single_feature)
-				{
-					$tab_feature = explode(':', $single_feature);
-					$feature_name = $tab_feature[0];
-					$feature_value = $tab_feature[1];
-					$position = isset($tab_feature[2]) ? $tab_feature[1]: false;
-					$id_feature = Feature::addFeatureImport($feature_name, $position);
-					$id_feature_value = FeatureValue::addFeatureValueImport($id_feature, $feature_value);
-					Product::addFeatureProductImport($product->id, $id_feature, $id_feature_value);
-				}
-				// clean feature positions to avoid conflict
-				Feature::cleanPositions();
-			}
-		}
-		$this->closeCsvFile($handle);
-	}
-
-	public function attributeImport()
-	{
-		$defaultLanguage = Configuration::get('PS_LANG_DEFAULT');
-		$groups = array();
-		foreach (AttributeGroup::getAttributesGroups($defaultLanguage) AS $group)
-			$groups[$group['name']] = (int)($group['id_attribute_group']);
-		$attributes = array();
-		foreach (Attribute::getAttributes($defaultLanguage) AS $attribute)
-			$attributes[$attribute['attribute_group'].'_'.$attribute['name']] = (int)($attribute['id_attribute']);
-
-		$this->receiveTab();
-		$handle = $this->openCsvFile();
-		$fsep = ((is_null(Tools::getValue('multiple_value_separator')) OR trim(Tools::getValue('multiple_value_separator')) == '' ) ? ',' : Tools::getValue('multiple_value_separator'));
-		self::setLocale();
-		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
-		{
-			if (Tools::getValue('convert'))
-				$line = $this->utf8_encode_array($line);
-			$info = self::getMaskedRow($line);
-			$info = array_map('trim', $info);
-
-			self::setDefaultValues($info);
-
-			$product = new Product((int)($info['id_product']), false, $defaultLanguage);
-			$id_image = null;
-			//delete existing images if "delete_existing_images" is set to 1
-			if (array_key_exists('delete_existing_images', $info) && $info['delete_existing_images'])
-				$product->deleteImages();
-			elseif (array_key_exists('image_url', $info))
-				$product->deleteImages();
-
-			if (isset($info['image_url']) && $info['image_url'])
-			{
-				$productHasImages = (bool)Image::getImages($this->context->language->id, $product->id);
-				$url = $info['image_url'];
-				$image = new Image();
-				$image->id_product = (int)($product->id);
-				$image->position = Image::getHighestPosition($product->id) + 1;
-				$image->cover = (!$productHasImages) ? true : false;
-				$image->legend = self::createMultiLangField($product->name);
-
-				if (($fieldError = $image->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $image->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true AND $image->add())
-				{
-					if (!self::copyImg($product->id, $image->id, $url))
-						$this->_warnings[] = Tools::displayError('Error copying image: ').$url;
-					else
-						$id_image = array($image->id);
-				}
-				else
-				{
-					$this->_warnings[] = $image->legend[$defaultLanguageId].(isset($image->id_product) ? ' ('.$image->id_product.')' : '').' '.Tools::displayError('Cannot be saved');
-					$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error();
-				}
-			}
-			elseif (isset($info['image_position']) && $info['image_position'])
-			{
-				$images = $product->getImages($defaultLanguage);
-
-				if ($images)
-					foreach ($images as $row)
-						if($row['position'] == (int)$info['image_position'])
-						{
-							$id_image = array($row['id_image']);
-							break;
-						}
-				if (!$id_image)
-					$this->_warnings[] = sprintf(Tools::displayError('No image found for combination with id_product = %s and image position = %s.'), $product->id, (int)$info['image_position']);
-			}
-
-			$id_product_attribute = $product->addProductAttribute((float)($info['price']), (float)($info['weight']), 0, (float)($info['ecotax']), (int)$info['quantity'], $id_image, strval($info['reference']), strval($info['supplier_reference']), strval($info['ean13']), (int)($info['default_on']), strval($info['upc']));
-			$id_attribute_group = 0;
-			$group = '';
-			foreach (explode($fsep, $info['group']) as $group)
-			{
-				$tab_group = explode(':', $group);
-				$group = $tab_group[0];
-				$id_attribute_group = $groups[$group];
-				// if position is filled
-				if (isset($tab_group[1]))
-					$position = $tab_group[1];
-				else
-					$position = false;
-				if (!isset($groups[$group]))
-				{
-					$obj = new AttributeGroup();
-					$obj->is_color_group = false;
-					$obj->name[$defaultLanguage] = $group;
-					$obj->public_name[$defaultLanguage] = $group;
-					$obj->position = (!$position) ? AttributeGroup::getHigherPosition() + 1 : $position;
-					if (($fieldError = $obj->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $obj->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
-					{
-						$obj->add();
-						$groups[$group] = $obj->id;
-					}
-					else
-						$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '');
-				}
-			}
-			foreach (explode($fsep, $info['attribute']) as $attribute)
-			{
-				$tab_attribute = explode(':', $attribute);
-				$attribute = $tab_attribute[0];
-				// if position is filled
-				if (isset($tab_attribute[1]))
-					$position = $tab_attribute[1];
-				else
-					$position = false;
-				if (!isset($attributes[$group.'_'.$attribute]))
-				{
-					$obj = new Attribute();
-					$obj->id_attribute_group = $groups[$group];
-					$obj->name[$defaultLanguage] = str_replace('\n', '', str_replace('\r', '', $attribute));
-					$obj->position = (!$position) ? Attribute::getHigherPosition($groups[$group]) + 1 : $position;
-					if (($fieldError = $obj->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $obj->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
-					{
-						$obj->add();
-						$attributes[$group.'_'.$attribute] = $obj->id;
-					}
-					else
-						$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '');
-
-				}
-			}
-			Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'product_attribute_combination (id_attribute, id_product_attribute) VALUES ('.(int)($attributes[$group.'_'.$attribute]).','.(int)$id_product_attribute.')');
-		}
-		$this->closeCsvFile($handle);
-
-		// after insertion, we clean attribute position and group attribute position
-		$obj = new Attribute();
-		$obj->cleanPositions((int)$id_attribute_group, false);
-		AttributeGroup::cleanPositions();
-	}
-
-	public function customerImport()
-	{
-		$this->receiveTab();
-		$handle = $this->openCsvFile();
-		self::setLocale();
-		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
-		{
-			if (Tools::getValue('convert'))
-				$line = $this->utf8_encode_array($line);
-			$info = self::getMaskedRow($line);
-
-			self::setDefaultValues($info);
-			$customer = new Customer();
-			self::array_walk($info, array('AdminImport', 'fillInfo'), $customer);
-
-			if ($customer->passwd)
-				$customer->passwd = md5(_COOKIE_KEY_.$customer->passwd);
-
-			// Associate product to shop
-			if (Shop::isFeatureActive() && $customer->id_shop)
-			{
-				if (!is_numeric($customer->id_shop))
-					$customer->id_shop = Shop::getIdByName($customer->id_shop);
-			}
-			else
-				$customer->id_shop = Configuration::get('PS_SHOP_DEFAULT');
-
-			$res = false;
-			if (($fieldError = $customer->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $customer->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
-			{
-				$customer->id_group_shop = Shop::getGroupFromShop($customer->id_shop);
-
-				if ($customer->id AND $customer->customerIdExists($customer->id))
-					$res = $customer->update();
-				if (!$res)
-					$res = $customer->add();
-				if ($res)
-					$customer->addGroups(array(1));
-			}
-			if (!$res)
-			{
-				$this->_errors[] = $info['email'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved');
-				$this->_errors[] = ($fieldError !== true ? $fieldError : ($langFieldError !== true ? $langFieldError : '')).Db::getInstance()->getMsgError();
-			}
-		}
-		$this->closeCsvFile($handle);
-	}
-
-	public function addressImport()
-	{
-		$this->receiveTab();
-		$defaultLanguageId = (int)Configuration::get('PS_LANG_DEFAULT');
-		$handle = $this->openCsvFile();
-		self::setLocale();
-		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
-		{
-			if (Tools::getValue('convert'))
-				$line = $this->utf8_encode_array($line);
-			$info = self::getMaskedRow($line);
-
-			self::setDefaultValues($info);
-			$address = new Address();
-			self::array_walk($info, array('AdminImport', 'fillInfo'), $address);
-
-			if (isset($address->country) AND is_numeric($address->country))
-			{
-				if (Country::getNameById(Configuration::get('PS_LANG_DEFAULT'), (int)($address->country)))
-					$address->id_country = (int)($address->country);
-			}
-			elseif(isset($address->country) AND is_string($address->country) AND !empty($address->country))
-			{
-				if ($id_country = Country::getIdByName(NULL, $address->country))
-					$address->id_country = (int)($id_country);
-				else
-				{
-					$country = new Country();
-					$country->active = 1;
-					$country->name = self::createMultiLangField($address->country);
-					$country->id_zone = 0; // Default zone for country to create
-					$country->iso_code = strtoupper(substr($address->country, 0, 2)); // Default iso for country to create
-					$country->contains_states = 0; // Default value for country to create
-					$langFieldError = $country->validateFieldsLang(UNFRIENDLY_ERROR, true);
-					if (($fieldError = $country->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $country->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true AND $country->add())
-						$address->id_country = (int)($country->id);
-					else
-					{
-						$this->_errors[] = $country->name[$defaultLanguageId].' '.Tools::displayError('Cannot be saved');
-						$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError();
-					}
-				}
-			}
-
-			if (isset($address->state) AND is_numeric($address->state))
-			{
-				if (State::getNameById((int)($address->state)))
-					$address->id_state = (int)($address->state);
-			}
-			elseif(isset($address->state) AND is_string($address->state) AND !empty($address->state))
-			{
-				if ($id_state = State::getIdByName($address->state))
-					$address->id_state = (int)($id_state);
-				else
-				{
-					$state = new State();
-					$state->active = 1;
-					$state->name = $address->state;
-					$state->id_country = isset($country->id) ? (int)($country->id) : 0;
-					$state->id_zone = 0; // Default zone for state to create
-					$state->iso_code = strtoupper(substr($address->state, 0, 2)); // Default iso for state to create
-					$state->tax_behavior = 0;
-					if (($fieldError = $state->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $state->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true AND $state->add())
-						$address->id_state = (int)($state->id);
-					else
-					{
-						$this->_errors[] = $state->name.' '.Tools::displayError('Cannot be saved');
-						$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError();
-					}
-				}
-			}
-
-			if(isset($address->customer_email) and !empty($address->customer_email))
-			{
-				if( Validate::isEmail($address->customer_email))
-				{
-					$customer = Customer::customerExists($address->customer_email, true);
-					if ($customer)
-						$address->id_customer = (int)($customer);
-					else
-						$this->_errors[] = Db::getInstance()->getMsgError().' '.$address->customer_email.' '.Tools::displayError('does not exist in database').' '.(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved');
-				}
-				else
-					$this->_errors[] = '"'.$address->customer_email.'" :' .Tools::displayError('Is not a valid Email');
-			}
-
-			if (isset($address->manufacturer) AND is_numeric($address->manufacturer) AND Manufacturer::manufacturerExists((int)($address->manufacturer)))
-				$address->id_manufacturer = (int)($address->manufacturer);
-			elseif (isset($address->manufacturer) AND is_string($address->manufacturer) AND !empty($address->manufacturer))
-			{
-				$manufacturer = new Manufacturer();
-				$manufacturer->name = $address->manufacturer;
-				if (($fieldError = $manufacturer->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $manufacturer->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true AND $manufacturer->add())
-					$address->id_manufacturer = (int)($manufacturer->id);
-				else
-				{
-					$this->_errors[] = Db::getInstance()->getMsgError().' '.$manufacturer->name.(isset($manufacturer->id) ? ' ('.$manufacturer->id.')' : '').' '.Tools::displayError('Cannot be saved');
-					$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError();
-				}
-			}
-
-			if (isset($address->supplier) AND is_numeric($address->supplier) AND Supplier::supplierExists((int)($address->supplier)))
-				$address->id_supplier = (int)($address->supplier);
-			elseif (isset($address->supplier) AND is_string($address->supplier) AND !empty($address->supplier))
-			{
-				$supplier = new Supplier();
-				$supplier->name = $address->supplier;
-				if (($fieldError = $supplier->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $supplier->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true AND $supplier->add())
-					$address->id_supplier = (int)($supplier->id);
-				else
-				{
-					$this->_errors[] = Db::getInstance()->getMsgError().' '.$supplier->name.(isset($supplier->id) ? ' ('.$supplier->id.')' : '').' '.Tools::displayError('Cannot be saved');
-					$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError();
-				}
-			}
-
-			$res = false;
-			if (($fieldError = $address->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $address->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
-			{
-				if ($address->id AND $address->addressExists($address->id))
-					$res = $address->update();
-				if (!$res)
-					$res = $address->add();
-			}
-			if (!$res)
-			{
-				$this->_errors[] = $info['alias'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved');
-				$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError();
-			}
-		}
-		$this->closeCsvFile($handle);
-	}
-
-	public function manufacturerImport()
-	{
-		$this->receiveTab();
-		$handle = $this->openCsvFile();
-		self::setLocale();
-		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
-		{
-			if (Tools::getValue('convert'))
-				$line = $this->utf8_encode_array($line);
-			$info = self::getMaskedRow($line);
-
-			self::setDefaultValues($info);
-
-			if (array_key_exists('id', $info) AND (int)($info['id']) AND Manufacturer::existsInDatabase((int)($info['id']), 'manufacturer'))
-				$manufacturer = new Manufacturer((int)($info['id']));
-			else
-			$manufacturer = new Manufacturer();
-			self::array_walk($info, array('AdminImport', 'fillInfo'), $manufacturer);
-
-			$res = false;
-			if (($fieldError = $manufacturer->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $manufacturer->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
-			{
-				if ($manufacturer->id AND $manufacturer->manufacturerExists($manufacturer->id))
-					$res = $manufacturer->update();
-				if (!$res)
-					$res = $manufacturer->add();
-
-				if ($res)
-				{
-					// Associate supplier to group shop
-					if (Shop::isFeatureActive() && $manufacturer->shop)
-					{
-						$manufacturer->shop = explode(',', $manufacturer->shop);
-						$shops = array();
-						foreach ($manufacturer->shop as $shop)
-						{
-							$shop = trim($shop);
-							if (!is_numeric($shop))
-								$shop = GroupShop::getIdByName($shop);
-							$shops[] = $shop;
-						}
-						$manufacturer->associateTo($shops, 'group_shop');
-					}
-				}
-			}
-
-			if (!$res)
-			{
-				$this->_errors[] = Db::getInstance()->getMsgError().' '.$info['name'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved');
-				$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError();
-			}
-		}
-		$this->closeCsvFile($handle);
-	}
-
-	public function supplierImport()
-	{
-		$this->receiveTab();
-		$handle = $this->openCsvFile();
-		self::setLocale();
-		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
-		{
-			if (Tools::getValue('convert'))
-				$line = $this->utf8_encode_array($line);
-			$info = self::getMaskedRow($line);
-
-			self::setDefaultValues($info);
-
-			if (array_key_exists('id', $info) AND (int)($info['id']) AND Supplier::existsInDatabase((int)($info['id']), 'supplier'))
-				$supplier = new Supplier((int)($info['id']));
-			else
-			$supplier = new Supplier();
-
-			self::array_walk($info, array('AdminImport', 'fillInfo'), $supplier);
-			if (($fieldError = $supplier->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $supplier->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
-			{
-				$res = false;
-				if ($supplier->id AND $supplier->supplierExists($supplier->id))
-					$res = $supplier->update();
-				if (!$res)
-					$res = $supplier->add();
-
-				if (!$res)
-					$this->_errors[] = Db::getInstance()->getMsgError().' '.$info['name'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved');
-				else
-				{
-					// Associate supplier to group shop
-					if (Shop::isFeatureActive() && $supplier->shop)
-					{
-						$supplier->shop = explode(',', $supplier->shop);
-						$shops = array();
-						foreach ($supplier->shop as $shop)
-						{
-							$shop = trim($shop);
-							if (!is_numeric($shop))
-								$shop = GroupShop::getIdByName($shop);
-							$shops[] = $shop;
-						}
-						$supplier->associateTo($shops, 'group_shop');
-					}
-				}
-			}
-			else
-			{
-				$this->_errors[] = $this->l('Supplier not valid').' ('.$supplier->name.')';
-				$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '');
-			}
-		}
-		$this->closeCsvFile($handle);
-	}
-
-	public function display()
-	{
-		if (!Tools::isSubmit('submitImportFile'))
-			$this->displayForm();
-	}
-
-	public function displayForm($isMainTab = true)
-	{
-		parent::displayForm();
-
-		if ((Tools::getValue('import')) AND (isset($this->_warnings) AND !sizeof($this->_warnings)))
-			echo '<div class="module_confirmation conf confirm"><img src="../img/admin/ok.gif" alt="" title="" style="margin-right:5px; float:left;" />'.$this->l('The .CSV file has been imported into your shop.').'</div>';
-
-		if(!is_writable(_PS_ADMIN_DIR_.'/import/'))
-			$this->displayWarning($this->l('directory import on admin directory must be writable (CHMOD 755 / 777)'));
-
-		if(isset($this->_warnings) AND sizeof($this->_warnings))
-		{
-			$warnings = array();
-			foreach ($this->_warnings as $warning)
-				$warnings[] = $warning;
-			$this->displayWarning($warnings);
-		}
-		echo '<script type="text/javascript">
-					$(document).ready(function(){
-						activeClueTip();
-					});
-					function activeClueTip()
-					{
-						$(\'.info\').cluetip({
-						splitTitle: \'|\',
-					    showTitle: false
-					 	});
-					};
-			</script>';
-		echo '
-		<fieldset style="float:right;margin:0 10px 10px 0">
-			<legend><img src="../img/admin/excel_file.png">'.$this->l('Sample files').'</legend>
-				<ul style="">
-					<li style="text-decoration: underline"><a href="../docs/csv_import/categories_import.csv">'.$this->l('Categories sample file').'</a></li>
-					<li style="text-decoration: underline"><a href="../docs/csv_import/products_import.csv">'.$this->l('Products sample file').'</a></li>
-					<li style="text-decoration: underline"><a href="../docs/csv_import/combinations_import.csv">'.$this->l('Combinations sample file').'</a></li>
-					<li style="text-decoration: underline"><a href="../docs/csv_import/customers_import.csv">'.$this->l('Customers sample file').'</a></li>
-					<li style="text-decoration: underline"><a href="../docs/csv_import/addresses_import.csv">'.$this->l('Addresses sample file').'</a></li>
-					<li style="text-decoration: underline"><a href="../docs/csv_import/manufacturers_import.csv">'.$this->l('Manufacturers sample file').'</a></li>
-					<li style="text-decoration: underline"><a href="../docs/csv_import/suppliers_import.csv">'.$this->l('Suppliers sample file').'</a></li>
-				</ul>
-		</fieldset>
-		<fieldset class="width3">
-			<legend><img src="../img/admin/import.gif" />'.$this->l('Upload').'</legend>
-			<form action="'.self::$currentIndex.'&token='.$this->token.'" method="POST" enctype="multipart/form-data">
-				<label class="clear">'.$this->l('Select a file').' </label>
-				<div class="margin-form">
-					<input name="file" type="file" /><br />'.$this->l('You can also upload your file by FTP and put it in').' '.realpath(dirname(__FILE__).'/../import/').'.
-				</div>
-				<div class="margin-form">
-					<input type="submit" name="submitFileUpload" value="'.$this->l('Upload').'" class="button" />
-				</div>
-				<div class="margin-form">
-					'.$this->l('Allowed files are only UTF-8 and iso-8859-1 encoded ones').'
-				</div>
-			</form>
-		</fieldset>';
-
-		$filesToImport = scandir(dirname(__FILE__).'/../import');
-		uasort($filesToImport, array('AdminImport', '_usortFiles'));
-		foreach ($filesToImport AS $k => &$filename)
-			//exclude .  ..  .svn and index.php and all hidden files
-			if (preg_match('/^\..*|index\.php/i', $filename))
-				unset($filesToImport[$k]);
-		unset($filename);
-			echo '
-			<div class="space">
-					<form id="preview_import" action="'.self::$currentIndex.'&token='.$this->token.'" method="post" style="display:inline" enctype="multipart/form-data" class="clear" onsubmit="if ($(\'#truncate\').get(0).checked) {if (confirm(\''.$this->l('Are you sure you want to delete', __CLASS__, true, false).'\' + \' \' + $(\'#entity > option:selected\').text().toLowerCase() + \''.$this->l('?', __CLASS__, true, false).'\')){this.submit();} else {return false;}}">
-						<fieldset style="float: left; width: 550px">
-							<legend><img src="../img/admin/import.gif" />'.$this->l('Import').'</legend>
-							<label class="clear">'.$this->l('Select which entity to import:').' </label>
-							<div class="margin-form">
-								<select name="entity" id="entity">';
-			foreach ($this->entities AS $entity => $i)
-			{
-				echo '<option value="'.$i.'"';
-				if (Tools::getValue('entity') == $i)
-					echo ' selected="selected" ';
-				echo'>'.$entity.'</option>';
-			}
-			echo '				</select>
-						</div>';
-		if (sizeof($filesToImport))
-		{
-			echo '
-							<label class="clear">'.$this->l('Select your .CSV file:').' </label>
-							<div class="margin-form">
-								<select name="csv">';
-			foreach ($filesToImport AS $filename)
-				echo '<option value="'.$filename.'">'.$filename.'</option>';
-			echo '				</select> ('.sizeof($filesToImport).' '.(sizeof($filesToImport) > 1 ? $this->l('files available') : $this->l('file available')).')
-							</div>
-							<label class="clear">'.$this->l('Select language of the file (the locale must be installed):').' </label>
-							<div class="margin-form">
-								<select name="iso_lang">';
-							foreach ($this->_languages AS $lang)
-								echo '<option value="'.$lang['iso_code'].'" '.($lang['id_lang'] == $this->context->language->id ? 'selected="selected"' : '').'>'.$lang['name'].'</option>';
-							echo '</select></div><label for="convert" class="clear">'.$this->l('iso-8859-1 encoded file').' </label>
-							<div class="margin-form">
-								<input name="convert" id="convert" type="checkbox" style="margin-top: 6px;"/>
-							</div>
-							<label class="clear">'.$this->l('Field separator:').' </label>
-							<div class="margin-form">
-								<input type="text" size="2" value=";" name="separator"/>
-								'.$this->l('e.g. ').'"1<span class="bold" style="color: red">;</span>Ipod<span class="bold" style="color: red">;</span>129.90<span class="bold" style="color: red">;</span>5"
-							</div>
-							<label class="clear">'.$this->l('Multiple value separator:').' </label>
-							<div class="margin-form">
-								<input type="text" size="2" value="," name="multiple_value_separator"/>
-								'.$this->l('e.g. ').'"Ipod;red.jpg<span class="bold" style="color: red">,</span>blue.jpg<span class="bold" style="color: red">,</span>green.jpg;129.90"
-							</div>
-							<label for="truncate" class="clear">'.$this->l('Delete all').' <span id="entitie">'.$this->l('categories').'</span> '.$this->l('before import ?').' </label>
-							<div class="margin-form">
-							<input name="truncate" id="truncate" type="checkbox"/>
-							</div>
-						<label for="match_ref" class="clear" style="display: none">'.$this->l('Use product reference as key ?').'</label>
-						<div class="margin-form">
-							<input name="match_ref" id="match_ref" type="checkbox" style="margin-top: 6px; display:none"/>
-						</div>
-							<div class="space margin-form">
-								<input type="submit" name="submitImportFile" value="'.$this->l('Next step').'" class="button"/>
-							</div>
-						<div class="warn">
-							<p>'.$this->l('Note that the category import does not support categories of the same name').'.</p>
-
-							<p>'.$this->l('Note that references are not specified as UNIQUE in the database').'.</p>
-							</div>
-						';
-				}
-				else
-					echo '
-					<div class="warn">
-						'.$this->l('No CSV file is available, please upload one file above.').'<br /><br />
-						'.$this->l('You can get many informations about CSV import at:').' <a href="http://www.prestashop.com/wiki/Troubleshooting_6/" target="_blank">http://www.prestashop.com/wiki/Troubleshooting_6/</a><br /><br />
-						'.$this->l('More about CSV format at: ').' <a href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">http://en.wikipedia.org/wiki/Comma-separated_values</a>
-					</div>';
-					echo '
-						</fieldset>
-					</form>
-					<fieldset style="display: inline; float: right; margin-left: 20px;">
-					<legend><img src="../img/admin/import.gif" />'.$this->l('Fields available').'</legend>
-					<div id="availableFields" style="min-height: 218px; width: 300px;">'.$this->getAvailableFields().'</div>
-					</fieldset>
-					<div class="clear" style="float:right; padding-right: 120px;">
-					'.$this->l('* Required Fields').'
-					</div>
-				</div>
-				<div class="clear">&nbsp;</div>
-				<script type="text/javascript">
-					$("select#entity").change( function() {
-					if ($("#entity > option:selected").val() != 1)
-					{
-						$("label[for=match_ref],#match_ref").hide();
-					}
-					if ($("#entity > option:selected").val() == 1)
-					{
-						$("label[for=match_ref],#match_ref").show();
-					}
-						$("#entitie").html($("#entity > option:selected").text().toLowerCase());
-						$.getJSON("'.dirname(self::$currentIndex).'/ajax.php",
-							{
-							getAvailableFields:1,
-							entity: $("#entity").val()},
-									function(j)
-									{
-										var fields = "";
-										$("#availableFields").empty();
-										for (var i = 0; i < j.length; i++)
-											fields += j[i].field;
-										$("#availableFields").html(fields);
-										activeClueTip();
-									}
-						);
-					});
-				</script>';
-
-				if (Tools::getValue('entity'))
-					echo' <script type="text/javascript">$("select#entity").change();</script>';
-		}
-
-	public function utf8_encode_array($array)
-	{
-		if (is_array($array))
-			foreach ($array as $key => $value)
-				$array[$key] = utf8_encode($value);
-		else
-			$array = utf8_encode($array);
-
-		return $array;
-	}
-
-	private function getNbrColumn($handle, $glue)
-	{
-		$tmp = fgetcsv($handle, MAX_LINE_SIZE, $glue);
-		self::rewindBomAware($handle);
-		return sizeof($tmp);
-	}
-
-	private static function _usortFiles($a, $b)
-	{
-		$a = strrev(substr(strrev($a), 0, 14));
-		$b = strrev(substr(strrev($b), 0, 14));
-
-		if ($a == $b)
-			return 0;
-
-		return ($a < $b) ? 1 : -1;
-	}
-
-	private function openCsvFile()
-	{
-		 $handle = fopen(dirname(__FILE__).'/../import/'.strval(preg_replace('/\.{2,}/', '.',Tools::getValue('csv'))), 'r');
-
-
-		if (!$handle)
-			die(Tools::displayError('Cannot read the CSV file'));
-
-		self::rewindBomAware($handle);
-
-		for ($i = 0; $i < (int)(Tools::getValue('skip')); ++$i)
-			$line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator', ';'));
-		return $handle;
-	}
-
-	private function closeCsvFile($handle)
-	{
-		fclose($handle);
-	}
-
-	private function generateContentTable($current_table, $nb_table, $nb_column, $handle, $glue)
-	{
-		echo '
-		<table id="table'.$current_table.'" style="display: none;" class="table" cellspacing="0" cellpadding="0">
-			<tr>';
-
-		// Header
-		for ($i = 0; $i < $nb_column; $i++)
-			if (MAX_COLUMNS * (int)($current_table) <= $i AND (int)($i) < MAX_COLUMNS * ((int)($current_table) + 1))
-				echo '
-				<th style="width: '.(750 / MAX_COLUMNS).'px; vertical-align: top; padding: 4px">
-					<select onchange="askFeatureName(this, '.$i.');" style="width: '.(750 / MAX_COLUMNS).'px;" id="type_value['.$i.']" name="type_value['.$i.']" class="type_value">
-						'.$this->getTypeValuesOptions($i).'
-					</select>
-					<div id="features_'.$i.'" style="display: none;"><input style="width: 90px" type="text" name="" id="feature_name_'.$i.'"><input type="button" value="ok" onclick="replaceFeature($(\'#feature_name_'.$i.'\').attr(\'name\'), '.$i.');"></div>
-				</th>';
-		echo '
-			</tr>';
-		ob_flush();
-		ob_clean();
-
-		/* Datas */
-		self::setLocale();
-		for ($current_line = 0; $current_line < 10 AND $line = fgetcsv($handle, MAX_LINE_SIZE, $glue); $current_line++)
-		{
-			/* UTF-8 conversion */
-			if (Tools::getValue('convert'))
-				$line = $this->utf8_encode_array($line);
-			echo '<tr id="table_'.$current_table.'_line_'.$current_line.'" style="padding: 4px">';
-			foreach ($line AS $nb_c => $column)
-				if ((MAX_COLUMNS * (int)($current_table) <= $nb_c) AND ((int)($nb_c) < MAX_COLUMNS * ((int)($current_table) + 1)))
-					echo '<td>'.htmlentities(substr($column, 0, 200), ENT_QUOTES, 'UTF-8').'</td>';
-			echo '</tr>';
-		}
-		echo '</table>';
-		self::rewindBomAware($handle);
-	}
-
-	public function displayCSV()
-	{
-		$importMatchs = Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'import_match');
-
-		echo '
-		<script src="'._PS_JS_DIR_.'adminImport.js"></script>
-		<script type="text/javascript">
-			var errorEmpty = "'.$this->l('Please enter a name to save.').'"
-		</script>
-		<h2>'.$this->l('Your data').'</h2>'.'
-		<div style="float:right">
-		<b>'.$this->l('Save and load your matching configuration').' : </b><br><br>
-		<input type="text" name="newImportMatchs" id="newImportMatchs"><a id="saveImportMatchs" class="button" href="#">'.$this->l('Save').'</a><br><br>
-		<div id="selectDivImportMatchs" '.(!$importMatchs ? 'style="display:none"' : '' ).'>';
-			echo '<select id="valueImportMatchs">';
-			foreach($importMatchs as $match)
-				echo '<option id="'.htmlentities($match['id_import_match'],ENT_NOQUOTES, 'UTF-8').'" value="'.htmlentities($match['match'],ENT_NOQUOTES, 'UTF-8').'">'.htmlentities($match['name'],ENT_NOQUOTES, 'UTF-8').'</option>';
-			echo '
-				</select>
-				<a class="button" id="loadImportMatchs" href="#">'.$this->l('Load').'</a>
-				<a class="button" id="deleteImportMatchs" href="#">'.$this->l('Delete').'</a>';
-
-		echo '</div></div><h3>'.$this->l('Please set the value type of each column').'</h3>
-		<div id="error_duplicate_type" class="warning warn" style="display:none;">
-			<h3>'.$this->l('Columns cannot have the same value type').'</h3>
-		</div>
-		<div id="required_column" class="warning warn" style="display:none;">
-			<h3>'.Tools::displayError('Column').' <span id="missing_column">&nbsp;</span> '.Tools::displayError('must be set').'</h3>
-		</div>';
-
-		$glue = Tools::getValue('separator', ';');
-		$handle = $this->openCsvFile();
-		$nb_column = $this->getNbrColumn($handle, $glue);
-		$nb_table = ceil($nb_column / MAX_COLUMNS);
-
-		$res = array();
-		foreach (self::$required_fields AS $elem)
-			$res[] = '\''.$elem.'\'';
-
-		echo '
-		<form action="'.self::$currentIndex.'&token='.$this->token.'" method="post" id="import_form" name="import_form">
-			'.$this->l('Skip').' <input type="text" size="2" name="skip" value="0" /> '.$this->l('lines').'
-			<input type="hidden" name="csv" value="'.Tools::getValue('csv').'" />
-			<input type="hidden" name="convert" value="'.Tools::getValue('convert').'" />
-			<input type="hidden" name="entity" value="'.(int)(Tools::getValue('entity')).'" />
-			<input type="hidden" name="iso_lang" value="'.Tools::getValue('iso_lang').'" />';
-		if (Tools::getValue('truncate'))
-			echo '<input type="hidden" name="truncate" value="1" />';
-		if (Tools::getValue('match_ref'))
-			echo '<input type="hidden" name="match_ref" value="1" />';
-		echo '
-			<input type="hidden" name="separator" value="'.strval(trim(Tools::getValue('separator'))).'">
-			<input type="hidden" name="multiple_value_separator" value="'.strval(trim(Tools::getValue('multiple_value_separator'))).'">
-			<script type="text/javascript">
-				var current = 0;
-				function showTable(nb)
-				{
-					getE(\'btn_left\').disabled = null;
-					getE(\'btn_right\').disabled = null;
-					if (nb <= 0)
-					{
-						nb = 0;
-						getE(\'btn_left\').disabled = \'true\';
-					}
-					if (nb >= '.$nb_table.' - 1)
-					{
-						nb = '.$nb_table.' - 1;
-						getE(\'btn_right\').disabled = \'true\';
-					}
-					toggle(getE(\'table\'+current), false);
-					current = nb;
-					toggle(getE(\'table\'+current), true);
-				}
-			</script>
-			<div style="text-align:center; margin-bottom :20px;">
-				<input name="import" type="submit" onclick="return (validateImportation(new Array('.implode(',', $res).')));" id="import" value="'.$this->l('Import CSV data').'" class="button" />
-			</div>';
-		ob_flush();
-		echo '
-			<table>
-				<tr>
-					<td valign="top" align="center"><input id="btn_left" value="'.$this->l('<<').'" type="button" class="button" onclick="showTable(current - 1)" /></td>
-					<td align="left">';
-		for ($i = 0; $i < $nb_table; $i++)
-			$this->generateContentTable($i, $nb_table, $nb_column, $handle, $glue);
-		echo '		</td>
-					<td valign="top" align="center"><input id="btn_right" value="'.$this->l('>>').'" type="button" class="button" onclick="showTable(current + 1)" /></td>
-				</tr>
-			</table>
-			<script type="text/javascript">showTable(current);</script>
-			<div style="text-align:center; margin-top:10px;">
-				<input name="import" type="submit" onclick="return (validateImportation(new Array('.implode(',', $res).')));" id="import" value="'.$this->l('Import CSV data').'" class="button" />
-			</div>
-		</form>';
-	}
-
-	private function truncateTables($case)
-	{
-		switch ((int)($case))
-		{
-			case $this->entities[$this->l('Categories')]:
-				Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category` WHERE id_category != 1');
-				Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category_lang` WHERE id_category != 1');
-				Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'category` AUTO_INCREMENT = 2');
-				foreach (scandir(_PS_CAT_IMG_DIR_) AS $d)
-					if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d))
-						unlink(_PS_CAT_IMG_DIR_.$d);
-				break;
-			case $this->entities[$this->l('Products')]:
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'feature_product');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_lang');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'category_product');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_tag');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image_lang');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price_priority');
-				Image::deleteAllImages(_PS_PROD_IMG_DIR_);
-				mkdir(_PS_PROD_IMG_DIR_);
-				break;
-			case $this->entities[$this->l('Customers')]:
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer');
-				break;
-			case $this->entities[$this->l('Addresses')]:
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'address');
-				break;
-			case $this->entities[$this->l('Combinations')]:
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_impact');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute`');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_combination`');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_image`');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_group`');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_group_lang`');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute`');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_lang`');
-				break;
-			case $this->entities[$this->l('Manufacturers')]:
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_lang');
-				foreach (scandir(_PS_MANU_IMG_DIR_) AS $d)
-					if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d))
-						unlink(_PS_MANU_IMG_DIR_.$d);
-				break;
-			case $this->entities[$this->l('Suppliers')]:
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_lang');
-				foreach (scandir(_PS_SUPP_IMG_DIR_) AS $d)
-					if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d))
-						unlink(_PS_SUPP_IMG_DIR_.$d);
-				break;
-		}
-		Image::clearTmpDir();
-		return true;
-	}
-
-	public function postProcess()
-	{
-		/* PrestaShop demo mode */
-		if (_PS_MODE_DEMO_)
-		{
-			$this->_errors[] = Tools::displayError('This functionnality has been disabled.');
-			return;
-		}
-		/* PrestaShop demo mode*/
-
-		if (Tools::isSubmit('submitFileUpload'))
-		{
-			if (isset($_FILES['file']) AND !empty($_FILES['file']['error']))
-			{
-				switch ($_FILES['file']['error'])
-				{
-					case UPLOAD_ERR_INI_SIZE:
-						$this->_errors[] = Tools::displayError('The uploaded file exceeds the upload_max_filesize directive in php.ini. If your server configuration allows it, you may add a directive in your .htaccess, for example:')
-						.'<br/><a href="?tab=AdminGenerator&amp;token='
-						.Tools::getAdminTokenLite('AdminGenerator').'" >'
-						.'<code>php_value upload_max_filesize 20M</code> '.
-						Tools::displayError('(clic to open Generator tab)').'</a>';
-						break;
-					case UPLOAD_ERR_FORM_SIZE:
-						$this->_errors[] = Tools::displayError('The uploaded file exceeds the post_max_size directive in php.ini. If your server configuration allows it, you may add a directive in your .htaccess, for example:')
-						.'<br/><a href="?tab=AdminGenerator&amp;token='
-						.Tools::getAdminTokenLite('AdminGenerator').'" >'
-						.'<code>php_value post_max_size 20M</code> '.
-						Tools::displayError('(clic to open Generator tab)').'</a>';
-						break;
-					break;
-					case UPLOAD_ERR_PARTIAL:
-						$this->_errors[] = Tools::displayError('The uploaded file was only partially uploaded.');
-						break;
-					break;
-					case UPLOAD_ERR_NO_FILE:
-						$this->_errors[] = Tools::displayError('No file was uploaded');
-						break;
-					break;
-				}
-			}
-			elseif (!file_exists($_FILES['file']['tmp_name']) OR !@move_uploaded_file($_FILES['file']['tmp_name'], dirname(__FILE__).'/../import/'.$_FILES['file']['name'].'.'.date('Ymdhis')))
-				$this->_errors[] = $this->l('an error occurred while uploading and copying file');
-			else
-				Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=18');
-		}
-		elseif (Tools::isSubmit('submitImportFile'))
-			$this->displayCSV();
-		elseif (Tools::getValue('import'))
-		{
-			if (Tools::getValue('truncate'))
-				$this->truncateTables((int)(Tools::getValue('entity')));
-
-			switch ((int)(Tools::getValue('entity')))
-			{
-				case $this->entities[$this->l('Categories')]:
-					$this->categoryImport();
-				break;
-				case $this->entities[$this->l('Products')]:
-					$this->productImport();
-				break;
-				case $this->entities[$this->l('Customers')]:
-					$this->customerImport();
-				break;
-				case $this->entities[$this->l('Addresses')]:
-					$this->addressImport();
-				break;
-				case $this->entities[$this->l('Combinations')]:
-					$this->attributeImport();
-				break;
-				case $this->entities[$this->l('Manufacturers')]:
-					$this->manufacturerImport();
-				break;
-				case $this->entities[$this->l('Suppliers')]:
-					$this->supplierImport();
-				break;
-				default:
-					$this->_errors[] = $this->l('no entity selected');
-			}
-		}
-
-		parent::postProcess();
-	}
-
-	public static function setLocale()
-	{
-		$iso_lang  = trim(Tools::getValue('iso_lang'));
-		setlocale(LC_COLLATE, strtolower($iso_lang).'_'.strtoupper($iso_lang).'.UTF-8');
-		setlocale(LC_CTYPE, strtolower($iso_lang).'_'.strtoupper($iso_lang).'.UTF-8');
-	}
-
-	protected function _addProductWarning($product_name, $product_id = NULL, $message = '')
-	{
-		$this->_warnings[] = $product_name.(isset($product_id) ? ' (ID '.$product_id.')' : '').' '.Tools::displayError($message);
-	}
-}
diff --git a/admin-dev/themes/template/import/form.tpl b/admin-dev/themes/template/import/form.tpl
new file mode 100644
index 000000000..7c1ac1c71
--- /dev/null
+++ b/admin-dev/themes/template/import/form.tpl
@@ -0,0 +1,234 @@
+{*
+* 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 <contact@prestashop.com>
+*  @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}
+	<div class="toolbar-placeholder">
+		<div class="toolbarBox{if $toolbar_fix} toolbarHead{/if}">
+				{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
+				<div class="pageTitle">
+				<h3>
+					<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
+				</h3>
+				</div>
+			<div class="leadin">{block name="leadin"}{/block}</div>
+		</div>
+	</div>
+{/if}
+
+{if $module_confirmation}
+	<div class="module_confirmation conf confirm"><img src="../img/admin/ok.gif" alt="" title="" style="margin-right:5px; float:left;" />
+		{l s='The .CSV file has been imported into your shop.'}
+	</div>
+{/if}
+
+<script type="text/javascript">
+
+	$(document).ready(function(){
+		activeClueTip();
+	});
+
+	function activeClueTip()
+	{
+		$('.info').cluetip({
+			splitTitle: '|',
+		    showTitle: false
+	 	});
+
+		$('#preview_import').submit(function() {
+			if ($('#truncate').get(0).checked)
+			{
+				if (confirm('{l s="Are you sure you want to delete"}' + ' ' + $('#entity > option:selected').text().toLowerCase() + '{l s="?"}'))
+				{
+					this.submit();
+				}
+				else
+				{
+					return false;
+				}
+			}
+		});
+	};
+
+</script>
+
+<fieldset style="float: left; margin: 0pt 20px 0pt 0pt; height: 160px;width: 666px;">
+	<legend><img src="../img/admin/import.gif" />{l s='Upload'}</legend>
+	<form action="{$current}&token={$token}" method="POST" enctype="multipart/form-data">
+		<label class="clear">{l s='Select a file:'} </label>
+		<div class="margin-form">
+			<input name="file" type="file" /><br />{l s='You can also upload your file by FTP and put it in'} {$path_import}.
+		</div>
+		<div class="margin-form">
+			<input type="submit" name="submitFileUpload" value="{l s='Upload'}" class="button" />
+		</div>
+		<div class="margin-form">
+			{l s='Allowed files are only UTF-8 and iso-8859-1 encoded ones'}
+		</div>
+	</form>
+</fieldset>
+
+<fieldset>
+	<legend><img src="../img/admin/excel_file.png">{l s='Sample files'}</legend>
+		<ul style="">
+			<li style="text-decoration: underline"><a href="../docs/csv_import/categories_import.csv">{l s='Categories sample file'}</a></li>
+			<li style="text-decoration: underline"><a href="../docs/csv_import/products_import.csv">{l s='Products sample file'}</a></li>
+			<li style="text-decoration: underline"><a href="../docs/csv_import/combinations_import.csv">{l s='Combinations sample file'}</a></li>
+			<li style="text-decoration: underline"><a href="../docs/csv_import/customers_import.csv">{l s='Customers sample file'}</a></li>
+			<li style="text-decoration: underline"><a href="../docs/csv_import/addresses_import.csv">{l s='Addresses sample file'}</a></li>
+			<li style="text-decoration: underline"><a href="../docs/csv_import/manufacturers_import.csv">{l s='Manufacturers sample file'}</a></li>
+			<li style="text-decoration: underline"><a href="../docs/csv_import/suppliers_import.csv">{l s='Suppliers sample file'}</a></li>
+		</ul>
+</fieldset>
+
+<div class="clear">&nbsp;</div>
+
+<form id="preview_import"
+	action="{$current}&token={$token}"
+	method="post"
+	style="display:inline"
+	enctype="multipart/form-data"
+	class="clear">
+	<fieldset style="float: left; margin: 0pt 20px 0pt 0pt; width: 666px;">
+		<legend><img src="../img/admin/import.gif" />{l s='Import'}</legend>
+		<label class="clear">{l s='Select which entity to import:'} </label>
+		<div class="margin-form">
+			<select name="entity" id="entity">';
+				{foreach $entities AS $entity => $i}
+					<option value="{$i}"
+						{if $entity == $i}selected="selected"{/if}>
+						{$entity}
+					</option>
+				{/foreach}
+			</select>
+		</div>
+
+		{if count($files_to_import)}
+			<label class="clear">{l s='Select your .CSV file:'} </label>
+			<div class="margin-form">
+				<select name="csv">
+					{foreach $files_to_import AS $filename}
+						<option value="{$filename}">{$filename}</option>
+					{/foreach}
+				</select>
+				({count($files_to_import)} {if count($files_to_import) > 1} {l s='files available'}{else}{l s='file available'}{/if})
+			</div>
+			<label class="clear">{l s='Select language of the file (the locale must be installed):'} </label>
+			<div class="margin-form">
+				<select name="iso_lang">';
+					{foreach $languages AS $lang}
+						<option value="{$lang.iso_code}" {if $lang.id_lang == $id_language} selected="selected"{/if}>{$lang.name}</option>
+					{/foreach}
+				</select>
+			</div>
+			<label for="convert" class="clear">{l s='iso-8859-1 encoded file:'} </label>
+			<div class="margin-form">
+				<input name="convert" id="convert" type="checkbox" style="margin-top: 6px;"/>
+			</div>
+			<label class="clear">{l s='Field separator:'} </label>
+			<div class="margin-form">
+				<input type="text" size="2" value=";" name="separator"/>
+				{l s='e.g. '}"1<span class="bold" style="color: red">;</span>Ipod<span class="bold" style="color: red">;</span>129.90<span class="bold" style="color: red">;</span>5"
+			</div>
+			<label class="clear">{l s='Multiple value separator:'} </label>
+			<div class="margin-form">
+				<input type="text" size="2" value="," name="multiple_value_separator"/>
+				{l s='e.g. '}"Ipod;red.jpg<span class="bold" style="color: red">,</span>blue.jpg<span class="bold" style="color: red">,</span>green.jpg;129.90"
+			</div>
+			<label for="truncate" class="clear">{l s='Delete all'} <span id="entitie">{l s='categories'}</span> {l s='before import ?'} </label>
+			<div class="margin-form">
+				<input name="truncate" id="truncate" type="checkbox"/>
+			</div>
+			<label for="match_ref" class="clear" style="display: none">{l s='Use product reference as key ?'}</label>
+			<div class="margin-form">
+				<input name="match_ref" id="match_ref" type="checkbox" style="margin-top: 6px; display:none"/>
+			</div>
+			<div class="space margin-form">
+				<input type="submit" name="submitImportFile" value="{l s='Next step'}" class="button"/>
+			</div>
+			<div class="warn">
+				<p>{l s='Note that the category import does not support categories of the same name'}.</p>
+
+				<p>{l s='Note that references are not specified as UNIQUE in the database'}.</p>
+			</div>
+		{else}
+			<div class="warn">
+				{l s='No CSV file is available, please upload one file above.'}<br /><br />
+				{l s='You can get many informations about CSV import at:'} <a href="http://www.prestashop.com/wiki/Troubleshooting_6/" target="_blank">http://www.prestashop.com/wiki/Troubleshooting_6/</a><br /><br />
+				{l s='More about CSV format at: '} <a href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">http://en.wikipedia.org/wiki/Comma-separated_values</a>
+			</div>
+		{/if}
+	</fieldset>
+</form>
+
+<fieldset>
+
+	<legend>
+		<img src="../img/admin/import.gif" />{l s='Fields available'}
+	</legend>
+
+	<div id="availableFields" style="min-height: 218px; width: 300px;">
+		{$available_fields}
+	</div>
+
+	<div class="clear">
+		<br /><br />{l s='* Required Fields'}
+	</div>
+
+</fieldset>
+		
+<div class="clear">&nbsp;</div>
+
+<script type="text/javascript">
+	$("select#entity").change( function() {
+
+		if ($("#entity > option:selected").val() != 1)
+		{
+			$("label[for=match_ref],#match_ref").hide();
+		}
+
+		if ($("#entity > option:selected").val() == 1)
+		{
+			$("label[for=match_ref],#match_ref").show();
+		}
+
+		$("#entitie").html($("#entity > option:selected").text().toLowerCase());
+		$.getJSON("ajax.php",
+		{
+			getAvailableFields:1,
+			entity: $("#entity").val()
+		},
+		function(j)
+		{
+			var fields = "";
+			$("#availableFields").empty();
+			for (var i = 0; i < j.length; i++)
+				fields += j[i].field;
+			$("#availableFields").html(fields);
+			activeClueTip();
+		});
+
+	});
+</script>
diff --git a/admin-dev/themes/template/import/view.tpl b/admin-dev/themes/template/import/view.tpl
new file mode 100644
index 000000000..1a0f334c8
--- /dev/null
+++ b/admin-dev/themes/template/import/view.tpl
@@ -0,0 +1,125 @@
+{*
+* 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 <contact@prestashop.com>
+*  @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
+*}
+
+{extends file="helper/view/view.tpl"}
+
+{block name="override_tpl"}
+	<script src="../js/adminImport.js"></script>
+	<script type="text/javascript">
+		var errorEmpty = "{l s='Please enter a name to save.'}"
+	</script>
+	<h2>{l s='Your data'}</h2>
+	<div style="float:right">
+		<b>{l s='Save and load your matching configuration'} : </b><br><br>
+		<input type="text" name="newImportMatchs" id="newImportMatchs">
+		<a id="saveImportMatchs" class="button" href="#">{l s='Save'}</a><br><br>
+		<div id="selectDivImportMatchs" {if !$import_matchs}style="display:none"{/if}>
+			<select id="valueImportMatchs">
+				{foreach $import_matchs as $match}
+					<option id="{$match.id_import_match}" value="{$match.match}">{$match.name}</option>
+				{/foreach}
+			</select>
+			<a class="button" id="loadImportMatchs" href="#">{l s='Load'}</a>
+			<a class="button" id="deleteImportMatchs" href="#">{l s='Delete'}</a>
+		</div>
+	</div>
+
+	<h3>{l s='Please set the value type of each column'}</h3>
+
+	<div id="error_duplicate_type" class="warning warn" style="display:none;">
+		<h3>{l s='Columns cannot have the same value type'}</h3>
+	</div>
+
+	<div id="required_column" class="warning warn" style="display:none;">
+		<h3>'.Tools::displayError('Column').' <span id="missing_column">&nbsp;</span> '.Tools::displayError('must be set').'</h3>
+	</div>
+
+	<form action="{$current}&token={$token}" method="post" id="import_form" name="import_form">
+		{l s='Skip'} <input type="text" size="2" name="skip" value="0" /> {l s='lines'}
+		<input type="hidden" name="csv" value="{$fields_value.csv}" />
+		<input type="hidden" name="convert" value="{$fields_value.convert}" />
+		<input type="hidden" name="entity" value="{$fields_value.entity}" />
+		<input type="hidden" name="iso_lang" value="{$fields_value.iso_lang}" />
+		{if $fields_value.truncate}
+			<input type="hidden" name="truncate" value="1" />
+		{/if}
+		{if $fields_value.match_ref}
+			<input type="hidden" name="match_ref" value="1" />
+		{/if}
+		<input type="hidden" name="separator" value="{$fields_value.separator}">
+		<input type="hidden" name="multiple_value_separator" value="{$fields_value.multiple_value_separator}">
+		<script type="text/javascript">
+			var current = 0;
+			function showTable(nb)
+			{
+				getE('btn_left').disabled = null;
+				getE('btn_right').disabled = null;
+				if (nb <= 0)
+				{
+					nb = 0;
+					getE('btn_left').disabled = 'true';
+				}
+				if (nb >= {$nb_table} - 1)
+				{
+					nb = {$nb_table} - 1;
+					getE('btn_right').disabled = 'true';
+				}
+				toggle(getE('table'+current), false);
+				current = nb;
+				toggle(getE('table'+current), true);
+			}
+		</script>
+
+		<table>
+			<tr>
+				<td colspan="3" align="center">
+					<input name="import" type="submit" onclick="return (validateImportation(new Array({$res})));" id="import" value="{l s='Import CSV data'}" class="button" />
+				</td>
+			</tr>
+			<tr>
+				<td valign="top" align="center">
+					<input id="btn_left" value="{l s='<<'}" type="button" class="button" onclick="showTable(current - 1)" />
+				</td>
+				<td align="left">
+					{section name=nb_i start=0 loop=$nb_table step=1}
+						{assign var=i value=$smarty.section.nb_i.index}
+						{$data.$i}
+					{/section}
+				</td>
+				<td valign="top" align="center">
+					<input id="btn_right" value="{l s='>>'}" type="button" class="button" onclick="showTable(current + 1)" />
+				</td>
+			</tr>
+			<tr>
+				<td colspan="3" align="center">
+					<input name="import" type="submit" onclick="return (validateImportation(new Array({$res})));" id="import" value="{l s='Import CSV data'}" class="button" />
+				</td>
+			</tr>
+		</table>
+		<script type="text/javascript">showTable(current);</script>
+	</form>
+{/block}
+
diff --git a/classes/Address.php b/classes/Address.php
index 83e83b7d7..9b2a8f974 100644
--- a/classes/Address.php
+++ b/classes/Address.php
@@ -333,7 +333,7 @@ class AddressCore extends ObjectModel
 			$address = new Address((int)$id_address);
 
 			if (!Validate::isLoadedObject($address))
-				throw new Exception('Invalid address');
+				throw new PrestashopException('Invalid address');
 		}
 
 		return $address;
diff --git a/classes/HelperForm.php b/classes/HelperForm.php
index b39410e12..b2a4c2e4a 100644
--- a/classes/HelperForm.php
+++ b/classes/HelperForm.php
@@ -86,7 +86,6 @@ class HelperFormCore extends Helper
 			'title' => $this->title,
 			'firstCall' => $this->first_call,
 			'current' => $this->currentIndex,
-			'title' => $this->title,
 			'token' => $this->token,
 			'table' => $this->table,
 			'languages' => $this->languages,
diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php
index a575db629..389116d39 100644
--- a/classes/shop/Shop.php
+++ b/classes/shop/Shop.php
@@ -259,6 +259,28 @@ class ShopCore extends ObjectModel
 		return $shop;
 	}
 
+	/**
+	* @return Address the current shop address
+	*/
+	public function getAddress()
+	{
+		if (!isset($this->address))
+		{
+			$address = new Address();
+			$address->company = Configuration::get('PS_SHOP_NAME');
+			$address->id_country = Configuration::get('PS_SHOP_COUNTRY_ID');
+			$address->id_state = Configuration::get('PS_SHOP_STATE_ID');
+			$address->address1 = Configuration::get('PS_SHOP_ADDR1');
+			$address->address2 = Configuration::get('PS_SHOP_ADDR2');
+			$address->postcode = Configuration::get('PS_SHOP_CODE');
+			$address->city = Configuration::get('PS_SHOP_CITY');
+
+			$this->address = $address;
+		}
+
+		return $this->address;
+	}
+
 	/**
 	 * Get shop theme name
 	 *
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
new file mode 100644
index 000000000..ebb701d3a
--- /dev/null
+++ b/controllers/admin/AdminImportController.php
@@ -0,0 +1,1827 @@
+<?php
+/*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 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
+* 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 <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 8971 $
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+@ini_set('max_execution_time', 0);
+/** No max line limit since the lines can be more than 4096. Performance impact is not significant. */
+define('MAX_LINE_SIZE', 0);
+
+/** Used for validatefields diying without user friendly error or not */
+define('UNFRIENDLY_ERROR', false);
+
+/** this value set the number of columns visible on each page */
+define('MAX_COLUMNS', 6);
+
+/** correct Mac error on eof */
+@ini_set('auto_detect_line_endings', '1');
+
+class AdminImportController extends AdminController
+{
+	public static $column_mask;
+
+	public $entities = array();
+
+	public $available_fields = array();
+
+	public static $required_fields = array('name');
+
+	public static $default_values = array();
+
+	public static $validators = array(
+		'active' => array('AdminImportController', 'getBoolean'),
+		'tax_rate' => array('AdminImportController', 'getPrice'),
+		 /** Tax excluded */
+		'price_tex' => array('AdminImportController', 'getPrice'),
+		 /** Tax included */
+		'price_tin' => array('AdminImportController', 'getPrice'),
+		'reduction_price' => array('AdminImportController', 'getPrice'),
+		'reduction_percent' => array('AdminImportController', 'getPrice'),
+		'wholesale_price' => array('AdminImportController', 'getPrice'),
+		'ecotax' => array('AdminImportController', 'getPrice'),
+		'name' => array('AdminImportController', 'createMultiLangField'),
+		'description' => array('AdminImportController', 'createMultiLangField'),
+		'description_short' => array('AdminImportController', 'createMultiLangField'),
+		'meta_title' => array('AdminImportController', 'createMultiLangField'),
+		'meta_keywords' => array('AdminImportController', 'createMultiLangField'),
+		'meta_description' => array('AdminImportController', 'createMultiLangField'),
+		'link_rewrite' => array('AdminImportController', 'createMultiLangField'),
+		'available_now' => array('AdminImportController', 'createMultiLangField'),
+		'available_later' => array('AdminImportController', 'createMultiLangField'),
+		'category' => array('AdminImportController', 'split'),
+		'online_only' => array('AdminImportController', 'getBoolean')
+	);
+
+	public function __construct()
+	{
+		$this->entities = array_flip(array(
+			$this->l('Categories'),
+			$this->l('Products'),
+			$this->l('Combinations'),
+			$this->l('Customers'),
+			$this->l('Addresses'),
+			$this->l('Manufacturers'),
+			$this->l('Suppliers')
+		));
+
+		switch ((int)Tools::getValue('entity'))
+		{
+			case $this->entities[$this->l('Combinations')]:
+				self::$required_fields = array(
+					'id_product',
+					'group',
+					'attribute'
+				);
+
+				$this->available_fields = array(
+					'no' => array('label' => $this->l('Ignore this column')),
+					'id_product' => array('label' => $this->l('Product ID').'*'),
+					'group' => array(
+						'label' => $this->l('Group (Name:Position)').'*',
+						'help' => $this->l('Position of the group attribute.')
+					),
+					'attribute' => array(
+						'label' => $this->l('Attribute (Value:Position)').'*',
+						'help' => $this->l('Position of the attribute in the attribute group.')
+					),
+					'reference' => array('label' => $this->l('Reference')),
+					'supplier_reference' => array('label' => $this->l('Supplier reference')),
+					'ean13' => array('label' => $this->l('EAN13')),
+					'upc' => array('label' => $this->l('UPC')),
+					'wholesale_price' => array('label' => $this->l('Wholesale price')),
+					'price' => array('label' => $this->l('Price')),
+					'ecotax' => array('label' => $this->l('Ecotax')),
+					'quantity' => array('label' => $this->l('Quantity')),
+					'weight' => array('label' => $this->l('Weight')),
+					'default_on' => array('label' => $this->l('Default')),
+					'image_position' => array(
+						'label' => $this->l('Image position'),
+						'help' => $this->l('Position of the product image to use for this combination. If you use this field, leave image URL empty.')
+					),
+					'image_url' => array('label' => $this->l('Image URL')),
+					'delete_existing_images' => array(
+						'label' => $this->l('Delete existing images (0 = no, 1 = yes)'),
+						'help' => $this->l('If you do not specify this column and you specify the column images,
+							all images of the product will be replaced by those specified in the import file')
+					),
+				);
+
+				self::$default_values = array(
+					'reference' => '',
+					'supplier_reference' => '',
+					'ean13' => '',
+					'upc' => '',
+					'wholesale_price' => 0,
+					'price' => 0,
+					'ecotax' => 0,
+					'quantity' => 0,
+					'weight' => 0,
+					'default_on' => 0
+				);
+			break;
+
+			case $this->entities[$this->l('Categories')]:
+				$this->available_fields = array(
+					'no' => array('label' => $this->l('Ignore this column')),
+					'id' => array('label' => $this->l('ID')),
+					'active' => array('label' => $this->l('Active (0/1)')),
+					'name' => array('label' => $this->l('Name *')),
+					'parent' => array('label' => $this->l('Parent category')),
+					'description' => array('label' => $this->l('Description')),
+					'meta_title' => array('label' => $this->l('Meta-title')),
+					'meta_keywords' => array('label' => $this->l('Meta-keywords')),
+					'meta_description' => array('label' => $this->l('Meta-description')),
+					'link_rewrite' => array('label' => $this->l('URL rewritten')),
+					'image' => array('label' => $this->l('Image URL')),
+				);
+
+				self::$default_values = array(
+					'active' => '1',
+					'parent' => '1',
+					'link_rewrite' => ''
+				);
+			break;
+
+			case $this->entities[$this->l('Products')]:
+				self::$validators['image'] = array(
+					'AdminImportController',
+					'split'
+				);
+
+				$this->available_fields = array(
+					'no' => array('label' => $this->l('Ignore this column')),
+					'id' => array('label' => $this->l('ID')),
+					'active' => array('label' => $this->l('Active (0/1)')),
+					'name' => array('label' => $this->l('Name *')),
+					'category' => array('label' => $this->l('Categories (x,y,z...)')),
+					'price_tex' => array('label' => $this->l('Price tax excl.')),
+					'price_tin' => array('label' => $this->l('Price tax incl.')),
+					'id_tax_rules_group' => array('label' => $this->l('Tax rules id')),
+					'wholesale_price' => array('label' => $this->l('Wholesale price')),
+					'on_sale' => array('label' => $this->l('On sale (0/1)')),
+					'reduction_price' => array('label' => $this->l('Discount amount')),
+					'reduction_percent' => array('label' => $this->l('Discount percent')),
+					'reduction_from' => array('label' => $this->l('Discount from (yyyy-mm-dd)')),
+					'reduction_to' => array('label' => $this->l('Discount to (yyyy-mm-dd)')),
+					'reference' => array('label' => $this->l('Reference #')),
+					'supplier_reference' => array('label' => $this->l('Supplier reference #')),
+					'supplier' => array('label' => $this->l('Supplier')),
+					'manufacturer' => array('label' => $this->l('Manufacturer')),
+					'ean13' => array('label' => $this->l('EAN13')),
+					'upc' => array('label' => $this->l('UPC')),
+					'ecotax' => array('label' => $this->l('Ecotax')),
+					'weight' => array('label' => $this->l('Weight')),
+					'quantity' => array('label' => $this->l('Quantity')),
+					'description_short' => array('label' => $this->l('Short description')),
+					'description' => array('label' => $this->l('Description')),
+					'tags' => array('label' => $this->l('Tags (x,y,z...)')),
+					'meta_title' => array('label' => $this->l('Meta-title')),
+					'meta_keywords' => array('label' => $this->l('Meta-keywords')),
+					'meta_description' => array('label' => $this->l('Meta-description')),
+					'link_rewrite' => array('label' => $this->l('URL rewritten')),
+					'available_now' => array('label' => $this->l('Text when in-stock')),
+					'available_later' => array('label' => $this->l('Text if back-order allowed')),
+					'available_for_order' => array('label' => $this->l('Available for order')),
+					'date_add' => array('label' => $this->l('Date add product')),
+					'show_price' => array('label' => $this->l('Show price')),
+					'image' => array('label' => $this->l('Image URLs (x,y,z...)')),
+					'delete_existing_images' => array(
+						'label' => $this->l('Delete existing images (0 = no, 1 = yes)'),
+						'help' => $this->l('If you do not specify this column and you specify the column images,
+							all images of the product will be replaced by those specified in the import file')
+					),
+					'features' => array('label' => $this->l('Feature(Name:Value:Position)'),
+						'help' => $this->l('Position of the feature.')),
+					'online_only' => array('label' => $this->l('Only available online')),
+					'condition' => array('label' => $this->l('Condition')),
+					'shop' => array(
+						'label' => $this->l('ID / Name of shop'),
+						'help' => $this->l('Ignore this field if you don\'t use multishop tool. If you leave this field empty, default shop will be used'),
+					),
+				);
+
+				self::$default_values = array(
+					'id_category' => array(1),
+					'id_category_default' => 1,
+					'active' => '1',
+					'quantity' => 0,
+					'price' => 0,
+					'id_tax_rules_group' => 0,
+					'description_short' => array((int)Configuration::get('PS_LANG_DEFAULT') => ''),
+					'link_rewrite' => array((int)Configuration::get('PS_LANG_DEFAULT') => ''),
+					'online_only' => 0,
+					'condition' => 'new',
+					'shop' => Configuration::get('PS_SHOP_DEFAULT'),
+					'date_add' => date('Y-m-d H:i:s'),
+					'condition' => 'new',
+				);
+			break;
+
+			case $this->entities[$this->l('Customers')]:
+				//Overwrite required_fields AS only email is required whereas other entities
+				self::$required_fields = array('email', 'passwd', 'lastname', 'firstname');
+
+				$this->available_fields = array(
+					'no' => array('label' => $this->l('Ignore this column')),
+					'id' => array('label' => $this->l('ID')),
+					'active' => array('label' => $this->l('Active  (0/1)')),
+					'id_gender' => array('label' => $this->l('Gender ID (Mr = 1, Ms = 2, else 0)')),
+					'email' => array('label' => $this->l('E-mail *')),
+					'passwd' => array('label' => $this->l('Password *')),
+					'birthday' => array('label' => $this->l('Birthday (yyyy-mm-dd)')),
+					'lastname' => array('label' => $this->l('Lastname *')),
+					'firstname' => array('label' => $this->l('Firstname *')),
+					'newsletter' => array('label' => $this->l('Newsletter (0/1)')),
+					'optin' => array('label' => $this->l('Opt in (0/1)')),
+					'id_shop' => array(
+						'label' => $this->l('ID / Name of shop'),
+						'help' => $this->l('Ignore this field if you don\'t use multishop tool. If you leave this field empty, default shop will be used'),
+					),
+				);
+
+				self::$default_values = array(
+					'active' => '1',
+					'id_shop' => Configuration::get('PS_SHOP_DEFAULT'),
+				);
+			break;
+
+			case $this->entities[$this->l('Addresses')]:
+				//Overwrite required_fields
+				self::$required_fields = array(
+					'lastname',
+					'firstname',
+					'address1',
+					'postcode',
+					'country',
+					'city'
+				);
+
+				$this->available_fields = array(
+					'no' => array('label' => $this->l('Ignore this column')),
+					'id' => array('label' => $this->l('ID')),
+					'alias' => array('label' => $this->l('Alias *')),
+					'active' => array('label' => $this->l('Active  (0/1)')),
+					'customer_email' => array('label' => $this->l('Customer e-mail')),
+					'manufacturer' => array('label' => $this->l('Manufacturer')),
+					'supplier' => array('label' => $this->l('Supplier')),
+					'company' => array('label' => $this->l('Company')),
+					'lastname' => array('label' => $this->l('Lastname *')),
+					'firstname' => array('label' => $this->l('Firstname *')),
+					'address1' => array('label' => $this->l('Address 1 *')),
+					'address2' => array('label' => $this->l('Address 2')),
+					'postcode' => array('label' => $this->l('Postcode*/ Zipcode*')),
+					'city' => array('label' => $this->l('City *')),
+					'country' => array('label' => $this->l('Country *')),
+					'state' => array('label' => $this->l('State')),
+					'other' => array('label' => $this->l('Other')),
+					'phone' => array('label' => $this->l('Phone')),
+					'phone_mobile' => array('label' => $this->l('Mobile Phone')),
+					'vat_number' => array('label' => $this->l('VAT number')),
+				);
+
+				self::$default_values = array(
+					'alias' => 'Alias',
+					'postcode' => 'X'
+				);
+			break;
+
+			case $this->entities[$this->l('Manufacturers')]:
+			case $this->entities[$this->l('Suppliers')]:
+				//Overwrite validators AS name is not MultiLangField
+				self::$validators = array(
+					'description' => array('AdminImportController', 'createMultiLangField'),
+					'description_short' => array('AdminImportController', 'createMultiLangField'),
+					'meta_title' => array('AdminImportController', 'createMultiLangField'),
+					'meta_keywords' => array('AdminImportController', 'createMultiLangField'),
+					'meta_description' => array('AdminImportController', 'createMultiLangField'),
+				);
+
+				$this->available_fields = array(
+					'no' => array('label' => $this->l('Ignore this column')),
+					'id' => array('label' => $this->l('ID')),
+					'active' => array('label' => $this->l('Active (0/1)')),
+					'name' => array('label' => $this->l('Name *')),
+					'description' => array('label' => $this->l('Description')),
+					'short_description' => array('label' => $this->l('Short description')),
+					'meta_title' => array('label' => $this->l('Meta-title')),
+					'meta_keywords' => array('label' => $this->l('Meta-keywords')),
+					'meta_description' => array('label' => $this->l('Meta-description')),
+					'shop' => array(
+						'label' => $this->l('ID / Name of group shop'),
+						'help' => $this->l('Ignore this field if you don\'t use multishop tool. If you leave this field empty, default shop will be used'),
+					),
+				);
+
+				self::$default_values = array(
+					'shop' => Shop::getGroupFromShop(Configuration::get('PS_SHOP_DEFAULT')),
+				);
+			break;
+		}
+
+		parent::__construct();
+	}
+
+	public function initForm()
+	{
+		if (!is_writable(_PS_ADMIN_DIR_.'/import/'))
+			$this->displayWarning($this->l('directory import on admin directory must be writable (CHMOD 755 / 777)'));
+
+		if (isset($this->warnings) && count($this->warnings))
+		{
+			$warnings = array();
+			foreach ($this->warnings as $warning)
+				$warnings[] = $warning;
+			$this->displayWarning($warnings);
+		}
+
+		$files_to_import = scandir(_PS_ADMIN_DIR_.'/import/');
+		uasort($files_to_import, array('AdminImportController', 'usortFiles'));
+		foreach ($files_to_import as $k => &$filename)
+			//exclude .  ..  .svn and index.php and all hidden files
+			if (preg_match('/^\..*|index\.php/i', $filename))
+				unset($files_to_import[$k]);
+		unset($filename);
+
+		$this->fields_form = array('');
+
+		$this->toolbar_fix = false;
+		$this->toolbar_btn = array();
+
+		$this->tpl_form_vars = array(
+			'module_confirmation' => (Tools::getValue('import')) && (isset($this->warnings) && !count($this->warnings)),
+			'path_import' => _PS_ADMIN_DIR_.'/import/',
+			'entities' => $this->entities,
+			'entity' => Tools::getValue('entity'),
+			'files_to_import' => $files_to_import,
+			'languages' => Language::getLanguages(false),
+			'id_language' => $this->context->language->id,
+			'available_fields' => $this->getAvailableFields()
+		);
+
+		return parent::initForm();
+	}
+
+	public function initView()
+	{
+		$this->toolbar_fix = false;
+		$this->toolbar_btn = array(
+			'cancel' => array(
+				'href' => self::$currentIndex.'&token='.$this->token,
+				'desc' => $this->l('Cancel')
+			)
+		);
+
+		$glue = Tools::getValue('separator', ';');
+		$handle = $this->openCsvFile();
+		$nb_column = $this->getNbrColumn($handle, $glue);
+		$nb_table = ceil($nb_column / MAX_COLUMNS);
+
+		$res = array();
+		foreach (self::$required_fields as $elem)
+			$res[] = '\''.$elem.'\'';
+
+		$data = array();
+		for ($i = 0; $i < $nb_table; $i++)
+			$data[$i] = $this->generateContentTable($i, $nb_column, $handle, $glue);
+
+		$this->tpl_view_vars = array(
+			'import_matchs' => Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'import_match'),
+			'fields_value' => array(
+				'csv' => Tools::getValue('csv'),
+				'convert' => Tools::getValue('convert'),
+				'entity' => (int)Tools::getValue('entity'),
+				'iso_lang' => Tools::getValue('iso_lang'),
+				'truncate' => Tools::getValue('truncate'),
+				'match_ref' => Tools::getValue('match_ref'),
+				'separator' => strval(trim(Tools::getValue('separator'))),
+				'multiple_value_separator' => strval(trim(Tools::getValue('multiple_value_separator')))
+			),
+			'nb_table' => $nb_table,
+			'nb_column' => $nb_column,
+			'res' => implode(',', $res),
+			'max_columns' => MAX_COLUMNS,
+			'no_pre_select' => array('price_tin', 'feature'),
+			'available_fields' => $this->available_fields,
+			'data' => $data
+		);
+
+		return parent::initView();
+	}
+
+	private function generateContentTable($current_table, $nb_column, $handle, $glue)
+	{
+		$html = '<table id="table'.$current_table.'" style="display: none;" class="table" cellspacing="0" cellpadding="0">
+					<tr>';
+
+		// Header
+		for ($i = 0; $i < $nb_column; $i++)
+			if (MAX_COLUMNS * (int)$current_table <= $i && (int)$i < MAX_COLUMNS * ((int)$current_table + 1))
+				$html .= '<th style="width: '.(900 / MAX_COLUMNS).'px; vertical-align: top; padding: 4px">
+							<select onchange="askFeatureName(this, '.$i.');"
+								style="width: '.(900 / MAX_COLUMNS).'px;"
+								id="type_value['.$i.']"
+								name="type_value['.$i.']"
+								class="type_value">
+								'.$this->getTypeValuesOptions($i).'
+							</select>
+							<div id="features_'.$i.'" style="display: none;">
+								<input style="width: 90px" type="text" name="" id="feature_name_'.$i.'">
+								<input type="button" value="ok" onclick="replaceFeature($(\'#feature_name_'.$i.'\').attr(\'name\'), '.$i.');">
+							</div>
+						</th>';
+		$html .= '</tr>';
+
+		self::setLocale();
+		for ($current_line = 0; $current_line < 10 && $line = fgetcsv($handle, MAX_LINE_SIZE, $glue); $current_line++)
+		{
+			/* UTF-8 conversion */
+			if (Tools::getValue('convert'))
+				$line = $this->utf8EncodeArray($line);
+			$html .= '<tr id="table_'.$current_table.'_line_'.$current_line.'" style="padding: 4px">';
+			foreach ($line as $nb_c => $column)
+				if ((MAX_COLUMNS * (int)$current_table <= $nb_c) && ((int)$nb_c < MAX_COLUMNS * ((int)$current_table + 1)))
+					$html .= '<td>'.htmlentities(substr($column, 0, 200), ENT_QUOTES, 'UTF-8').'</td>';
+			$html .= '</tr>';
+		}
+		$html .= '</table>';
+		self::rewindBomAware($handle);
+		return $html;
+	}
+
+	public function init()
+	{
+		parent::init();
+		if (Tools::isSubmit('submitImportFile'))
+			$this->display = 'import';
+	}
+
+	public function initContent()
+	{
+		// toolbar (save, cancel, new, ..)
+		$this->initToolbar();
+		if ($this->display == 'import')
+			$this->content .= $this->initView();
+		else
+			$this->content .= $this->initForm();
+
+		$this->context->smarty->assign(array(
+			'content' => $this->content,
+			'url_post' => self::$currentIndex.'&token='.$this->token,
+		));
+	}
+
+	private static function rewindBomAware($handle)
+	{
+		// A rewind wrapper that skip BOM signature wrongly
+		rewind($handle);
+		if (($bom = fread($handle, 3)) != "\xEF\xBB\xBF")
+			rewind($handle);
+	}
+
+	private static function getBoolean($field)
+	{
+		return (boolean)$field;
+	}
+
+	private static function getPrice($field)
+	{
+		$field = ((float)str_replace(',', '.', $field));
+		$field = ((float)str_replace('%', '', $field));
+		return $field;
+	}
+
+	private static function split($field)
+	{
+		if (empty($field))
+			return array();
+
+		if (is_null(Tools::getValue('multiple_value_separator')) || trim(Tools::getValue('multiple_value_separator')) == '')
+			$separator = ',';
+		else
+			$separator = Tools::getValue('multiple_value_separator');
+
+		$temp = tmpfile();
+		fwrite($temp, $field);
+		rewind($temp);
+		$tab = fgetcsv($temp, MAX_LINE_SIZE, $separator);
+		fclose($temp);
+		if (empty($tab) || (!is_array($tab)))
+			return array();
+		return $tab;
+
+	}
+
+	private static function createMultiLangField($field)
+	{
+		$languages = Language::getLanguages(false);
+		$res = array();
+		foreach ($languages as $lang)
+			$res[$lang['id_lang']] = $field;
+		return $res;
+	}
+
+	private function getTypeValuesOptions($nb_c)
+	{
+		$i = 0;
+		$no_pre_select = array('price_tin', 'feature');
+
+		$options = '';
+		foreach ($this->available_fields as $k => $field)
+		{
+			$options .= '<option value="'.$k.'"';
+			if ($k === 'price_tin')
+				++$nb_c;
+			if ($i === ($nb_c + 1) && (!in_array($k, $no_pre_select)))
+				$options .= ' selected="selected"';
+			$options .= '>'.$field['label'].'</option>';
+			++$i;
+		}
+		return $options;
+	}
+
+	/*
+	* Return fields to be display AS piece of advise
+	*
+	* @param $in_array boolean
+	* @return string or return array
+	*/
+	public function getAvailableFields($in_array = false)
+	{
+		$i = 0;
+		$fields = array();
+		foreach ($this->available_fields as $k => $field)
+		{
+			if ($k === 'no')
+				continue;
+			if ($k === 'price_tin')
+				$fields[$i - 1]['label'] = $fields[$i - 1]['label'].' '.$this->l('or').' '.$field['label'];
+			else
+			{
+				if (isset($field['help']))
+					$html = '&nbsp;<a href="#" class="info" title="'.$this->l('Info').'|'.$field['help'].'"><img src="'._PS_ADMIN_IMG_.'information.png"></a>';
+				else
+					$html = '<span style="margin-left:16px"></span>';
+				$fields[] = '<div>'.$field['label'].$html.'</div>';
+			}
+			++$i;
+		}
+		if ($in_array)
+			return $fields;
+		else
+			return implode("\n\r", $fields);
+	}
+
+	private function receiveTab()
+	{
+		$type_value = Tools::getValue('type_value') ? Tools::getValue('type_value') : array();
+		foreach ($type_value as $nb => $type)
+			if ($type != 'no')
+				self::$column_mask[$type] = $nb;
+	}
+
+	public static function getMaskedRow($row)
+	{
+		$res = array();
+		foreach (self::$column_mask as $type => $nb)
+			$res[$type] = isset($row[$nb]) ? $row[$nb] : null;
+		return $res;
+	}
+
+	private static function setDefaultValues(&$info)
+	{
+		foreach (self::$default_values as $k => $v)
+			if (!isset($info[$k]) || $info[$k] == '')
+				$info[$k] = $v;
+	}
+
+	private static function setEntityDefaultValues(&$entity)
+	{
+		$members = get_object_vars($entity);
+		foreach (self::$default_values as $k => $v)
+			if ((array_key_exists($k, $members) && $entity->$k === null) || !array_key_exists($k, $members))
+				$entity->$k = $v;
+	}
+
+	private static function fillInfo($infos, $key, &$entity)
+	{
+		if (isset(self::$validators[$key][1]) && self::$validators[$key][1] == 'createMultiLangField' && Tools::getValue('iso_lang'))
+		{
+			$id_lang = Language::getIdByIso(Tools::getValue('iso_lang'));
+			$tmp = call_user_func(self::$validators[$key], $infos);
+			foreach ($tmp as $id_lang_tmp => $value)
+				if (empty($entity->{$key}[$id_lang_tmp]) || $id_lang_tmp == $id_lang)
+					$entity->{$key}[$id_lang_tmp] = $value;
+		}
+		else
+			$entity->{$key} = isset(self::$validators[$key]) ? call_user_func(self::$validators[$key], $infos) : $infos;
+		return true;
+	}
+
+	public static function arrayWalk(&$array, $funcname, &$user_data = false)
+	{
+		if (!is_callable($funcname)) return false;
+
+		foreach ($array as $k => $row)
+			if (!call_user_func_array($funcname, array($row, $k, $user_data)))
+				return false;
+		return true;
+	}
+
+	/**
+	 * copyImg copy an image located in $url and save it in a path
+	 * according to $entity->$id_entity .
+	 * $id_image is used if we need to add a watermark
+	 *
+	 * @param int $id_entity id of product or category (set in entity)
+	 * @param int $id_image (default null) id of the image if watermark enabled.
+	 * @param string $url path or url to use
+	 * @param string entity 'products' or 'categories'
+	 * @return void
+	 */
+	private static function copyImg($id_entity, $id_image = null, $url, $entity = 'products')
+	{
+		$tmpfile = tempnam(_PS_TMP_IMG_DIR_, 'ps_import');
+		$watermark_types = explode(',', Configuration::get('WATERMARK_TYPES'));
+
+		switch ($entity)
+		{
+			default:
+			case 'products':
+				$image_obj = new Image($id_image);
+				$path = $image_obj->getPathForCreation();
+			break;
+			case 'categories':
+				$path = _PS_CAT_IMG_DIR_.(int)$id_entity;
+			break;
+		}
+		$url = str_replace(' ', '%20', trim($url));
+		if (file_exists($url) && copy($url, $tmpfile))
+		{
+			imageResize($tmpfile, $path.'.jpg');
+			$images_types = ImageType::getImagesTypes($entity);
+			foreach ($images_types as $k => $image_type)
+				imageResize($tmpfile, $path.'-'.stripslashes($image_type['name']).'.jpg', $image_type['width'], $image_type['height']);
+			if (in_array($image_type['id_image_type'], $watermark_types))
+				Hook::exec('watermark', array('id_image' => $id_image, 'id_product' => $id_entity));
+		}
+		else
+		{
+			unlink($tmpfile);
+			return false;
+		}
+		unlink($tmpfile);
+		return true;
+	}
+
+	public function categoryImport()
+	{
+		$cat_moved = array();
+
+		$this->receiveTab();
+		$handle = $this->openCsvFile();
+		$default_language_id = (int)Configuration::get('PS_LANG_DEFAULT');
+		self::setLocale();
+		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
+		{
+			if (Tools::getValue('convert'))
+				$line = $this->utf8EncodeArray($line);
+			$info = self::getMaskedRow($line);
+
+			self::setDefaultValues($info);
+			$category = new Category();
+			self::arrayWalk($info, array('AdminImportController', 'fillInfo'), $category);
+
+			if (isset($category->parent) && is_numeric($category->parent))
+			{
+				if (isset($cat_moved[$category->parent]))
+					$category->parent = $cat_moved[$category->parent];
+				$category->id_parent = $category->parent;
+			}
+			else if (isset($category->parent) && is_string($category->parent))
+			{
+				$category_parent = Category::searchByName($default_language_id, $category->parent, true);
+				if ($category_parent['id_category'])
+					$category->id_parent =	(int)$category_parent['id_category'];
+				else
+				{
+					$category_to_create = new Category();
+					$category_to_create->name = self::createMultiLangField($category->parent);
+					$category_to_create->active = 1;
+					$category_to_create->id_parent = 1; // Default parent is home for unknown category to create
+					if (($field_error = $category_to_create->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+						($lang_field_error = $category_to_create->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $category_to_create->add())
+						$category->id_parent = $category_to_create->id;
+					else
+					{
+						$this->_errors[] = $category_to_create->name[$default_language_id].(isset($category_to_create->id) ? ' ('.$category_to_create->id.')' : '').
+							' '.Tools::displayError('Cannot be saved');
+						$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
+							Db::getInstance()->getMsgError();
+					}
+				}
+			}
+			if (isset($category->link_rewrite) && !empty($category->link_rewrite[$default_language_id]))
+				$valid_link = Validate::isLinkRewrite($category->link_rewrite[$default_language_id]);
+			else
+				$valid_link = false;
+
+			$bak = $category->link_rewrite[$default_language_id];
+			if ((isset($category->link_rewrite) && empty($category->link_rewrite[$default_language_id])) || !$valid_link)
+			{
+				$category->link_rewrite = Tools::link_rewrite($category->name[$default_language_id]);
+				if ($category->link_rewrite == '')
+				{
+					$category->link_rewrite = 'friendly-url-autogeneration-failed';
+					$this->warnings[] = Tools::displayError('URL rewriting failed to auto-generate a friendly URL for: ').$category->name[$default_language_id];
+				}
+				$category->link_rewrite = self::createMultiLangField($category->link_rewrite);
+			}
+
+			if (!$valid_link)
+				$this->warnings[] = Tools::displayError('Rewrite link for').' '.$bak.(isset($info['id']) ? ' (ID '.$info['id'].') ' : '').
+					' '.Tools::displayError('was re-written as').' '.$category->link_rewrite[$default_language_id];
+			$res = false;
+			if (($field_error = $category->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+				($lang_field_error = $category->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
+			{
+				$category_already_created = Category::searchByNameAndParentCategoryId(
+					$default_language_id,
+					$category->name[$default_language_id],
+					$category->id_parent
+				);
+
+				// If category already in base, get id category back
+				if ($category_already_created['id_category'])
+				{
+					$cat_moved[$category->id] = (int)$category_already_created['id_category'];
+					$category->id =	(int)$category_already_created['id_category'];
+				}
+
+				/* No automatic nTree regeneration for import */
+				$category->doNotRegenerateNTree = true;
+
+				// If id category AND id category already in base, trying to update
+				if ($category->id && $category->categoryExists($category->id))
+					$res = $category->update();
+
+				// If no id_category or update failed
+				if (!$res)
+					$res = $category->add();
+			}
+			//copying images of categories
+			if (isset($category->image) && !empty($category->image))
+				if (!(self::copyImg($category->id, null, $category->image, 'categories')))
+					$this->warnings[] = $category->image.' '.Tools::displayError('Cannot be copied');
+			// If both failed, mysql error
+			if (!$res)
+			{
+				$this->_errors[] = $info['name'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved');
+				$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
+					Db::getInstance()->getMsgError();
+			}
+		}
+
+		/* Import has finished, we can regenerate the categories nested tree */
+		Category::regenerateEntireNtree();
+
+		$this->closeCsvFile($handle);
+	}
+
+	public function productImport()
+	{
+		$this->receiveTab();
+		$handle = $this->openCsvFile();
+		$default_language_id = (int)Configuration::get('PS_LANG_DEFAULT');
+		self::setLocale();
+		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
+		{
+			if (Tools::getValue('convert'))
+				$line = $this->utf8EncodeArray($line);
+			$info = self::getMaskedRow($line);
+			if (array_key_exists('id', $info) && (int)$info['id'] && Product::existsInDatabase((int)$info['id'], 'product'))
+			{
+				$product = new Product((int)$info['id']);
+				$category_data = Product::getProductCategories((int)$product->id);
+				foreach ($category_data as $tmp)
+					$product->category[] = $tmp;
+			}
+			else
+				$product = new Product();
+			self::setEntityDefaultValues($product);
+			self::arrayWalk($info, array('AdminImportController', 'fillInfo'), $product);
+
+			if ((int)$product->id_tax_rules_group != 0)
+			{
+				if (Validate::isLoadedObject(new TaxRulesGroup($product->id_tax_rules_group)))
+				{
+					$address = $this->context->shop->getAddress();
+					$tax_manager = TaxManagerFactory::getManager($address, $product->id_tax_rules_group);
+                    $product_tax_calculator = $tax_manager->getTaxCalculator();
+					$product->tax_rate = $product_tax_calculator->getTotalRate();
+				}
+				else
+					$this->addProductWarning(
+						'id_tax_rules_group',
+						$product->id_tax_rules_group,
+						Tools::displayError('Invalid tax rule group ID, you first need a group with this ID.')
+					);
+			}
+			if (isset($product->manufacturer) && is_numeric($product->manufacturer) && Manufacturer::manufacturerExists((int)$product->manufacturer))
+				$product->id_manufacturer = (int)$product->manufacturer;
+			else if (isset($product->manufacturer) && is_string($product->manufacturer) && !empty($product->manufacturer))
+			{
+				if ($manufacturer = Manufacturer::getIdByName($product->manufacturer))
+					$product->id_manufacturer = (int)$manufacturer;
+				else
+				{
+					$manufacturer = new Manufacturer();
+					$manufacturer->name = $product->manufacturer;
+					if (($field_error = $manufacturer->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+						($lang_field_error = $manufacturer->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $manufacturer->add())
+						$product->id_manufacturer = (int)$manufacturer->id;
+					else
+					{
+						$this->_errors[] = $manufacturer->name.(isset($manufacturer->id) ? ' ('.$manufacturer->id.')' : '').' '.Tools::displayError('Cannot be saved');
+						$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
+							Db::getInstance()->getMsgError();
+					}
+				}
+			}
+
+			if (isset($product->supplier) && is_numeric($product->supplier) && Supplier::supplierExists((int)$product->supplier))
+				$product->id_supplier = (int)$product->supplier;
+			else if (isset($product->supplier) && is_string($product->supplier) && !empty($product->supplier))
+			{
+				if ($supplier = Supplier::getIdByName($product->supplier))
+					$product->id_supplier = (int)$supplier;
+				else
+				{
+					$supplier = new Supplier();
+					$supplier->name = $product->supplier;
+					if (($field_error = $supplier->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+						($lang_field_error = $supplier->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $supplier->add())
+						$product->id_supplier = (int)$supplier->id;
+					else
+					{
+						$this->_errors[] = $supplier->name.(isset($supplier->id) ? ' ('.$supplier->id.')' : '').' '.Tools::displayError('Cannot be saved');
+						$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
+							Db::getInstance()->getMsgError();
+					}
+				}
+			}
+
+			if (isset($product->price_tex) && !isset($product->price_tin))
+				$product->price = $product->price_tex;
+			else if (isset($product->price_tin) && !isset($product->price_tex))
+			{
+				$product->price = $product->price_tin;
+				// If a tax is already included in price, withdraw it from price
+				if ($product->tax_rate)
+					$product->price = (float)number_format($product->price / (1 + $product->tax_rate / 100), 6, '.', '');
+			}
+			else if (isset($product->price_tin) && isset($product->price_tex))
+				$product->price = $product->price_tex;
+
+			if (isset($product->category) && is_array($product->category) && count($product->category))
+			{
+				$product->id_category = array(); // Reset default values array
+
+				foreach ($product->category as $value)
+				{
+					if (is_numeric($value))
+					{
+						if (Category::categoryExists((int)$value))
+							$product->id_category[] = (int)$value;
+						else
+						{
+							$category_to_create = new Category();
+							$category_to_create->id = (int)$value;
+							$category_to_create->name = self::createMultiLangField($value);
+							$category_to_create->active = 1;
+							$category_to_create->id_parent = 1; // Default parent is home for unknown category to create
+							if (($field_error = $category_to_create->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+								($lang_field_error = $category_to_create->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $category_to_create->add())
+								$product->id_category[] = (int)$category_to_create->id;
+							else
+							{
+								$this->_errors[] = $category_to_create->name[$default_language_id].(isset($category_to_create->id) ? ' ('.$category_to_create->id.')' : '').
+									' '.Tools::displayError('Cannot be saved');
+								$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
+									Db::getInstance()->getMsgError();
+							}
+						}
+					}
+					else if (is_string($value) && !empty($value))
+					{
+						$category = Category::searchByName($default_language_id, $value, true);
+						if ($category['id_category'])
+							$product->id_category[] = (int)$category['id_category'];
+						else
+						{
+							$category_to_create = new Category();
+							$category_to_create->name = self::createMultiLangField($value);
+							$category_to_create->active = 1;
+							$category_to_create->id_parent = 1; // Default parent is home for unknown category to create
+							if (($field_error = $category_to_create->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+								($lang_field_error = $category_to_create->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $category_to_create->add())
+								$product->id_category[] = (int)$category_to_create->id;
+							else
+							{
+								$this->_errors[] = $category_to_create->name[$default_language_id].(isset($category_to_create->id) ? ' ('.$category_to_create->id.')' : '').
+									' '.Tools::displayError('Cannot be saved');
+								$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
+									Db::getInstance()->getMsgError();
+							}
+						}
+					}
+				}
+			}
+
+			$product->id_category_default = isset($product->id_category[0]) ? (int)$product->id_category[0] : '';
+			$link_rewrite = (is_array($product->link_rewrite) && count($product->link_rewrite)) ? $product->link_rewrite[$default_language_id] : '';
+
+			$valid_link = Validate::isLinkRewrite($link_rewrite);
+
+			if ((isset($product->link_rewrite[$default_language_id]) && empty($product->link_rewrite[$default_language_id])) || !$valid_link)
+			{
+				$link_rewrite = Tools::link_rewrite($product->name[$default_language_id]);
+				if ($link_rewrite == '')
+					$link_rewrite = 'friendly-url-autogeneration-failed';
+			}
+			if (!$valid_link)
+				$this->warnings[] = Tools::displayError('Rewrite link for').' '.$link_rewrite.(isset($info['id']) ? ' (ID '.$info['id'].') ' : '').
+					' '.Tools::displayError('was re-written as').' '.$link_rewrite;
+
+			$product->link_rewrite = self::createMultiLangField($link_rewrite);
+
+			$res = false;
+			$field_error = $product->validateFields(UNFRIENDLY_ERROR, true);
+			$lang_field_error = $product->validateFieldsLang(UNFRIENDLY_ERROR, true);
+			if ($field_error === true && $lang_field_error === true)
+			{
+				// check quantity
+				if ($product->quantity == null)
+					$product->quantity = 0;
+
+				// If match ref is specified && ref product && ref product already in base, trying to update
+				if (Tools::getValue('match_ref') == 1 && $product->reference && Product::existsRefInDatabase($product->reference))
+				{
+					$datas = Db::getInstance()->getRow('
+						SELECT `date_add`, `id_product`
+						FROM `'._DB_PREFIX_.'product`
+						WHERE `reference` = "'.$product->reference.'"
+					');
+					$product->id = pSQL($datas['id_product']);
+					$product->date_add = pSQL($datas['date_add']);
+					$res = $product->update();
+				} // Else If id product && id product already in base, trying to update
+				else if ($product->id && Product::existsInDatabase((int)$product->id, 'product'))
+				{
+					$datas = Db::getInstance()->getRow('SELECT `date_add` FROM `'._DB_PREFIX_.'product` WHERE `id_product` = '.(int)$product->id);
+					$product->date_add = pSQL($datas['date_add']);
+					$res = $product->update();
+				}
+				// If no id_product or update failed
+				if (!$res)
+				{
+					if (isset($product->date_add) && $product->date_add != '')
+						$res = $product->add(false);
+					else
+					$res = $product->add();
+				}
+			}
+			// If both failed, mysql error
+			if (!$res)
+			{
+				$this->_errors[] = $info['name'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved');
+				$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
+					Db::getInstance()->getMsgError();
+
+			}
+			else
+			{
+				// Associate product to shop
+				if (Shop::isFeatureActive() && $product->shop)
+				{
+					$product->shop = explode(',', $product->shop);
+					$shops = array();
+					foreach ($product->shop as $shop)
+					{
+						$shop = trim($shop);
+						if (!is_numeric($shop))
+							$shop = Shop::getIdByName($shop);
+						$shops[] = $shop;
+					}
+					$product->associateTo($shops);
+				}
+
+				// SpecificPrice (only the basic reduction feature is supported by the import)
+				if ((isset($info['reduction_price']) && $info['reduction_price'] > 0) || (isset($info['reduction_percent']) && $info['reduction_percent'] > 0))
+				{
+					$specific_price = new SpecificPrice();
+					$specific_price->id_product = (int)$product->id;
+					// @todo multishop specific price import
+					$specific_price->id_shop = $this->context->shop->getID(true);
+					$specific_price->id_currency = 0;
+					$specific_price->id_country = 0;
+					$specific_price->id_group = 0;
+					$specific_price->price = 0.00;
+					$specific_price->from_quantity = 1;
+					$specific_price->reduction = (isset($info['reduction_price']) && $info['reduction_price']) ? $info['reduction_price'] : $info['reduction_percent'] / 100;
+					$specific_price->reduction_type = (isset($info['reduction_price']) && $info['reduction_price']) ? 'amount' : 'percentage';
+					$specific_price->from = (isset($info['reduction_from']) && Validate::isDate($info['reduction_from'])) ? $info['reduction_from'] : '0000-00-00 00:00:00';
+					$specific_price->to = (isset($info['reduction_to']) && Validate::isDate($info['reduction_to']))  ? $info['reduction_to'] : '0000-00-00 00:00:00';
+					if (!$specific_price->add())
+						$this->addProductWarning($info['name'], $product->id, $this->l('Discount is invalid'));
+				}
+
+				if (isset($product->tags) && !empty($product->tags))
+				{
+					// Delete tags for this id product, for no duplicating error
+					Tag::deleteTagsForProduct($product->id);
+
+					$tag = new Tag();
+					if (!is_array($product->tags))
+					{
+						$product->tags = self::createMultiLangField($product->tags);
+						foreach ($product->tags as $key => $tags)
+						{
+							$is_tag_added = $tag->addTags($key, $product->id, $tags);
+							if (!$is_tag_added)
+							{
+								$this->addProductWarning($info['name'], $product->id, $this->l('Tags list').' '.$this->l('is invalid'));
+								break;
+							}
+						}
+
+					}
+					else
+					{
+						foreach ($product->tags as $key => $tags)
+						{
+							$str = '';
+							foreach ($tags as $one_tag)
+								$str .= $one_tag.',';
+							$str = rtrim($str, ',');
+
+							$is_tag_added = $tag->addTags($key, $product->id, $str);
+							if (!$is_tag_added)
+							{
+								$this->addProductWarning($info['name'], $product->id, 'Invalid tag(s) ('.$str.')');
+								break;
+							}
+						}
+					}
+				}
+				//delete existing images if "delete_existing_images" is set to 1
+				if (isset($product->delete_existing_images))
+					if ((bool)$product->delete_existing_images)
+						$product->deleteImages();
+				else if (isset($product->image) && is_array($product->image) && count($product->image))
+					$product->deleteImages();
+
+				if (isset($product->image) && is_array($product->image) && count($product->image))
+				{
+					$product_has_images = (bool)Image::getImages($this->context->language->id, (int)$product->id);
+					foreach ($product->image as $key => $url)
+						if (!empty($url))
+						{
+							$image = new Image();
+							$image->id_product = (int)$product->id;
+							$image->position = Image::getHighestPosition($product->id) + 1;
+							$image->cover = (!$key && !$product_has_images) ? true : false;
+							$image->legend = self::createMultiLangField($product->name[$default_language_id]);
+							if (($field_error = $image->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+								($lang_field_error = $image->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $image->add())
+							{
+								if (!self::copyImg($product->id, $image->id, $url))
+									$this->warnings[] = Tools::displayError('Error copying image: ').$url;
+							}
+							else
+							{
+								$this->warnings[] = $image->legend[$default_language_id].(isset($image->id_product) ? ' ('.$image->id_product.')' : '').
+									' '.Tools::displayError('Cannot be saved');
+								$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
+									Db::getInstance()->getMsgError();
+							}
+						}
+				}
+				if (isset($product->id_category))
+					$product->updateCategories(array_map('intval', $product->id_category));
+
+				// Features import
+				$features = get_object_vars($product);
+				if (isset($features['features']))
+					foreach (explode(',', $features['features']) as $single_feature)
+					{
+						$tab_feature = explode(':', $single_feature);
+						$feature_name = $tab_feature[0];
+						$feature_value = $tab_feature[1];
+						$position = isset($tab_feature[2]) ? $tab_feature[1]: false;
+						$id_feature = Feature::addFeatureImport($feature_name, $position);
+						$id_feature_value = FeatureValue::addFeatureValueImport($id_feature, $feature_value);
+						Product::addFeatureProductImport($product->id, $id_feature, $id_feature_value);
+					}
+				// clean feature positions to avoid conflict
+				Feature::cleanPositions();
+			}
+		}
+		$this->closeCsvFile($handle);
+	}
+
+	public function attributeImport()
+	{
+		$default_language = Configuration::get('PS_LANG_DEFAULT');
+		$groups = array();
+		foreach (AttributeGroup::getAttributesGroups($default_language) as $group)
+			$groups[$group['name']] = (int)$group['id_attribute_group'];
+		$attributes = array();
+		foreach (Attribute::getAttributes($default_language) as $attribute)
+			$attributes[$attribute['attribute_group'].'_'.$attribute['name']] = (int)$attribute['id_attribute'];
+
+		$this->receiveTab();
+		$handle = $this->openCsvFile();
+		$fsep = ((is_null(Tools::getValue('multiple_value_separator')) || trim(Tools::getValue('multiple_value_separator')) == '' ) ? ',' : Tools::getValue('multiple_value_separator'));
+		self::setLocale();
+		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
+		{
+			if (Tools::getValue('convert'))
+				$line = $this->utf8EncodeArray($line);
+			$info = self::getMaskedRow($line);
+			$info = array_map('trim', $info);
+
+			self::setDefaultValues($info);
+
+			$product = new Product((int)$info['id_product'], false, $default_language);
+			$id_image = null;
+			//delete existing images if "delete_existing_images" is set to 1
+			if (array_key_exists('delete_existing_images', $info) && $info['delete_existing_images'])
+				$product->deleteImages();
+			else if (array_key_exists('image_url', $info))
+				$product->deleteImages();
+
+			if (isset($info['image_url']) && $info['image_url'])
+			{
+				$product_has_images = (bool)Image::getImages($this->context->language->id, $product->id);
+				$url = $info['image_url'];
+				$image = new Image();
+				$image->id_product = (int)$product->id;
+				$image->position = Image::getHighestPosition($product->id) + 1;
+				$image->cover = (!$product_has_images) ? true : false;
+				$image->legend = self::createMultiLangField($product->name);
+
+				if (($field_error = $image->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+					($lang_field_error = $image->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $image->add())
+				{
+					if (!self::copyImg($product->id, $image->id, $url))
+						$this->warnings[] = Tools::displayError('Error copying image: ').$url;
+					else
+						$id_image = array($image->id);
+				}
+				else
+				{
+					$this->warnings[] = $image->legend[$default_language_id].(isset($image->id_product) ? ' ('.$image->id_product.')' : '').
+						' '.Tools::displayError('Cannot be saved');
+					$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').mysql_error();
+				}
+			}
+			else if (isset($info['image_position']) && $info['image_position'])
+			{
+				$images = $product->getImages($default_language);
+
+				if ($images)
+					foreach ($images as $row)
+						if ($row['position'] == (int)$info['image_position'])
+						{
+							$id_image = array($row['id_image']);
+							break;
+						}
+				if (!$id_image)
+					$this->warnings[] = sprintf(
+						Tools::displayError('No image found for combination with id_product = %s and image position = %s.'),
+						$product->id,
+						(int)$info['image_position']
+					);
+			}
+
+			$id_product_attribute = $product->addAttribute(
+				(float)$info['price'],
+				(float)$info['weight'],
+				0,
+				(float)$info['ecotax'],
+				(int)$info['quantity'],
+				$id_image,
+				strval($info['reference']),
+				strval($info['supplier_reference']),
+				strval($info['ean13']),
+				(int)$info['default_on'],
+				strval($info['upc'])
+			);
+
+			$id_attribute_group = 0;
+			$group = '';
+			foreach (explode($fsep, $info['group']) as $group)
+			{
+				$tab_group = explode(':', $group);
+				$group = $tab_group[0];
+				$id_attribute_group = $groups[$group];
+				// if position is filled
+				if (isset($tab_group[1]))
+					$position = $tab_group[1];
+				else
+					$position = false;
+				if (!isset($groups[$group]))
+				{
+					$obj = new AttributeGroup();
+					$obj->is_color_group = false;
+					$obj->name[$default_language] = $group;
+					$obj->public_name[$default_language] = $group;
+					$obj->position = (!$position) ? AttributeGroup::getHigherPosition() + 1 : $position;
+					if (($field_error = $obj->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+						($lang_field_error = $obj->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
+					{
+						$obj->add();
+						$groups[$group] = $obj->id;
+					}
+					else
+						$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '');
+				}
+			}
+			foreach (explode($fsep, $info['attribute']) as $attribute)
+			{
+				$tab_attribute = explode(':', $attribute);
+				$attribute = $tab_attribute[0];
+				// if position is filled
+				if (isset($tab_attribute[1]))
+					$position = $tab_attribute[1];
+				else
+					$position = false;
+				if (!isset($attributes[$group.'_'.$attribute]))
+				{
+					$obj = new Attribute();
+					$obj->id_attribute_group = $groups[$group];
+					$obj->name[$default_language] = str_replace('\n', '', str_replace('\r', '', $attribute));
+					$obj->position = (!$position) ? Attribute::getHigherPosition($groups[$group]) + 1 : $position;
+					if (($field_error = $obj->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+						($lang_field_error = $obj->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
+					{
+						$obj->add();
+						$attributes[$group.'_'.$attribute] = $obj->id;
+					}
+					else
+						$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '');
+
+				}
+			}
+			Db::getInstance()->execute('
+				INSERT INTO '._DB_PREFIX_.'product_attribute_combination (id_attribute, id_product_attribute)
+				VALUES ('.(int)$attributes[$group.'_'.$attribute].','.(int)$id_product_attribute.')
+			');
+		}
+		$this->closeCsvFile($handle);
+
+		// after insertion, we clean attribute position and group attribute position
+		$obj = new Attribute();
+		$obj->cleanPositions((int)$id_attribute_group, false);
+		AttributeGroup::cleanPositions();
+	}
+
+	public function customerImport()
+	{
+		$this->receiveTab();
+		$handle = $this->openCsvFile();
+		self::setLocale();
+		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
+		{
+			if (Tools::getValue('convert'))
+				$line = $this->utf8EncodeArray($line);
+			$info = self::getMaskedRow($line);
+
+			self::setDefaultValues($info);
+			$customer = new Customer();
+			self::arrayWalk($info, array('AdminImportController', 'fillInfo'), $customer);
+
+			if ($customer->passwd)
+				$customer->passwd = md5(_COOKIE_KEY_.$customer->passwd);
+
+			// Associate product to shop
+			if (Shop::isFeatureActive() && $customer->id_shop)
+			{
+				if (!is_numeric($customer->id_shop))
+					$customer->id_shop = Shop::getIdByName($customer->id_shop);
+			}
+			else
+				$customer->id_shop = Configuration::get('PS_SHOP_DEFAULT');
+
+			$res = false;
+			if (($field_error = $customer->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+				($lang_field_error = $customer->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
+			{
+				$customer->id_group_shop = Shop::getGroupFromShop($customer->id_shop);
+
+				if ($customer->id && $customer->customerIdExists($customer->id))
+					$res = $customer->update();
+				if (!$res)
+					$res = $customer->add();
+				if ($res)
+					$customer->addGroups(array(1));
+			}
+			if (!$res)
+			{
+				$this->_errors[] = $info['email'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved');
+				$this->_errors[] = ($field_error !== true ? $field_error : ($lang_field_error !== true ? $lang_field_error : '')).
+					Db::getInstance()->getMsgError();
+			}
+		}
+		$this->closeCsvFile($handle);
+	}
+
+	public function addressImport()
+	{
+		$this->receiveTab();
+		$default_language_id = (int)Configuration::get('PS_LANG_DEFAULT');
+		$handle = $this->openCsvFile();
+		self::setLocale();
+		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
+		{
+			if (Tools::getValue('convert'))
+				$line = $this->utf8EncodeArray($line);
+			$info = self::getMaskedRow($line);
+
+			self::setDefaultValues($info);
+			$address = new Address();
+			self::arrayWalk($info, array('AdminImportController', 'fillInfo'), $address);
+
+			if (isset($address->country) && is_numeric($address->country))
+			{
+				if (Country::getNameById(Configuration::get('PS_LANG_DEFAULT'), (int)$address->country))
+					$address->id_country = (int)$address->country;
+			}
+			else if (isset($address->country) && is_string($address->country) && !empty($address->country))
+			{
+				if ($id_country = Country::getIdByName(null, $address->country))
+					$address->id_country = (int)$id_country;
+				else
+				{
+					$country = new Country();
+					$country->active = 1;
+					$country->name = self::createMultiLangField($address->country);
+					$country->id_zone = 0; // Default zone for country to create
+					$country->iso_code = strtoupper(substr($address->country, 0, 2)); // Default iso for country to create
+					$country->contains_states = 0; // Default value for country to create
+					$lang_field_error = $country->validateFieldsLang(UNFRIENDLY_ERROR, true);
+					if (($field_error = $country->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+						($lang_field_error = $country->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $country->add())
+						$address->id_country = (int)$country->id;
+					else
+					{
+						$this->_errors[] = $country->name[$default_language_id].' '.Tools::displayError('Cannot be saved');
+						$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
+							Db::getInstance()->getMsgError();
+					}
+				}
+			}
+
+			if (isset($address->state) && is_numeric($address->state))
+			{
+				if (State::getNameById((int)$address->state))
+					$address->id_state = (int)$address->state;
+			}
+			else if (isset($address->state) && is_string($address->state) && !empty($address->state))
+			{
+				if ($id_state = State::getIdByName($address->state))
+					$address->id_state = (int)$id_state;
+				else
+				{
+					$state = new State();
+					$state->active = 1;
+					$state->name = $address->state;
+					$state->id_country = isset($country->id) ? (int)$country->id : 0;
+					$state->id_zone = 0; // Default zone for state to create
+					$state->iso_code = strtoupper(substr($address->state, 0, 2)); // Default iso for state to create
+					$state->tax_behavior = 0;
+					if (($field_error = $state->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+						($lang_field_error = $state->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $state->add())
+						$address->id_state = (int)$state->id;
+					else
+					{
+						$this->_errors[] = $state->name.' '.Tools::displayError('Cannot be saved');
+						$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
+							Db::getInstance()->getMsgError();
+					}
+				}
+			}
+
+			if (isset($address->customer_email) && !empty($address->customer_email))
+			{
+				if (Validate::isEmail($address->customer_email))
+				{
+					$customer = Customer::customerExists($address->customer_email, true);
+					if ($customer)
+						$address->id_customer = (int)$customer;
+					else
+						$this->_errors[] = Db::getInstance()->getMsgError().' '.$address->customer_email.' '.Tools::displayError('does not exist in database').' '.
+							(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved');
+				}
+				else
+					$this->_errors[] = '"'.$address->customer_email.'" :'.Tools::displayError('Is not a valid Email');
+			}
+
+			if (isset($address->manufacturer) && is_numeric($address->manufacturer) && Manufacturer::manufacturerExists((int)$address->manufacturer))
+				$address->id_manufacturer = (int)$address->manufacturer;
+			else if (isset($address->manufacturer) && is_string($address->manufacturer) && !empty($address->manufacturer))
+			{
+				$manufacturer = new Manufacturer();
+				$manufacturer->name = $address->manufacturer;
+				if (($field_error = $manufacturer->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+					($lang_field_error = $manufacturer->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $manufacturer->add())
+					$address->id_manufacturer = (int)$manufacturer->id;
+				else
+				{
+					$this->_errors[] = Db::getInstance()->getMsgError().' '.$manufacturer->name.(isset($manufacturer->id) ? ' ('.$manufacturer->id.')' : '').
+						' '.Tools::displayError('Cannot be saved');
+					$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
+						Db::getInstance()->getMsgError();
+				}
+			}
+
+			if (isset($address->supplier) && is_numeric($address->supplier) && Supplier::supplierExists((int)$address->supplier))
+				$address->id_supplier = (int)$address->supplier;
+			else if (isset($address->supplier) && is_string($address->supplier) && !empty($address->supplier))
+			{
+				$supplier = new Supplier();
+				$supplier->name = $address->supplier;
+				if (($field_error = $supplier->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+					($lang_field_error = $supplier->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $supplier->add())
+					$address->id_supplier = (int)$supplier->id;
+				else
+				{
+					$this->_errors[] = Db::getInstance()->getMsgError().' '.$supplier->name.(isset($supplier->id) ? ' ('.$supplier->id.')' : '').
+						' '.Tools::displayError('Cannot be saved');
+					$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
+						Db::getInstance()->getMsgError();
+				}
+			}
+
+			$res = false;
+			if (($field_error = $address->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+				($lang_field_error = $address->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
+			{
+				if ($address->id && $address->addressExists($address->id))
+					$res = $address->update();
+				if (!$res)
+					$res = $address->add();
+			}
+			if (!$res)
+			{
+				$this->_errors[] = $info['alias'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved');
+				$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
+					Db::getInstance()->getMsgError();
+			}
+		}
+		$this->closeCsvFile($handle);
+	}
+
+	public function manufacturerImport()
+	{
+		$this->receiveTab();
+		$handle = $this->openCsvFile();
+		self::setLocale();
+		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
+		{
+			if (Tools::getValue('convert'))
+				$line = $this->utf8EncodeArray($line);
+			$info = self::getMaskedRow($line);
+
+			self::setDefaultValues($info);
+
+			if (array_key_exists('id', $info) && (int)$info['id'] && Manufacturer::existsInDatabase((int)$info['id'], 'manufacturer'))
+				$manufacturer = new Manufacturer((int)$info['id']);
+			else
+			$manufacturer = new Manufacturer();
+			self::arrayWalk($info, array('AdminImportController', 'fillInfo'), $manufacturer);
+
+			$res = false;
+			if (($field_error = $manufacturer->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+				($lang_field_error = $manufacturer->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
+			{
+				if ($manufacturer->id && $manufacturer->manufacturerExists($manufacturer->id))
+					$res = $manufacturer->update();
+				if (!$res)
+					$res = $manufacturer->add();
+
+				if ($res)
+				{
+					// Associate supplier to group shop
+					if (Shop::isFeatureActive() && $manufacturer->shop)
+					{
+						$manufacturer->shop = explode(',', $manufacturer->shop);
+						$shops = array();
+						foreach ($manufacturer->shop as $shop)
+						{
+							$shop = trim($shop);
+							if (!is_numeric($shop))
+								$shop = GroupShop::getIdByName($shop);
+							$shops[] = $shop;
+						}
+						$manufacturer->associateTo($shops, 'group_shop');
+					}
+				}
+			}
+
+			if (!$res)
+			{
+				$this->_errors[] = Db::getInstance()->getMsgError().' '.$info['name'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').
+					' '.Tools::displayError('Cannot be saved');
+				$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
+					Db::getInstance()->getMsgError();
+			}
+		}
+		$this->closeCsvFile($handle);
+	}
+
+	public function supplierImport()
+	{
+		$this->receiveTab();
+		$handle = $this->openCsvFile();
+		self::setLocale();
+		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
+		{
+			if (Tools::getValue('convert'))
+				$line = $this->utf8EncodeArray($line);
+			$info = self::getMaskedRow($line);
+
+			self::setDefaultValues($info);
+
+			if (array_key_exists('id', $info) && (int)$info['id'] && Supplier::existsInDatabase((int)$info['id'], 'supplier'))
+				$supplier = new Supplier((int)$info['id']);
+			else
+			$supplier = new Supplier();
+
+			self::arrayWalk($info, array('AdminImportController', 'fillInfo'), $supplier);
+			if (($field_error = $supplier->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+				($lang_field_error = $supplier->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
+			{
+				$res = false;
+				if ($supplier->id && $supplier->supplierExists($supplier->id))
+					$res = $supplier->update();
+				if (!$res)
+					$res = $supplier->add();
+
+				if (!$res)
+					$this->_errors[] = Db::getInstance()->getMsgError().' '.$info['name'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').
+						' '.Tools::displayError('Cannot be saved');
+				else
+				{
+					// Associate supplier to group shop
+					if (Shop::isFeatureActive() && $supplier->shop)
+					{
+						$supplier->shop = explode(',', $supplier->shop);
+						$shops = array();
+						foreach ($supplier->shop as $shop)
+						{
+							$shop = trim($shop);
+							if (!is_numeric($shop))
+								$shop = GroupShop::getIdByName($shop);
+							$shops[] = $shop;
+						}
+						$supplier->associateTo($shops, 'group_shop');
+					}
+				}
+			}
+			else
+			{
+				$this->_errors[] = $this->l('Supplier not valid').' ('.$supplier->name.')';
+				$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '');
+			}
+		}
+		$this->closeCsvFile($handle);
+	}
+
+	public function utf8EncodeArray($array)
+	{
+		if (is_array($array))
+			foreach ($array as $key => $value)
+				$array[$key] = utf8_encode($value);
+		else
+			$array = utf8_encode($array);
+
+		return $array;
+	}
+
+	private function getNbrColumn($handle, $glue)
+	{
+		$tmp = fgetcsv($handle, MAX_LINE_SIZE, $glue);
+		self::rewindBomAware($handle);
+		return count($tmp);
+	}
+
+	private static function usortFiles($a, $b)
+	{
+		$a = strrev(substr(strrev($a), 0, 14));
+		$b = strrev(substr(strrev($b), 0, 14));
+
+		if ($a == $b)
+			return 0;
+
+		return ($a < $b) ? 1 : -1;
+	}
+
+	private function openCsvFile()
+	{
+		 $handle = fopen(_PS_ADMIN_DIR_.'/import/'.strval(preg_replace('/\.{2,}/', '.', Tools::getValue('csv'))), 'r');
+
+		if (!$handle)
+			die(Tools::displayError('Cannot read the CSV file'));
+
+		self::rewindBomAware($handle);
+
+		for ($i = 0; $i < (int)Tools::getValue('skip'); ++$i)
+			$line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator', ';'));
+		return $handle;
+	}
+
+	private function closeCsvFile($handle)
+	{
+		fclose($handle);
+	}
+
+	private function truncateTables($case)
+	{
+		switch ((int)$case)
+		{
+			case $this->entities[$this->l('Categories')]:
+				Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category` WHERE id_category != 1');
+				Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category_lang` WHERE id_category != 1');
+				Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'category` AUTO_INCREMENT = 2');
+				foreach (scandir(_PS_CAT_IMG_DIR_) as $d)
+					if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d))
+						unlink(_PS_CAT_IMG_DIR_.$d);
+				break;
+			case $this->entities[$this->l('Products')]:
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'feature_product');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_lang');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'category_product');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_tag');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image_lang');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price_priority');
+				Image::deleteAllImages(_PS_PROD_IMG_DIR_);
+				mkdir(_PS_PROD_IMG_DIR_);
+				break;
+			case $this->entities[$this->l('Customers')]:
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer');
+				break;
+			case $this->entities[$this->l('Addresses')]:
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'address');
+				break;
+			case $this->entities[$this->l('Combinations')]:
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_impact');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_combination`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_image`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_group`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_group_lang`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_lang`');
+				break;
+			case $this->entities[$this->l('Manufacturers')]:
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_lang');
+				foreach (scandir(_PS_MANU_IMG_DIR_) as $d)
+					if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d))
+						unlink(_PS_MANU_IMG_DIR_.$d);
+				break;
+			case $this->entities[$this->l('Suppliers')]:
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_lang');
+				foreach (scandir(_PS_SUPP_IMG_DIR_) as $d)
+					if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d))
+						unlink(_PS_SUPP_IMG_DIR_.$d);
+				break;
+		}
+		Image::clearTmpDir();
+		return true;
+	}
+
+	public function postProcess()
+	{
+		/* PrestaShop demo mode */
+		if (_PS_MODE_DEMO_)
+		{
+			$this->_errors[] = Tools::displayError('This functionnality has been disabled.');
+			return;
+		}
+		/* PrestaShop demo mode*/
+
+		if (Tools::isSubmit('submitFileUpload'))
+		{
+			if (isset($_FILES['file']) && !empty($_FILES['file']['error']))
+			{
+				switch ($_FILES['file']['error'])
+				{
+					case UPLOAD_ERR_INI_SIZE:
+						$this->_errors[] = Tools::displayError('The uploaded file exceeds the upload_max_filesize directive in php.ini.
+							If your server configuration allows it, you may add a directive in your .htaccess, for example:')
+						.'<br/><a href="?tab=AdminGenerator&amp;token='
+						.Tools::getAdminTokenLite('AdminGenerator').'" >
+						<code>php_value upload_max_filesize 20M</code> '.
+						Tools::displayError('(clic to open Generator tab)').'</a>';
+						break;
+					case UPLOAD_ERR_FORM_SIZE:
+						$this->_errors[] = Tools::displayError('The uploaded file exceeds the post_max_size directive in php.ini.
+							If your server configuration allows it, you may add a directive in your .htaccess, for example:')
+						.'<br/><a href="?tab=AdminGenerator&amp;token='
+						.Tools::getAdminTokenLite('AdminGenerator').'" >
+						<code>php_value post_max_size 20M</code> '.
+						Tools::displayError('(clic to open Generator tab)').'</a>';
+						break;
+					break;
+					case UPLOAD_ERR_PARTIAL:
+						$this->_errors[] = Tools::displayError('The uploaded file was only partially uploaded.');
+						break;
+					break;
+					case UPLOAD_ERR_NO_FILE:
+						$this->_errors[] = Tools::displayError('No file was uploaded');
+						break;
+					break;
+				}
+			}
+			else if (!file_exists($_FILES['file']['tmp_name']) ||
+				!@move_uploaded_file($_FILES['file']['tmp_name'], _PS_ADMIN_DIR_.'/import/'.$_FILES['file']['name'].'.'.date('Ymdhis')))
+				$this->_errors[] = $this->l('an error occurred while uploading and copying file');
+			else
+				Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=18');
+		}
+		else if (Tools::getValue('import'))
+		{
+			if (Tools::getValue('truncate'))
+				$this->truncateTables((int)Tools::getValue('entity'));
+
+			switch ((int)Tools::getValue('entity'))
+			{
+				case $this->entities[$this->l('Categories')]:
+					$this->categoryImport();
+				break;
+				case $this->entities[$this->l('Products')]:
+					$this->productImport();
+				break;
+				case $this->entities[$this->l('Customers')]:
+					$this->customerImport();
+				break;
+				case $this->entities[$this->l('Addresses')]:
+					$this->addressImport();
+				break;
+				case $this->entities[$this->l('Combinations')]:
+					$this->attributeImport();
+				break;
+				case $this->entities[$this->l('Manufacturers')]:
+					$this->manufacturerImport();
+				break;
+				case $this->entities[$this->l('Suppliers')]:
+					$this->supplierImport();
+				break;
+				default:
+					$this->_errors[] = $this->l('no entity selected');
+			}
+		}
+
+		parent::postProcess();
+	}
+
+	public static function setLocale()
+	{
+		$iso_lang  = trim(Tools::getValue('iso_lang'));
+		setlocale(LC_COLLATE, strtolower($iso_lang).'_'.strtoupper($iso_lang).'.UTF-8');
+		setlocale(LC_CTYPE, strtolower($iso_lang).'_'.strtoupper($iso_lang).'.UTF-8');
+	}
+
+	protected function addProductWarning($product_name, $product_id = null, $message = '')
+	{
+		$this->warnings[] = $product_name.(isset($product_id) ? ' (ID '.$product_id.')' : '').' '.Tools::displayError($message);
+	}
+}
\ No newline at end of file
diff --git a/docs/csv_import/adresses_import.csv b/docs/csv_import/addresses_import.csv
similarity index 100%
rename from docs/csv_import/adresses_import.csv
rename to docs/csv_import/addresses_import.csv
diff --git a/docs/csv_import/manufacturer_import.csv b/docs/csv_import/manufacturers_import.csv
similarity index 100%
rename from docs/csv_import/manufacturer_import.csv
rename to docs/csv_import/manufacturers_import.csv