John, to perhaps save you a certain amount of time, what you are talking about is essentially the difference between cash accounting and accrual accounting. Find a CPA (probably one already working for the same client you are) and learn how THEY handle it, then do likewise.