From 4b416eff28fc233aa2a2cd619e0678635e934b48 Mon Sep 17 00:00:00 2001
From: vChabot <vincent.chabot@prestashop.com>
Date: Thu, 10 May 2012 08:59:21 +0000
Subject: [PATCH] [-] BO : BugFix : #PSCFV-2242 :CSV Import - Issues with
 products

---
 .../template/controllers/import/helpers/form/form.tpl       | 2 +-
 controllers/admin/AdminImportController.php                 | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
index a1eb3acf7..f6197ee2c 100644
--- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
@@ -46,7 +46,7 @@
 
 	function activeClueTip()
 	{
-		$('.info').cluetip({
+		$('.info_import').cluetip({
 			splitTitle: '|',
 		    showTitle: false
 	 	});
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index ae2448ddc..e4e4dded8 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -671,16 +671,18 @@ class AdminImportControllerCore extends AdminController
 	{
 		$i = 0;
 		$fields = array();
+		$keys = array_keys($this->available_fields);
+		array_shift($keys);
 		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'];
+				$fields[$i - 1] = '<div>'.$this->available_fields[$keys[$i - 1]]['label'].' '.$this->l('or').' '.$field['label'].'<span style="margin-left:16px"></span></div>';
 			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>';
+					$html = '&nbsp;<a href="#" class="info_import" 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>';