Discount Item and Promotions in Invoice Advanced PDF

Hi Gurus,

I'm having trouble showing customers how much their order has been discounted in the Advanced PDF template when the source of the discount is both from a Promotion and manually added Discount Item.

I've added the following snippet to the PDF template:

<!-- Add Promotions -->

   <#if record.promotions?has_content>

     <#list record.promotions as promotions>

     <tr>

       <td align="left" colspan="3">${promotions.promocode}</td>

       <td align="right" colspan="3">(${promotions.purchasediscount?replace("-","$ ")})</td>

     </tr>

     </#list>

</#if>

<!-- End Promotions -->

This adds a list of promotions applied to the invoice to the PDF, which is good. However, it becomes problematic if the Promotion has added a Discount Item to the invoice as well. In this case, the Discount Item shows in the list of items for the invoice, and again in the list of promotions. If I filter out discount items from the list of invoice items then manually added discount items get filtered out as well.