@jpda, would you post your "Pickup Locations" setting for the storepickup module (or send to me via PM) so that I can (a) replicate the issue and (b) give your solution a try?