From 17efe5e27aa9e2e88ee506e8cd2a3cf1a971f97d Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Wed, 3 Oct 2012 12:49:16 +0000
Subject: [PATCH] [-] BO : fix #PSCFV-4672

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17719 b9a71923-0436-4b27-9f14-aed3839534dd
---
 .../controllers/import/helpers/form/form.tpl  |  2 +-
 controllers/admin/AdminImportController.php   | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 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 a9706516a..081a23688 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
@@ -259,7 +259,7 @@
 		else
 			$(".import_products_categories").hide();
 
-		if ($("#entity > option:selected").val() == 0 || $("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 3)
+		if ($("#entity > option:selected").val() == 0 || $("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 3 || $("#entity > option:selected").val() == 5 || $("#entity > option:selected").val() == 6)
 			$("label[for=forceIDs],#forceIDs").show();
 		else
 			$("label[for=forceIDs],#forceIDs").hide();
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index e848166ae..82096ae48 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -2124,10 +2124,16 @@ class AdminImportControllerCore extends AdminController
 
 			AdminImportController::setDefaultValues($info);
 
-			if (array_key_exists('id', $info) && (int)$info['id'] && Manufacturer::existsInDatabase((int)$info['id'], 'manufacturer'))
+			if (Tools::getValue('forceIDs') && isset($info['id']) && (int)$info['id'])
 				$manufacturer = new Manufacturer((int)$info['id']);
 			else
-				$manufacturer = new Manufacturer();
+			{
+				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();
+			}
+
 			AdminImportController::arrayWalk($info, array('AdminImportController', 'fillInfo'), $manufacturer);
 
 			$res = false;
@@ -2189,10 +2195,16 @@ class AdminImportControllerCore extends AdminController
 
 			AdminImportController::setDefaultValues($info);
 
-			if (array_key_exists('id', $info) && (int)$info['id'] && Supplier::existsInDatabase((int)$info['id'], 'supplier'))
+			if (Tools::getValue('forceIDs') && isset($info['id']) && (int)$info['id'])
 				$supplier = new Supplier((int)$info['id']);
 			else
-				$supplier = new Supplier();
+			{
+				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();
+			}
+
 
 			AdminImportController::arrayWalk($info, array('AdminImportController', 'fillInfo'), $supplier);
 			if (($field_error = $supplier->validateFields(UNFRIENDLY_ERROR, true)) === true &&