What are the TM30 filing requirements for foreigners in Thailand after staying in a hotel or returning from abroad?

Benjamin Hays post was closed before I seen this.

"2. Immigration wants a TM30 filed 24 *business* hours after staying in a hotel anywhere in Thailand, or leaving the country otherwise I'll be fined."

This is different from what they told me at Kanchanaburi in January when I filed my last TM30. I was told only if returning from abroad. I am returning from a holiday abroad on the 10th July and will ask again for clarification.

Worth noting in Kanchanaburi the office for the TM30 is a separate building from the main pubic office and as such the people there do not have the same level of English as the officers at the Immigration desks. I suspect there is the usual inconsistency here depending on who you ask.