Anyone know much about kidney stones?

My partner had a kidney stone in Germany 12 years ago, they treated it successfully and no further problems. This morning at 4am he woke up in excrutiating pain, I made him a hot water bottle, no temperature or anything like that - then he was very sick with lots of bile - we think this may have dislodged it because it is not painful anymore - will it return do you think? He is taking a urine sample to the Docs later today. What is the treatment?