From da27efe0020ba5b91c113777dd2afae4ef929fb0 Mon Sep 17 00:00:00 2001
From: bMancone <brice.mancone@prestashop.com>
Date: Tue, 17 Jan 2012 15:28:30 +0000
Subject: [PATCH] // Fixed #PSTEST-454 #PSTEST-455 #PSTEST-458

---
 controllers/admin/AdminSupplyOrdersController.php | 8 +++++---
 translations/fr/admin.php                         | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php
index 773407855..d998c5228 100644
--- a/controllers/admin/AdminSupplyOrdersController.php
+++ b/controllers/admin/AdminSupplyOrdersController.php
@@ -352,7 +352,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 				// if the current state doesn't allow order edit, skip the edit action
 				if ($this->_list[$i]['editable'] == 0)
 					$this->addRowActionSkipList('edit', $this->_list[$i]['id_supply_order']);
-				if ($this->_list[$i]['enclosed'] == 1)
+				if ($this->_list[$i]['enclosed'] == 1 && $this->_list[$i]['receipt_state'] == 0)
 					$this->addRowActionSkipList('changestate', $this->_list[$i]['id_supply_order']);
 				if (1 != $this->_list[$i]['pending_receipt'])
 					$this->addRowActionSkipList('updatereceipt', $this->_list[$i]['id_supply_order']);
@@ -500,9 +500,9 @@ class AdminSupplyOrdersControllerCore extends AdminController
 				),
 				array(
 					'type' => 'select',
-					'label' => $this->l('New status of the order:'),
+					'label' => $this->l('Status of the order:'),
 					'name' => 'id_supply_order_state',
-					'required' => true,
+					'required' => false,
 					'options' => array(
 						'query' => $states,
 						'id' => 'id_supply_order_state',
@@ -517,6 +517,8 @@ class AdminSupplyOrdersControllerCore extends AdminController
 			)
 		);
 
+		$this->displayInformation($this->l('Be careful when changing status. Some of them cannot be changed afterwards. (Canceled, for instance).'));
+
 		// sets up the helper
 		$helper = new HelperForm();
 		$helper->submit_action = 'submitChangestate';
diff --git a/translations/fr/admin.php b/translations/fr/admin.php
index 8efb83d96..2407add6b 100644
--- a/translations/fr/admin.php
+++ b/translations/fr/admin.php
@@ -3302,9 +3302,10 @@ $_LANGADM['AdminSupplyOrders7d8694652780adfb8221b67c1252f3ad'] = 'Stock : Modèl
 $_LANGADM['AdminSupplyOrdersae2b83a081959fff7ab2e96f4ce972d1'] = 'Créer un modèle';
 $_LANGADM['AdminSupplyOrderse450bbb38cb2b9bf61b33e5d4caa4610'] = 'Cette commande n’existe pas';
 $_LANGADM['AdminSupplyOrders84f632911d029cdf126102dcd1fcbe69'] = 'Statut de commande fournisseur';
-$_LANGADM['AdminSupplyOrders2fb7ea01f41085f71cffcf863307e88f'] = 'Nouveau statut de la commande :';
+$_LANGADM['AdminSupplyOrders5707dd244bf89fca30f29b7f57a18e75'] = 'Statut de commande :';
 $_LANGADM['AdminSupplyOrdersb58cbca3e505f4e3be0e5341ecf50c0f'] = 'Choisissez le nouveau statut de votre commande';
 $_LANGADM['AdminSupplyOrders38fb7d24e0d60a048f540ecb18e13376'] = 'Sauvegarder';
+$_LANGADM['AdminSupplyOrderse596830a32f866b26d75440fad83cc55'] = 'Attention quand vous changez le statut. Certains d\'entre eux ne peuvent plus être changer par la suite. (Annulé, par exemple).';
 $_LANGADM['AdminSupplyOrders52eb5928a34db3e3da7ba52b0644273b'] = 'EAN13';
 $_LANGADM['AdminSupplyOrdersfbd99ad01b92dbafc686772a39e3d065'] = 'UPC';
 $_LANGADM['AdminSupplyOrders49ee3087348e8d44e1feda1917443987'] = 'Nom';