fixed: display cod fee including tax on invoice pdf payment box if selected
fixed: reimplement invoice subtotal fix
fixed: only recalculate invoice subtotal if payment method code is phoenix_cashondelivery
fixed: don't call parent collect method to avoid adding subtotal twice
Merge pull request #2 from schnere/master

fixed invoice subtotal calculation failure, fixed cod fee including tax on pdf invoice