From 6850db06120e9a1879a73b6a77c7d6fe625ea5b7 Mon Sep 17 00:00:00 2001
From: Julien <julien@codeurweb.fr>
Date: Mon, 23 Sep 2013 20:23:45 +0200
Subject: [PATCH] [-] BO : fix contructor override on AdminImportController

When we overload the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
---
 controllers/admin/AdminImportController.php | 26 ++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 0a69a5bb4..0e2c6ff19 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -363,10 +363,13 @@ class AdminImportControllerCore extends AdminController
 					'shop' => Shop::getGroupFromShop(Configuration::get('PS_SHOP_DEFAULT')),
 				);
 			break;
-			// @since 1.5.0
-			case $this->entities[$this->l('Supply Orders')]:
-				if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
-				{
+		}
+		
+		// @since 1.5.0
+		if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
+			switch ((int)Tools::getValue('entity'))
+			{
+				case $this->entities[$this->l('Supply Orders')]:
 					// required fields
 					$this->required_fields = array(
 						'id_supplier',
@@ -394,12 +397,8 @@ class AdminImportControllerCore extends AdminController
 						'discount_rate' => '0',
 						'is_template' => '0',
 					);
-				}
-			break;
-			// @since 1.5.0
-			case $this->entities[$this->l('Supply Order Details')]:
-				if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
-				{
+				break;
+				case $this->entities[$this->l('Supply Order Details')]:
 					// required fields
 					$this->required_fields = array(
 						'supply_order_reference',
@@ -423,8 +422,9 @@ class AdminImportControllerCore extends AdminController
 						'discount_rate' => '0',
 						'tax_rate' => '0',
 					);
-				}
-		}
+				break;
+					
+			}
 
 		$this->separator = strval(trim(Tools::getValue('separator', ';')));
 
@@ -2843,4 +2843,4 @@ class AdminImportControllerCore extends AdminController
 			die;
 		}
 	}
-}
\ No newline at end of file
+}