AP Aging with Early Payment Discount

When I have invoices that qualify for an early payment discount I want my Aged Payables (or Aged Cash Requirements) to use the early payment date as the due date.   How do I make this happen?

Here is how I've set up my discount.   The aging reports tell me the invoices are due the 30th of the next month.  I want them to tell me invoices are due the 15th of the next month.