Much obliged. Catalog invoice has been updated; the template changes are now clearly marked (and the provided template files are from 1.5.7, but it's easy to compare so you can backport.)