diff --git a/admin-dev/themes/default/template/import/form.tpl b/admin-dev/themes/default/template/import/form.tpl
index bc23d94c5..d2d586c5f 100644
--- a/admin-dev/themes/default/template/import/form.tpl
+++ b/admin-dev/themes/default/template/import/form.tpl
@@ -145,14 +145,15 @@
 			</select>
 		</div>
 
-		{if count($files_to_import)}
 			<label class="clear">{l s='Your CSV file'} ({count($files_to_import)} {if count($files_to_import) > 1} {l s='files'}{else}{l s='file'}{/if}{l s='):'}</label>
 			<div class="margin-form">
+			{if count($files_to_import)}
 				<select name="csv">
 					{foreach $files_to_import AS $filename}
 						<option value="{$filename}">{$filename}</option>
 					{/foreach}
 				</select>
+			{/if}
 				&nbsp;&nbsp;<img src="../img/admin/add.gif" alt="Uplaod" title="Upload" />
 				<b><a href="#upload_file_import" id="upload_file_import_link">{l s='Upload'}</a></b>
 			</div>
@@ -192,12 +193,15 @@
 			<div class="space margin-form">
 				<input type="submit" name="submitImportFile" value="{l s='Next step'}" class="button"/>
 			</div>
-			<div class="warn import_products_categories" style="margin-top: 20px">
+			<div class="warn import_products_categories" style="margin-top: 20px;">
 				<p>{l s='Note that the category import does not support categories of the same name.'}</p>
 				<p>{l s='Note that you can have serveral products with the same reference.'}</p>
 			</div>
-		{else}
-			<div class="warn" style="margin-top: 20px">
+			<div class="warn import_supply_orders_details" style="margin-top: 20px;">
+				<p>{l s='Importing Supply Order Details will first reset the products ordered.'}</p>
+			</div>
+		{if !count($files_to_import)}
+			<div class="warn" style="margin-top: 20px;">
 				{l s='There is no CSV file available, please upload one using the form above.'}
 				<br /><br />
 				{l s='You can read informations on CSV import at:'} <a href="http://www.prestashop.com/wiki/Troubleshooting_6/" target="_blank">http://www.prestashop.com/wiki/Troubleshooting_6/</a><br /><br />
@@ -228,13 +232,26 @@
 <script type="text/javascript">
 	$("select#entity").change( function() {
 
-		if ($("#entity > option:selected").val() == 7)
+		if ($("#entity > option:selected").val() == 7 || $("#entity > option:selected").val() == 8)
 		{
 			$("label[for=truncate],#truncate").hide();
 		}
 		else
 			$("label[for=truncate],#truncate").show();
 
+
+		if ($("#entity > option:selected").val() == 8)
+		{
+			$(".warn .import_supply_orders_details").show();
+			$('input[name=multiple_value_separator]').val('|');
+		}
+		else
+		{
+			$(".warn .import_supply_orders_details").hide();
+			$('input[name=multiple_value_separator]').val(',');
+		}
+		
+		
 		if ($("#entity > option:selected").val() == 1)
 		{
 			$("label[for=match_ref],#match_ref").show();
diff --git a/classes/ProductSupplier.php b/classes/ProductSupplier.php
index 88eb72658..a355afb62 100644
--- a/classes/ProductSupplier.php
+++ b/classes/ProductSupplier.php
@@ -115,7 +115,7 @@ class ProductSupplierCore extends ObjectModel
 	 * @param int $id_product
 	 * @param int $id_product_attribute
 	 * @param int $id_supplier
-	 * @return array
+	 * @return string
 	 */
 	public static function getProductSupplierReference($id_product, $id_product_attribute, $id_supplier)
 	{
diff --git a/classes/Supplier.php b/classes/Supplier.php
index ddde78fff..104e9c96c 100644
--- a/classes/Supplier.php
+++ b/classes/Supplier.php
@@ -300,26 +300,29 @@ class SupplierCore extends ObjectModel
 			)
 			GROUP BY p.`id_product`';
 
-		return Db::getInstance()->executeS($sql);
+		return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
 	}
 
 	/*
-	* Specify if a supplier already in base
+	* Tells if a supplier exists
 	*
 	* @param $id_supplier Supplier id
 	* @return boolean
 	*/
 	public static function supplierExists($id_supplier)
 	{
-		$row = Db::getInstance()->getRow('
-			SELECT `id_supplier`
-			FROM '._DB_PREFIX_.'supplier s
-			WHERE s.`id_supplier` = '.(int)$id_supplier
-		);
+		$query = new DbQuery();
+		$query->select('id_supplier');
+		$query->from('supplier');
+		$query->where('id_supplier = '.(int)$id_supplier);
+		$res = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
 
-		return isset($row['id_supplier']);
+		return ($res > 0);
 	}
 
+	/**
+	 * @see ObjectModel::delete()
+	 */
 	public function delete()
 	{
 		if (parent::delete())
diff --git a/classes/stock/SupplyOrder.php b/classes/stock/SupplyOrder.php
index e5f1ce195..e263d9c4d 100755
--- a/classes/stock/SupplyOrder.php
+++ b/classes/stock/SupplyOrder.php
@@ -462,7 +462,7 @@ class SupplyOrderCore extends ObjectModel
 		$query = new DbQuery();
 		$query->select('id_supply_order');
 		$query->from('supply_order', 'so');
-		$query->where('so.reference = "'.pSQL($match).'"');
+		$query->where('so.reference = "'.pSQL($reference).'"');
 		$id = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
 
 		if ($id === false)
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index beaf20770..1a8d6ae5d 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -85,6 +85,7 @@ class AdminImportControllerCore extends AdminController
 			$this->l('Manufacturers'),
 			$this->l('Suppliers'),
 			$this->l('SupplyOrders'),
+			$this->l('SupplyOrdersDetails'),
 		));
 
 		switch ((int)Tools::getValue('entity'))
@@ -359,12 +360,40 @@ class AdminImportControllerCore extends AdminController
 					'reference' => array('label' => $this->l('Supply Order Reference *')),
 					'date_delivery_expected' => array('label' => $this->l('Delivery Date (Y-M-D)*')),
 					'discount_rate' => array('label' => $this->l('Discount Rate')),
+					'is_template' => array('label' => $this->l('Template')),
 				);
 				// default values
 				self::$default_values = array(
 					'id_lang' => (int)Configuration::get('PS_LANG_DEFAULT'),
 					'id_currency' => Currency::getDefaultCurrency()->id,
 					'discount_rate' => '0',
+					'is_template' => '0',
+				);
+			break;
+			// @since 1.5.0
+			case $this->entities[$this->l('SupplyOrdersDetails')]:
+				// required fields
+				$this->required_fields = array(
+					'supply_order_reference',
+					'id_product',
+					'unit_price_te',
+					'quantity_expected',
+				);
+				// available fields
+				$this->available_fields = array(
+					'no' => array('label' => $this->l('Ignore this column')),
+					'supply_order_reference' => array('label' => $this->l('Supply Order Reference *')),
+					'id_product' => array('label' => $this->l('Product ID *')),
+					'id_product_attribute' => array('label' => $this->l('Product Attribute ID')),
+					'unit_price_te' => array('label' => $this->l('Unit Price (te) *')),
+					'quantity_expected' => array('label' => $this->l('Quantity Expected *')),
+					'discount_rate' => array('label' => $this->l('Discount Rate')),
+					'tax_rate' => array('label' => $this->l('Tax Rate')),
+				);
+				// default values
+				self::$default_values = array(
+					'discount_rate' => '0',
+					'tax_rate' => '0',
 				);
 		}
 
