From b51bf1af256ca90d06c52c5d6ae48bf3f701aee9 Mon Sep 17 00:00:00 2001 From: Gregory Roussac Date: Tue, 29 Jan 2013 12:21:33 +0100 Subject: [PATCH] [-] BO : Fiw warning on $current_order_state --- controllers/admin/AdminOrdersController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 257db3ca5..060209413 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -1292,7 +1292,7 @@ class AdminOrdersControllerCore extends AdminController // display warning if there are products out of stock $display_out_of_stock_warning = false; $current_order_state = $order->getCurrentOrderState(); - if ($current_order_state->delivery != 1 && $current_order_state->shipped != 1) + if (!Validate::isLoadedObject($current_order_state) || ($current_order_state->delivery != 1 && $current_order_state->shipped != 1)) $display_out_of_stock_warning = true; // products current stock (from stock_available)