// Updated CSV Import

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11970 b9a71923-0436-4b27-9f14-aed3839534dd

admin-dev/themes/default/template/import/form.tpl

@@ -199,7 +199,7 @@
 				<p>{l s='Note that you can have serveral products with the same reference.'}</p>
 			</div>
 			<div class="warn import_supply_orders_details" style="margin-top: 20px; display:none">
-				<p>{l s='Importing Supply Order Details will first reset the products ordered.'}</p>
+				<p>{l s='Importing Supply Order Details will first reset the products ordered, if any.'}</p>
 			</div>
 		{if !count($files_to_import)}
 			<div class="warn" style="margin-top: 20px;">

controllers/admin/AdminImportController.php

@@ -76,7 +76,7 @@ class AdminImportControllerCore extends AdminController
 
 	public function __construct()
 	{
-		$this->entities = array_flip(array(
+		$this->entities = array(
 			$this->l('Categories'),
 			$this->l('Products'),
 			$this->l('Combinations'),
@@ -84,9 +84,21 @@ class AdminImportControllerCore extends AdminController
 			$this->l('Addresses'),
 			$this->l('Manufacturers'),
 			$this->l('Suppliers'),
+		);
+
+		// @since 1.5.0
+		if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
+		{
+			$this->entities = array_merge(
+				$this->entities,
+				array(
 					$this->l('SupplyOrders'),
 					$this->l('SupplyOrdersDetails'),
-		));
+				)
+			);
+		}
+
+		$this->entities = array_flip($this->entities);
 
 		switch ((int)Tools::getValue('entity'))
 		{
@@ -342,6 +354,8 @@ class AdminImportControllerCore extends AdminController
 			break;
 			// @since 1.5.0
 			case $this->entities[$this->l('SupplyOrders')]:
+				if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
+				{
 					// required fields
 					$this->required_fields = array(
 						'id_supplier',
@@ -369,9 +383,12 @@ class AdminImportControllerCore extends AdminController
 						'discount_rate' => '0',
 						'is_template' => '0',
 					);
+				}
 			break;
 			// @since 1.5.0
 			case $this->entities[$this->l('SupplyOrdersDetails')]:
+				if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
+				{
 					// required fields
 					$this->required_fields = array(
 						'supply_order_reference',
@@ -396,6 +413,7 @@ class AdminImportControllerCore extends AdminController
 						'tax_rate' => '0',
 					);
 				}
+		}
 
 		parent::__construct();
 	}
@@ -438,7 +456,7 @@ class AdminImportControllerCore extends AdminController
 			'files_to_import' => $files_to_import,
 			'languages' => Language::getLanguages(false),
 			'id_language' => $this->context->language->id,
-			'available_fields' => $this->getAvailableFields()
+			'available_fields' => $this->getAvailableFields(),
 		);
 
 		return parent::renderForm();
@@ -2104,10 +2122,12 @@ class AdminImportControllerCore extends AdminController
 				break;
 				// @since 1.5.0
 				case $this->entities[$this->l('SupplyOrders')]:
+					if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
 						$this->supplyOrdersImport();
 				break;
 				// @since 1.5.0
 				case $this->entities[$this->l('SupplyOrdersDetails')]:
+					if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
 						$this->supplyOrdersDetailsImport();
 				break;
 				default: