diff --git a/admin-dev/themes/template/supplier_orders/form.tpl b/admin-dev/themes/template/supplier_orders/form.tpl
index 5a9dd5909..b51f33e0d 100644
--- a/admin-dev/themes/template/supplier_orders/form.tpl
+++ b/admin-dev/themes/template/supplier_orders/form.tpl
@@ -86,7 +86,7 @@
 										<input type="text" name="input_unit_price_te_{$product.id_product}_{$product.id_product_attribute}" value="{$product.unit_price_te|escape:'htmlall':'UTF-8'}" size="8" />
 									</td>
 									<td class="center">
-										<input type="text" name="input_quantity_{$product.id_product}_{$product.id_product_attribute}" value="{$product.quantity|escape:'htmlall':'UTF-8'}" size="5" />
+										<input type="text" name="input_quantity_expected_{$product.id_product}_{$product.id_product_attribute}" value="{$product.quantity_expected|escape:'htmlall':'UTF-8'}" size="5" />
 									</td>
 									<td class="center">
 										<input type="text" name="input_discount_rate_{$product.id_product}_{$product.id_product_attribute}" value="{$product.discount_rate|escape:'htmlall':'UTF-8'}" size="5" />
@@ -133,7 +133,7 @@
 				'<td>'+product_infos.ean13+'<input type="hidden" name="input_ean13_'+product_infos.id+'" value="'+product_infos.ean13+'" /></td>'+
 				'<td>'+product_infos.name+'<input type="hidden" name="input_name_'+product_infos.id+'" value="'+product_infos.name+'" /></td>'+
 				'<td class="center"><input type="text" name="input_unit_price_te_'+product_infos.id+'" value="0" size="8" /></td>'+
-				'<td class="center"><input type="text" name="input_quantity_'+product_infos.id+'" value="0" size="5" /></td>'+
+				'<td class="center"><input type="text" name="input_quantity_expected'+product_infos.id+'" value="0" size="5" /></td>'+
 				'<td class="center"><input type="text" name="input_discount_rate_'+product_infos.id+'" value="0" size="5" /></td>'+
 				'<td class="center"><input type="text" name="input_tax_rate_'+product_infos.id+'" value="0" size="5" /></td>'+
 				'<td class="center"><a href="#" class="removeProductFromSupplierOrderLink" id="deletelink_'+product_infos.id+'">'+
@@ -218,7 +218,6 @@
 			});
 		});
 	</script>
-
 	{/if}
 	{if isset($show_change_state_form)}
 		{$state_content}
diff --git a/classes/stock/SupplierOrderDetail.php b/classes/stock/SupplierOrderDetail.php
index 9ba7638f2..e3463b7d9 100755
--- a/classes/stock/SupplierOrderDetail.php
+++ b/classes/stock/SupplierOrderDetail.php
@@ -125,7 +125,6 @@ class SupplierOrderDetailCore extends ObjectModel
 		'exchange_rate',
 		'unit_price_te',
 		'quantity_expected',
-		'quantity_received',
 		'price_te',
 		'discount_rate',
 		'discount_value_te',
diff --git a/controllers/admin/AdminSupplierOrdersController.php b/controllers/admin/AdminSupplierOrdersController.php
index 19df7acbe..304524a37 100644
--- a/controllers/admin/AdminSupplierOrdersController.php
+++ b/controllers/admin/AdminSupplierOrdersController.php
@@ -917,7 +917,7 @@ class AdminSupplierOrdersControllerCore extends AdminController
 						$entry->id_product = substr($id, 0, $pos);
 						$entry->id_product_attribute = substr($id, $pos + 1);
 						$entry->unit_price_te = (float)Tools::getValue('input_unit_price_te_'.$id, 0);
-						$entry->quantity = (int)Tools::getValue('input_quantity_'.$id, 0);
+						$entry->quantity_expected = (int)Tools::getValue('input_quantity_expected_'.$id, 0);
 						$entry->discount_rate = (float)Tools::getValue('input_discount_rate_'.$id, 0);
 						$entry->tax_rate = (float)Tools::getValue('input_tax_rate_'.$id, 0);
 						$entry->reference = Tools::getValue('input_reference_'.$id, '');
@@ -937,7 +937,7 @@ class AdminSupplierOrdersControllerCore extends AdminController
 								'id_product' =>	$entry->id_product,
 								'id_product_attribute' => $entry->id_product_attribute,
 								'unit_price_te' =>	$entry->unit_price_te,
-								'quantity' => $entry->quantity,
+								'quantity_expected' => $entry->quantity_expected,
 								'discount_rate' =>	$entry->discount_rate,
 								'tax_rate' => $entry->tax_rate,
 								'name' => $entry->name,