// BugFix with order states change and warehouse

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

admin-dev/themes/template/orders/view.tpl

@@ -32,12 +32,15 @@
 			$('#warehouse').show();
 		{/literal}{/if}{literal}
 	}
-
+	
 	function hideWarehouseList()
 	{
 		$('#warehouse').hide();
 	}
-	hideWarehouseList();
+	$(document).ready(function()
+	{
+		hideWarehouseList();
+	});
 {/literal}
 </script>
 

controllers/admin/AdminOrdersController.php

@@ -503,7 +503,7 @@ class AdminOrdersControllerCore extends AdminController
 			'carrier' => $carrier = new Carrier($order->id_carrier),
 			'history' => $order->getHistory($this->context->language->id),
 			'states' => OrderState::getOrderStates($this->context->language->id),
-			'warehouse_list' => Warehouse::getWarehouseList(),
+			'warehouse_list' => Warehouse::getWarehouseList(false, $order->id_shop),
 			'sources' => ConnectionsSource::getOrderSources($order->id),
 			'currentState' => OrderHistory::getLastOrderState($order->id),
 			'currency' => new Currency($order->id_currency),