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