Fixing bug 1246, entity-level addresses do not show on invoice
Merge pull request #445 from einhverfr/1.4

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