Add Credit Term End Of Month + x Days, Not just End of following Month
You have added end of the following month credit terms, you also have x days credit terms. We also need a combination of the two, so End of Month + x Days. This would account for EOM + 30, EOM + 60, EOM +90 or any other combination of EOM + x Days.