Manual PO entry is not affected because the screen controls whether the currency type is added or not.
For Replenishment PO, you need to make sure that all the local vendor replenish runs are set to NOTYPE (as previously discussed…I checked and these are set correctly in BU2).