Yes that's exactly what's happening. Maybe it happened in one of the R updates because I thought it worked previously in our 2012 edition.  May we should have kept the sequential numbering for everything as they originally had it. Iterestingly, the estimates work fine with our ES-### prefix and don't get mixed up with the invoices or credits.