Index: branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php	(revision 23563)
+++ branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php	(revision 23576)
@@ -1038,6 +1038,9 @@
         $arrResults = array();
         $objQuery->setOrder('order_detail_id');
-        $arrItems = $objQuery->select('dtb_shipment_item.*', 'dtb_shipment_item join dtb_order_detail USING (product_class_id, order_id)',
-                                      'order_id = ? AND shipping_id = ?',
+        $arrItems = $objQuery->select('dtb_shipment_item.*',
+                                      'dtb_shipment_item JOIN dtb_order_detail
+                                           ON dtb_shipment_item.product_class_id = dtb_order_detail.product_class_id
+                                           AND dtb_shipment_item.order_id = dtb_order_detail.order_id',
+                                      'dtb_order_detail.order_id = ? AND shipping_id = ?',
                                       array($order_id, $shipping_id));
 
Index: branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php	(revision 23574)
+++ branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php	(revision 23576)
@@ -219,6 +219,6 @@
             $col = 's_i.*, tax_rate, tax_rule';
             $from = 'dtb_shipment_item AS s_i JOIN dtb_order_detail AS o_d
-                USING(order_id, product_class_id)';
-            $where = 'order_id = ? AND shipping_id = ?';
+                ON s_i.order_id = o_d.order_id AND s_i.product_class_id = o_d.product_class_id';
+            $where = 'o_d.order_id = ? AND shipping_id = ?';
             $arrWhereVal = array($order_id, $arrRet[$key]['shipping_id']);
             $objQuery->setOrder('order_detail_id');