Remove changes in production from #6061

[melton-jason]

Should fix #6141

This might be in part because of a problem introduced via merges in Apply COG sibling logic to loan returns #6038. Here's what happened:

• A bunch of changes were made on the branch (see Apply COG sibling logic to loan returns #6038 (comment))
• The changes were moved to Improve COG + Interaction capability #6061
  *The branch in Apply COG sibling logic to loan returns #6038 was force-pushed back to a2d1a26
• The changes which were moved were unintentionally introduced back into the branch for Apply COG sibling logic to loan returns #6038 in a3e53d7

This bug is likely the result of having the code from #6061 being introduced into production. Even if this direct bug is not caused because of the incorrect merge, we should remove the unintentional changes and implement them later in #6061

From #6141 (comment)

Here's what I did to resolve this:

• I cherry picked the 3b11969..96e43e9 commits onto the commit before the changes that were supposed to only be in Improve COG + Interaction capability #6061 were merged back into Apply COG sibling logic to loan returns #6038: a2d1a26
  • NOTE: some of the commits from the range might not be needed or cause bugs (because they were from a version which included the code of Improve COG + Interaction capability #6061). I did not go through the logic nor ensure the bugs after a3e53d7 in Apply COG sibling logic to loan returns #6038 were present or resolved
• I merged production into this branch without automatically committing
• I inspected/checked-out the files from the branch HEAD which were changed from f2c9261..eb74ca5

Checklist

• Self-review the PR after opening it to make sure the changes look good and
  self-explanatory (or properly documented)
• Add automated tests
• Add relevant issue to release milestone
• Add relevant documentation (Tester - Dev)

Testing instructions

@specify/developers

• Please make sure that ONLY the changes from f2c9261..eb74ca5 are removed.
• I did a precursory check to ensure that there has not been any changes to the respective files outside of Apply COG sibling logic to loan returns #6038 that we are potentially overriding, but please double check my work 🙏

@specify/ux-testing

• While testing, ensure that no feature from Apply COG sibling logic to loan returns #6038 (comment) is present

Ensure that everything from #6038 is functional. Here are the testing instructions from #6038 (comment):

• Create a new consolidated COG. Go to http://localhost/specify/view/collectionobjectgroup/new/, set the name, then set the cogType to consolidated. Save.
• Add a new child CO with a new prep. Set the count to 2.
• Repeat: Add a new child CO with a new prep. Set the count to 2.
• Save.
• Create a new loan, use the catalog numbers from the new COs so that both of the new preps are in the loan preps.
• Set the loan number to something random.
• Save.
• Click 'Return Loan'.
• Select the first loan prep only. Set the quantity returned and quantity resolved to 1.
• Save.
• Refresh page.
• See that both of the loan preps have been fully returned. See that the quantity returned and quantity resolved are both 2.
• Verify that the behavior for prep CO that are not a part of consolidated COG is the same as before.

==> The purpose of these tests is to verify that the count returned is set to the maximum, whatever the number entered by the user + verify that all siblings of a prep CO that is a part of a consolidated COG are also returned to they max.

[emenslin]

• While testing, ensure that no feature from Apply COG sibling logic to loan returns #6038 (comment) is present
• See that both of the loan preps have been fully returned. See that the quantity returned and quantity resolved are both 2.
• Verify that the behavior for prep CO that are not a part of consolidated COG is the same as before.

Looks good! Behvaior seems to be reverted.