Update merge_company.py

[bau123]

Description of change

Allow for the merge tool to let companies with the transferred_field to be included in company merges

Manually tested scenarios:

• Company_A (has no merge) merged into Company_B (has no merge)
• Company_C (has no merge) merged into Company_B (has transferred_from)
• Company_D (has no merge) merged into Company_E (has no merge)
• Company_E (has transferred_from) merged into Company_B (has transferred_from)
• Company_B (has transferred_from) into Company_F (has no merge)

Checklist

• Has this branch been rebased on top of the current main branch?

  Explanation

  The branch should not be stale or have conflicts at the time reviews are requested.

• Is the CircleCI build passing?

General points

Other things to check

• Make sure fixtures/test_data.yaml is maintained when updating models
• Consider the admin site when making changes to models
• Use select-/prefetch-related field lists in views and search apps, and update them when fields are added
• Make sure the README is updated e.g. when adding new environment variables

See docs/CONTRIBUTING.md for more guidelines.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.62%. Comparing base (126fc2f) to head (172cf63).
Report is 8 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #5979      +/-   ##
==========================================
- Coverage   96.63%   96.62%   -0.01%     
==========================================
  Files        1084     1084              
  Lines       25414    25414              
  Branches     1678     1678              
==========================================
- Hits        24559    24557       -2     
- Misses        698      699       +1     
- Partials      157      158       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[baarkerlounger]

There should definitely be some tests here for the scenarios in the description.

[DeanElliott96]

Looks good, think the existing tests and the new ones cover the bases! Just a couple comments to try and prevent flaky tests.