annual_report_entire - added several new upgrade reports to the conditional that determines regular or split annual report.

equip_health_status.php - Changed the source column for the commencement date. It was originally the lastUpdate, but now will be the dateNewUpgrade.

Added conditional to only print last part of the first paragraph if org is a school, AND to only print last part of 2nd paragraph if org has < 3 remaining payments.

Added conditional to only print the 2nd paragraph of the closing note if there are < 3 payments left, because this paragraph suggests that an upgrade would be recommended.



avg_student_to_copy_usage,
avg_student_to_copy_usage_color,
proj_equip_costs_bldg - no values in Machine_Archive_Upgrades for NewCostCopy (for usage cost calculation). There is a CostCopy, should I use that one?

If this is projected (Anticipated, ProjColorVol), which table should it come from? Current_devices would be my guess since it is projecting into 2022. But there are no values for NewCostCopy or NewColorCPC in current_devices.
just add pre and post for actual annual

serv and supply usage profile by vendor -black


color_to_tot_vol_compare
Do you mean to add the pre and post, but only keep the same cylinders?

serv and supply usage profile
pre-upgrade will have 0 in the projected
filling type if pre-upgrade, then "close-out"

spc_serv_and_supply cost savings
Need to add to conditional for which report (reg or split)