More work on bug #8369.  It now more intellegently gets the report.  It will also set up the payroll based on the report_id.