@@ -1682,8 +1711,8 @@ class AdminImportControllerCore extends AdminController
 		$handle = $this->openCsvFile();
 		self::setLocale();
 
-		// main loop, for each lines
-		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
+		// main loop, for each supply orders to import
+		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); ++$current_line)
 		{
 			// if convert requested
 			if (Tools::getValue('convert'))
@@ -1695,21 +1724,193 @@ class AdminImportControllerCore extends AdminController
 
 			// if an id is set, instanciates a supply order with this id if possible
 			if (array_key_exists('id', $info) && (int)$info['id'] && SupplyOrder::exists((int)$info['id']))
-				$supply_order = new Supplier((int)$info['id']);
-			// if an reference is set, instanciates a supply order with this reference if possible
+				$supply_order = new SupplyOrder((int)$info['id']);
+			// if a reference is set, instanciates a supply order with this reference if possible
 			else if (array_key_exists('reference', $info) && $info['reference'] && SupplyOrder::exists(pSQL($info['reference'])))
 				$supply_order = SupplyOrder::getSupplyOrderByReference(pSQL($info['reference']));
 			else // new supply order
 				$supply_order = new SupplyOrder();
 
-			/*
-			 * @TODO Checks $info
-			 *
-			 */
+			// gets parameters
+			$id_supplier = (int)$info['id_supplier'];
+			$id_lang = (int)$info['id_lang'];
+			$id_warehouse = (int)$info['id_warehouse'];
+			$id_currency = (int)$info['id_currency'];
+			$reference = pSQL($info['reference']);
+			$date_delivery_expected = pSQL($info['date_delivery_expected']);
+			$discount_rate = (float)$info['discount_rate'];
+			$is_template = (bool)$info['is_template'];
 
-			/**
-			 * @TODO If check is OK, sets the Supply Order
-			 */
+			// checks parameters
+			if (!Supplier::supplierExists($id_supplier))
+				$this->_errors[] = sprintf($this->l('Supplier ID (%d) is not valid (at line %d).'), $id_supplier, $current_line + 1);
+			if (!Language::getLanguage($id_lang))
+				$this->_errors[] = sprintf($this->l('Lang ID (%d) is not valid (at line %d).'), $id_lang, $current_line + 1);
+			if (!Warehouse::exists($id_warehouse))
+				$this->_errors[] = sprintf($this->l('Warehouse ID (%d) is not valid (at line %d).'), $id_warehouse, $current_line + 1);
+			if (!Currency::getCurrency($id_currency))
+				$this->_errors[] = sprintf($this->l('Currency ID (%d) is not valid (at line %d).'), $id_currency, $current_line + 1);
+			if (empty($supply_order->reference) && SupplyOrder::exists($reference))
+				$this->_errors[] = sprintf($this->l('Reference (%s) already exists (at line %d).'), $reference, $current_line + 1);
+			if (!empty($supply_order->reference) && ($supply_order->reference != $reference && SupplyOrder::exists($reference)))
+				$this->_errors[] = sprintf($this->l('Reference (%s) already exists (at line %d).'), $reference, $current_line + 1);
+			if (!Validate::isDateFormat($date_delivery_expected))
+				$this->_errors[] = sprintf($this->l('Date (%s) is not valid (at line %d). Format: %s.'), $date_delivery_expected,
+										   $current_line + 1, $this->l('YYYY-MM-DD'));
+			else if (new DateTime($date_delivery_expected) <= new DateTime('yesterday'))
+				$this->_errors[] = sprintf($this->l('Date (%s) cannot be in the past (at line %d). Format: %s.'), $date_delivery_expected,
+										   $current_line + 1, $this->l('YYYY-MM-DD'));
+			if ($discount_rate < 0 || $discount_rate > 100)
+				$this->_errors[] = sprintf($this->l('Discount rate (%d) is not valid (at line %d). %s.'), $discount_rate,
+										   $current_line + 1, $this->l('Format: between 0 and 100'));
+			if ($supply_order->id > 0 && !$supply_order->isEditable())
+				$this->_errors[] = sprintf($this->l('Supply Order (%d) is not editable (at line %d).'), $supply_order->id, $current_line + 1);
+
+			// if no errors, sets supply order
+			if (empty($this->_errors))
+			{
+				// adds parameters
+				$info['id_ref_currency'] = (int)Currency::getDefaultCurrency()->id;
+				$info['supplier_name'] = pSQL(Supplier::getNameById($id_supplier));
+				if ($supply_order->id > 0)
+				{
+					$info['id_supply_order_state'] = (int)$supply_order->id_supply_order_state;
+					$info['id'] = (int)$supply_order->id;
+				}
+				else
+					$info['id_supply_order_state'] = 1;
+
+				// sets parameters
+				self::arrayWalk($info, array('AdminImportController', 'fillInfo'), $supply_order);
+
+				// updatesd($supply_order);
+				$res = true;
+				if ($supply_order->id > 0)
+					$res &= $supply_order->update();
+				else
+					$res &= $supply_order->add();
+
+				// errors
+				if (!$res)
+					$this->_errors[] = sprintf($this->l('Supply Order could not be saved (at line %d).'), $current_line + 1);
+			}
+		}
+
+		// closes
+		$this->closeCsvFile($handle);
+	}
+
+	public function supplyOrdersDetailsImport()
+	{
+		// opens CSV & sets locale
+		$this->receiveTab();
+		$handle = $this->openCsvFile();
+		self::setLocale();
+
+		$products = array();
+		$reset = true;
+		// main loop, for each supply orders details to import
+		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); ++$current_line)
+		{
+			// if convert requested
+			if (Tools::getValue('convert'))
+				$line = $this->utf8EncodeArray($line);
+			$info = self::getMaskedRow($line);
+
+			// sets default values if needed
+			self::setDefaultValues($info);
+
+			// gets the supply order
+			if (array_key_exists('supply_order_reference', $info) && pSQL($info['supply_order_reference']) && SupplyOrder::exists(pSQL($info['supply_order_reference'])))
+				$supply_order = SupplyOrder::getSupplyOrderByReference(pSQL($info['supply_order_reference']));
+			else
+				$this->_errors[] = sprintf($this->l('Supply Order (%s) could not be loaded (at line %d).'), (int)$info['supply_order_reference'], $current_line + 1);
+
+			if (empty($this->_errors))
+			{
+				// sets parameters
+				$id_product = (int)$info['id_product'];
+				if (!$info['id_product_attribute'])
+					$info['id_product_attribute'] = 0;
+				$id_product_attribute = (int)$info['id_product_attribute'];
+				$unit_price_te = (float)$info['unit_price_te'];
+				$quantity_expected = (int)$info['quantity_expected'];
+				$discount_rate = (float)$info['discount_rate'];
+				$tax_rate = (float)$info['tax_rate'];
+
+				// checks if one product is there only once
+				if (isset($product['id_product']))
+				{
+					if ($product['id_product'] == $id_product_attribute)
+						$this->_errors[] = sprintf($this->l('Product (%d/%D) cannot be added twice (at line %d).'), $id_product,
+											       $id_product_attribute, $current_line + 1);
+					else
+						$product['id_product'] = $id_product_attribute;
+				}
+				else
+					$product['id_product'] = 0;
+
+				// checks parameters
+				if (false === ($supplier_reference = ProductSupplier::getProductSupplierReference($id_product, $id_product_attribute, $supply_order->id_supplier)))
+					$this->_errors[] = sprintf($this->l('Product (%d/%d) is not available for this order (at line %d).'), $id_product,
+											   $id_product_attribute, $current_line + 1);
+				if ($unit_price_te < 0)
+					$this->_errors[] = sprintf($this->l('Unit Price (te) (%d) is not valid (at line %d).'), $unit_price_te, $current_line + 1);
+				if ($quantity_expected < 0)
+					$this->_errors[] = sprintf($this->l('Quantity Expected (%d) is not valid (at line %d).'), $quantity_expected, $current_line + 1);
+				if ($discount_rate < 0 || $discount_rate > 100)
+				$this->_errors[] = sprintf($this->l('Discount rate (%d) is not valid (at line %d). %s.'), $discount_rate,
+										   $current_line + 1, $this->l('Format: between 0 and 100'));
+				if ($tax_rate < 0 || $tax_rate > 100)
+				$this->_errors[] = sprintf($this->l('Tax rate (%d) is not valid (at line %d). %s.'), $tax_rate,
+										   $current_line + 1, $this->l('Format: between 0 and 100'));
+
+				// if no errors, sets supply order details
+				if (empty($this->_errors))
+				{
+					// resets order if needed
+					if ($reset)
+					{
+						$supply_order->resetProducts();
+						$reset = false;
+					}
+
+					// creates new product
+					$supply_order_detail = new SupplyOrderDetail();
+					self::arrayWalk($info, array('AdminImportController', 'fillInfo'), $supply_order_detail);
+
+					// sets parameters
+					$supply_order_detail->id_supply_order = $supply_order->id;
+					$currency = new Currency($supply_order->id_ref_currency);
+					$supply_order_detail->id_currency = $currency->id;
+					$supply_order_detail->exchange_rate = $currency->conversion_rate;
+					$supply_order_detail->supplier_reference = $supplier_reference;
+					$supply_order_detail->name = Product::getProductName($id_product, $id_product_attribute, $supply_order->id_lang);
+
+					// gets ean13 / ref / upc
+					$query = new DbQuery();
+					$query->select('
+						IFNULL(pa.reference, IFNULL(p.reference, \'\')) as reference,
+						IFNULL(pa.ean13, IFNULL(p.ean13, \'\')) as ean13,
+						IFNULL(pa.upc, IFNULL(p.upc, \'\')) as upc
+					');
+					$query->from('product', 'p');
+					$query->leftJoin('product_attribute', 'pa', 'pa.id_product = p.id_product AND id_product_attribute = '.(int)$id_product_attribute);
+					$query->where('p.id_product = '.(int)$id_product);
+					$query->where('p.is_virtual = 0 AND p.cache_is_pack = 0');
+					$res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
+					$product_infos = $res['0'];
+
+					$supply_order_detail->reference = $product_infos['reference'];
+					$supply_order_detail->ean13 = $product_infos['ean13'];
+					$supply_order_detail->upc = $product_infos['upc'];
+
+					$supply_order_detail->add();
+					$supply_order->update();
+					unset($supply_order_detail);
+
+				}
+			}
 		}
 
 		// closes
@@ -1901,9 +2102,14 @@ class AdminImportControllerCore extends AdminController
 				case $this->entities[$this->l('Suppliers')]:
 					$this->supplierImport();
 				break;
+				// @since 1.5.0
 				case $this->entities[$this->l('SupplyOrders')]:
 					$this->supplyOrdersImport();
 				break;
+				// @since 1.5.0
+				case $this->entities[$this->l('SupplyOrdersDetails')]:
+					$this->supplyOrdersDetailsImport();
+				break;
 				default:
 					$this->_errors[] = $this->l('no entity selected');
 			}
diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php
index 8616b6484..76ef674e6 100644
--- a/controllers/admin/AdminSupplyOrdersController.php
+++ b/controllers/admin/AdminSupplyOrdersController.php
@@ -1971,6 +1971,9 @@ class AdminSupplyOrdersControllerCore extends AdminController
 		$entries = $supply_order->getEntriesCollection($supply_order->id_lang);
 
 		// updates SupplyOrder so that it is not a template anymore
+		$ref = $supply_order->reference;
+		$ref .= ' ('.date('H:i:s').')';
+		$supply_order->reference = $ref;
 		$supply_order->is_template = 0;
 		$supply_order->id = (int)0;
 		$supply_order->save();
diff --git a/docs/csv_import/supply_orders_details_import.csv b/docs/csv_import/supply_orders_details_import.csv
new file mode 100644
index 000000000..c5a99dca8
--- /dev/null
+++ b/docs/csv_import/supply_orders_details_import.csv
@@ -0,0 +1,17 @@
+"Supply Order Reference *";"Product ID *";"Product Attribute ID";"Unit Price (te) *";"Quantity Expected *";"Discount Rate";"Tax Rate"
+"ref import demo";1;25;110;10;10;19,6
+"ref import demo";1;26;111;11;1;19,6
+"ref import demo";1;27;112;12;;19,6
+"ref import demo";1;28;113;13;3;19,6
+"ref import demo";1;29;114;14;;19,6
+"ref import demo";1;30;115;15;5;19,6
+"ref import demo";1;31;116;16;;19,6
+"ref import demo";1;32;117;17;7;19,6
+"ref import demo";1;33;118;18;;19,6
+"ref import demo";1;34;119;19;9;19,6
+"ref import demo";1;35;120;20;;19,6
+"ref import demo";1;39;121;21;11;19,6
+"ref import demo";1;40;122;22;;19,6
+"ref import demo";1;41;123;23;13;19,6
+"ref import demo";1;42;124;24;;19,6
+"ref import demo";6;;1000;28;18;19,6
diff --git a/docs/csv_import/supply_orders_import.csv b/docs/csv_import/supply_orders_import.csv
index ac983a15e..6050f8575 100644
--- a/docs/csv_import/supply_orders_import.csv
+++ b/docs/csv_import/supply_orders_import.csv
@@ -1,3 +1,2 @@
-"ID";"Supplier ID *";"Lang ID";"Warehouse ID*";"Currency ID";"Supply Order Reference *";"Expected Delivery Date";"Discount Rate"
-;1;1;1;;"ref import 1";"2012-11-31";
-;1;;1;;"ref import 2";"2012-12-30";15
+"ID";"Supplier ID *";"Lang ID";"Warehouse ID*";"Currency ID";"Supply Order Reference *";"Expected Delivery Date *";"Discount Rate";"Template"
+;1;1;1;;"ref import demo";"2015-12-24";;