Fixing invoice for upgrade orders... again