Re paypal payments - Yes I did, another user posted an alternate approach also. I took the approach of intercepting the paypal transaction and adding it to the payments. The other approach was to look at paypal transactions when generating the report.

For the shipment filtering, I didn't post it. It's a bit more spread out - basically duplicating other filters but it affects several files in several locations. Seemed too messy, but I could probably dig that out if there's general interest. Shouldn't be too tough, as I use svn for all development.