diff --git a/application/controllers/sales.php b/application/controllers/sales.php
index 33c7c0caa..7b34067e4 100644
--- a/application/controllers/sales.php
+++ b/application/controllers/sales.php
@@ -481,8 +481,8 @@ class Sales extends Secure_area
 		$this->sale_lib->copy_entire_sale($sale_id);
 		$data['cart']=$this->sale_lib->get_cart();
 		$data['payments']=$this->sale_lib->get_payments();
-		$data['subtotal']=$this->sale_lib->get_subtotal();
-		$data['discounted_subtotal']=$this->sale_lib->get_subtotal(TRUE);
+		$data['subtotal']=$this->sale_lib->get_subtotal(TRUE);
+		$data['discounted_subtotal']=$this->sale_lib->get_subtotal();
 		$data['taxes']=$this->sale_lib->get_taxes();
 		$data['total']=$this->sale_lib->get_total();
 		$data['discounts']=$this->sale_lib->get_discounts();
@@ -638,7 +638,7 @@ class Sales extends Secure_area
         $data['stock_locations']=$this->Stock_locations->get_allowed_locations('sales');
         $data['stock_location']=$this->sale_lib->get_sale_location();
         
-		$data['subtotal']=$this->sale_lib->get_subtotal();
+		$data['subtotal']=$this->sale_lib->get_subtotal(TRUE);
 		$data['taxes']=$this->sale_lib->get_taxes();
 		$data['discounts']=$this->sale_lib->get_discounts();
 		$data['total']=$this->sale_lib->get_total();
diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php
index 1dce571bb..a2f925c1f 100644
--- a/application/language/es/config_lang.php
+++ b/application/language/es/config_lang.php
@@ -91,7 +91,7 @@ $lang["config_print_left_margin_required"] = "The default left margin is a requi
 $lang["config_print_right_margin"] = "Margin Right";
 $lang["config_print_right_margin_number"] = "The default right margin must be a number";
 $lang["config_print_right_margin_required"] = "The default right margin is a required field";
-$lang["config_print_silently"] = "Top Margin";
+$lang["config_print_silently"] = "Show Print Dialog";
 $lang["config_print_top_margin"] = "Margin Top";
 $lang["config_print_top_margin_number"] = "The default top margin must be a number";
 $lang["config_print_top_margin_required"] = "The default top margin is a required field";
diff --git a/application/language/nl-BE/config_lang.php b/application/language/nl-BE/config_lang.php
index ccb3b3ed7..1af366b77 100755
--- a/application/language/nl-BE/config_lang.php
+++ b/application/language/nl-BE/config_lang.php
@@ -91,7 +91,7 @@ $lang["config_print_left_margin_required"] = "The default left margin is a requi
 $lang["config_print_right_margin"] = "Marge Rechts";
 $lang["config_print_right_margin_number"] = "The default right margin must be a number";
 $lang["config_print_right_margin_required"] = "The default right margin is a required field";
-$lang["config_print_silently"] = "Marge Boven";
+$lang["config_print_silently"] = "Toon Printvenster";
 $lang["config_print_top_margin"] = "Marge Boven";
 $lang["config_print_top_margin_number"] = "The default top margin must be a number";
 $lang["config_print_top_margin_required"] = "The default top margin is a required field";
diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php
index caa604758..77ec2a73a 100644
--- a/application/libraries/Sale_lib.php
+++ b/application/libraries/Sale_lib.php
@@ -575,10 +575,10 @@ class Sale_lib
 		return to_currency_no_money($subtotal);
 	}
 	
