Fixing bug 1246, entity-level addresses do not show on invoice

--HG--
extra : source : 516455568eced519bf48694eb37f52be0cffd8e4
Merge pull request #444 from einhverfr/master

Fixing bug 1246, entity-level addresses do not show on invoice