Changed ExtendedPrice to ExtendedPriceAfterDiscount
Made some tweeks
Switched ExtendedPriceAfterDiscount back to singular
Merge pull request #2287 from ten24/feature-taxintegration-ds

Changed ExtendedPrice to ExtendedPriceAfterDiscount