dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10103 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2011-11-14 14:28:30 +00:00
parent 9885ab5324
commit fdab7ebc70
7 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+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),