merging fixes for rc3 for 1.4

changes emails pulled to include billing ones for orders.

And a fix for COGS ap reversals