Sorry to disagree, HernĂ¡n. I find nothing wrong with "cuando llegue, vamos al supermercado".
Using present tense to talk about a future action in this kind of contexts sounds a lot more natural than using the future tense.
__________________
♪ ♫ ♪ Ain't it wonderful to be alive when the Rock'n'Roll plays... ♪ ♫ ♪
|