Merge branch 'release' into development

themes/default/js/cart-summary.js

@@ -588,7 +588,7 @@ function updateCartSummary(json)
 			current_price = formatCurrency(product_list[i].price_wt, currencyFormat, currencySign, currencyBlank);
 		if (reduction && typeof(initial_price) !== 'undefined')
 		{
-			if (initial_price !== '' && initial_price > current_price)
+			if (initial_price !== '' && product_list[i].price_without_quantity_discount > product_list[i].price)
 				initial_price_text = '<span style="text-decoration:line-through;">'+initial_price+'</span><br />';
 		}
 

themes/default/shopping-cart.tpl

@@ -166,7 +166,7 @@
 				{displayPrice price=$total_discounts_negative}
 				</td>
 			</tr>
-			{if $use_taxes}
+			{if $use_taxes && $show_taxes}
 			<tr class="cart_total_price">
 				<td colspan="5">{l s='Total (tax excl.):'}</td>
 				<td colspan="2" class="price" id="total_price_without_tax">{displayPrice price=$total_price_without_tax}</td>