// Warehouse: getWarehouseList is now getWarehouses. Employee: it is not possible to delete an employee if he manages warehouses, anymore.

This commit is contained in:
bMancone
2011-11-14 14:28:30 +00:00
parent 5bde977d1f
commit 0fd7bdcea4
7 changed files with 34 additions and 10 deletions
+1 -1
View File
@@ -534,7 +534,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(false, $order->id_shop),
'warehouse_list' => Warehouse::getWarehouses(false, $order->id_shop),
'sources' => ConnectionsSource::getOrderSources($order->id),
'currentState' => OrderHistory::getLastOrderState($order->id),
'currency' => new Currency($order->id_currency),