Fix order_id assignment in OrderInventory (2-0-stable)

same as #3712 but for 2-0-stable