Auto-populate procedure codes on invoices (from calendar)

If I’ve already assigned the procedure code for a session in my calendar, and I haven’t changed it when editing my progress note, why do I have to AGAIN select a procedure code to create an invoice? I often forget this step, and then have to do a bunch of unnecessary steps.