I often give the user a choice to convert (using a variable in an input control) and avoid inputting the M for million beside the value. I'll indicate the number format in the column/row header (in Millions).

Input control changes both the header title at the top (Millions / Thousands / hundreds, etc) adjust the key figure by dividing to the correct multiple.