-	function get_item_total_tax_exclusive($item_id, $quantity, $price, $discount_percentage, $include_discounts=TRUE) 
+	function get_item_total_tax_exclusive($item_id, $quantity, $price, $discount_percentage, $include_discount=FALSE) 
 	{
 		$tax_info = $this->CI->Item_taxes->get_info($item_id);
-		$item_price = $this->get_item_total($quantity, $price, $discount_percentage);
+		$item_price = $this->get_item_total($quantity, $price, $discount_percentage, $include_discount);
 		// only additive tax here
 		foreach($tax_info as $tax)
 		{
@@ -609,7 +609,7 @@ class Sale_lib
 	
 	function get_item_tax($quantity, $price, $discount_percentage, $tax_percentage) 
 	{
-		$price = $this->get_item_total($quantity, $price, $discount_percentage);
+		$price = $this->get_item_total($quantity, $price, $discount_percentage, TRUE);
 
 		$tax_fraction = bcdiv($tax_percentage, 100, PRECISION);
 		if ($this->CI->config->config['tax_included'])
@@ -639,9 +639,9 @@ class Sale_lib
 		return $subtotal;
 	}
 
-	function get_total($discount_included=TRUE)
+	function get_total($discount_included=FALSE)
 	{
-		$total = $this->calculate_subtotal();		
+		$total = $this->calculate_subtotal($discount_included);		
 		
 		foreach($this->get_taxes() as $tax)
 		{
diff --git a/application/views/sales/receipt.php b/application/views/sales/receipt.php
index a5e6ad384..446b28bc4 100644
--- a/application/views/sales/receipt.php
+++ b/application/views/sales/receipt.php
@@ -86,7 +86,7 @@ if (isset($error_message))
 	
 	<tr>
 	<td colspan="3" style='text-align:right;border-top:2px solid #000000;'><?php echo $this->lang->line('sales_sub_total'); ?></td>
-	<td style='text-align:right;border-top:2px solid #000000;'><?php echo to_currency($subtotal); ?></td>
+	<td style='text-align:right;border-top:2px solid #000000;'><?php echo to_currency($discounted_subtotal); ?></td>
 	</tr>
 	<?php if ($this->Appconfig->get('show_total_discount')): ?> 
 	<?php foreach($discounts as $name=>$value) { ?>
@@ -97,7 +97,7 @@ if (isset($error_message))
 	<?php }; ?>
 	<tr>
 	<td colspan="3" style='text-align:right;border-top:2px solid #000000;'><?php echo $this->lang->line('sales_sub_total'); ?></td>
-	<td style='text-align:right;border-top:2px solid #000000;'><?php echo to_currency($discounted_subtotal); ?></td>
+	<td style='text-align:right;border-top:2px solid #000000;'><?php echo to_currency($subtotal); ?></td>
 	</tr>
 	<?php endif; ?>
 	<?php if ($this->Appconfig->get('receipt_show_taxes')): ?> 
diff --git a/translations/config_lang.csv b/translations/config_lang.csv
index 08ad587e6..02e43b79f 100644
--- a/translations/config_lang.csv
+++ b/translations/config_lang.csv
@@ -90,7 +90,7 @@ config_print_left_margin_required,The default left margin is a required field,Th
 config_print_right_margin,Marge Rechts,Margin Right,Margin Right,Margin Right,Margin Right,Margin Right,Margin Right,Margin Right,Margin Right
 config_print_right_margin_number,The default right margin must be a number,The default right margin must be a number,The default right margin must be a number,The default right margin must be a number,The default right margin must be a number,The default right margin must be a number,The default right margin must be a number,The default right margin must be a number,The default right margin must be a number
 config_print_right_margin_required,The default right margin is a required field,The default right margin is a required field,The default right margin is a required field,The default right margin is a required field,The default right margin is a required field,The default right margin is a required field,The default right margin is a required field,The default right margin is a required field,The default right margin is a required field
-config_print_silently,Marge Boven,Top Margin,Show Print Dialog,Show Print Dialog,Show Print Dialog,Show Print Dialog,Show Print Dialog,Show Print Dialog,Show Print Dialog
+config_print_silently,Toon Printvenster,Show Print Dialog,Show Print Dialog,Show Print Dialog,Show Print Dialog,Show Print Dialog,Show Print Dialog,Show Print Dialog,Show Print Dialog
 config_print_top_margin,Marge Boven,Margin Top,Margin Top,Margin Top,Margin Top,Margin Top,Margin Top,Margin Top,Margin Top
 config_print_top_margin_number,The default top margin must be a number,The default top margin must be a number,The default top margin must be a number,The default top margin must be a number,The default top margin must be a number,The default top margin must be a number,The default top margin must be a number,The default top margin must be a number,The default top margin must be a number
 config_print_top_margin_required,The default top margin is a required field,The default top margin is a required field,The default top margin is a required field,The default top margin is a required field,The default top margin is a required field,The default top margin is a required field,The default top margin is a required field,The default top margin is a required field,The default top margin is a required field