PHP-1280: add idDelivered and deliver date to flat;