Merge sfl branch from lp

https://code.launchpad.net/openerp-canada

And add check visual improvement.
Take this line out please