Summary

Combine purchased from and vendors diapers purchased through on annual report

Why?

Essentially the same meaning (from a business pov), but from different sources. More compact report

Details

To see this, sign in as org_admin1@example.com, then click "Reports" and "Annual Survey". Pick a year, and "recalculate report".

"Purchased from" was used up til March 2019, then we put in vendors.

If we join purchased_from and vendors_purchased_from into a single "purchased from", labelled "Purchased from", that will preserve the meaning. Comma-separate them, but do not have a leading or trailing comma if only one is non-blank.

Note: We probably don't have any seed data for the "purchased from" case. We'll QA it on a copy of production data during the review process.

Criteria for completion

• changes as above
• tests (modified) to support them