* Add archived forms to the form handler
* Remove archived form if the year after it is no longer editable
* Filter logs list by existing forms only
* Add archived_lettings if it's not defined in json
* Rebase changes
* Fix unrelated test
* Send success email to merged users
* Update template id, date and remove username
* Send absorbing organisation success mail
* Update absorbing organisation email
* Only send emails to active users
* typo
* Send a different email is only one organisation is absorbed
* Correctly route to sales owning organisation page
* Display correct owning organisation options
* Set managing organisation as user organisation
* Add managing organisation question for sales
* Display managing organisation users in created_by
* set managing org to be same as owning org in BU
* Add managed by filter to sales
* Display reported by, correctly update owning org
* Update factory and 2022 BU
* refactor
* Merge managed sales logs
* test
* Update managing organisation for sales bulk upload
* Rebase tests
* skip a test as it is not relevant as the rake task would have already been ran
* PO fixes
* Remove old collection managed sales validation
* Update question header and filters conditions
* remove feature toggle
* feat: use latest merge date/start date where available for availability text for schemes and locations
* feat: add tests for availability text
* feat: use startdate instead to track merges on schemes and locations
* feat: test startdates are set correctly on merged schemes and locations
* feat: add migration file
* feat: add scheme activating soon tests
* feat: add activating soon to scheme filtering
* feat: update scheme active_status
* feat: update tests
* refactor: lint
* feat: move merge orgs validation after orgs validation
* feat: update schema
* feat: set encoding by bom for file IO before parsing
* feat: set bom encoding for illness task as well
* feat: use StringIOs in testing and fix row count bug found
* feat: revert toheaders: false
* feat: timecop around tests
* feat: timecop around tests
* feat: fix flaky merge test
* feat: don't add old_id to new location as there is a uniqueness constraint on this attribute
* feat: don't add old_id to new scheme for consistency
* feat: update tests
* feat: don't validate on log save so they can be added to new orgs without dsas during a merge, and test
* refactor: lint
* feat: remove old_visible_id from post merge schemes/locations so they aren't searchable in bulk upload
* feat: update tests
* feat: update tests
* feat: don't add old_id to new location as there is a uniqueness constraint on this attribute
* feat: don't add old_id to new scheme for consistency
* feat: update tests
* Allow custom merge date in merge organisations service
* Allow optional merge date in merge orgs task
* Add a rake task for merging into a new organinsation
kosiakkatrina
Robert Sullivan
natdeanlewissoftwire