added discounted at 100% by type and discounted 20.1%-99% by type
added xlsx output lines