Merge pull request #23419 from marination/payment-entry-ux

fix: Check Company in Payment Entry before selecting values