Tax Report on Cash Basis

I’m going to add another complication to the tax report on cash basis as you are proposing @ced, on México we need to report tax for advance payments from customers or to suppliers for example if March 31 I got a payment from customer I must pay VAT from that payment on March even I generate the invoice on April 1st.