Multi Currency Reports

I’m Currently using the Multi Currency Feature of ERPnext
I noticed that the ERPnext Reports Currency does not show depending on Default Company Currency. it shows the Currency currently set on System > Settings > Global Defaults > Default Currency

What i did , i modified the to come up with this (added Currency Column that Changes Depending on Company Currency)

  1. I’m Wondering if This is the right way of doing this or there is a setting somewhere to show company curreny instead of default currency.

  2. Or is there a new update for this reports can’t seem to find one.