Hi, I was able to get this combination working by merging /includes/classes/order.php. Both of the add-ons modify this file.

Please send me a private message if you would like a copy of this file.