Index: /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 23513)
+++ /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 23519)
@@ -869,7 +869,9 @@
                 foreach ($arrAllShipmentItem[$shipping_index] as $key => $arrItem) {
                     $i = 0;
-                    foreach ($arrItem as $item) {
-                        $arrShipmentValues[$shipping_index][$i][str_replace('shipment_', '', $key)] = $item;
-                        $i++;
+                    if (is_array($arrItem)) {
+                        foreach ($arrItem as $item) {
+                            $arrShipmentValues[$shipping_index][$i][str_replace('shipment_', '', $key)] = $item;
+                            $i++;
+                        }
                     }
                 }