How can we improve WHMCS?

On an invoice for a domain renewal the dates shown are determined by the expiration date of a domain.
The expiration date may be different from the renewal date. There could be a grace period or other differences.
This could cause a confusion to the customer. The end date the invoice is the expiration date, which actually should be the new renewal date.

There should be an option to use the renewal date on the invoices.