Add fix for multishipping method not applying discount to final invoice ...

...and payment capture