Merge branch 'master' of github.com:woothemes/woocommerce

Conflicts:
	readme.txt

Author: barrykooij

includes/class-wc-coupon.php

@@ -623,7 +623,8 @@ public function get_discount_amount( $discounting_amount, $cart_item = null, $si
 				$discount_percent = 0;
 
 				if ( WC()->cart->subtotal_ex_tax ) {
-					$discount_percent = ( $cart_item['data']->get_price_excluding_tax() * $cart_item['quantity'] ) / WC()->cart->subtotal_ex_tax;
+					// Uses price inc tax if prices include tax to work around https://github.com/woothemes/woocommerce/issues/7669
+					$discount_percent = ( $cart_item['data']->get_price() * $cart_item['quantity'] ) / ( wc_prices_include_tax() ? WC()->cart->subtotal : WC()->cart->subtotal_ex_tax );
 				}
 
 				$discount = min( ( $this->coupon_amount * $discount_percent ) / $cart_item['quantity'], $discounting_amount );

readme.txt

@@ -156,6 +156,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 * Tweak - Improved message when variation attributes are missing.
 * Tweak - Allow wc_attribute_label to support product-level attribute names.
 * Tweak - Added the option to not round the line total.
+* Tweak - Improved coupon percent calculation for fixed discounts.
 * Dev - API - reports/sales now also returns total refunds.
 
 = 2.3.5 - 20/02/2015 =