Fix #1102 and #1098: fix AR/AP tax included and overwritten notes.

(grafted from 5c9e54e201eb67317da0b0003fe7f043d7cc6d2d)
(grafted from a30d0808e2db2cffcc2b49c1d120408398e9559b)

--HG--
extra : source : 5c9e54e201eb67317da0b0003fe7f043d7cc6d2d