Line Amt wrongly recalculated for price list includes tax

We found that the code from this ticket:
https://sourceforge.net/p/adempiere/bugs/600/

Included a couple of mistakes:
1 - is calculating taxes just for line level taxes - it must include also doclevel taxes
2 - is calculating wrongly the new tax - it just work for exempt case, but not when changing to a new tax