Thanks for the clarification. We are experimenting with manually editing the Discount Base on the Totals screen to exclude freight. So far it looks like the desired effect is achieved by doing so.