diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index bf9a25cc3..f084284e3 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -1154,7 +1154,7 @@ abstract class PaymentModuleCore extends Module
                             '{discounts_txt}' => $cart_rules_list_txt,
                             '{total_paid}' => Tools::displayPrice($order->total_paid, $this->context->currency, false),
                             '{total_products}' => Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? $order->total_products : $order->total_products_wt, $this->context->currency, false),
-                            '{total_discounts}' => Tools::displayPrice($order->total_discounts, $this->context->currency, false),
+                            '{total_discounts}' => Tools::displayPrice(-$order->total_discounts, $this->context->currency, false),
                             '{total_shipping}' => Tools::displayPrice($order->total_shipping, $this->context->currency, false),
                             '{total_wrapping}' => Tools::displayPrice($order->total_wrapping, $this->context->currency, false),
                             // '{total_tax_paid}' => Tools::displayPrice(($order->total_products_wt - $order->total_products) + ($order->total_shipping_tax_incl - $order->total_shipping_tax_excl), $this->context->currency, false),
diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php
index 2cb4b02e7..4747d5ee6 100644
--- a/controllers/front/OrderConfirmationController.php
+++ b/controllers/front/OrderConfirmationController.php
@@ -395,8 +395,8 @@ class OrderConfirmationControllerCore extends FrontController
                     $orderTotalInfo['total_paid_real'] += $objCartOrder->total_paid_real;
                 }
 
-                $totalTaxIncl = $orderTotalInfo['total_rooms_ti'] + $orderTotalInfo['total_services_ti'] + $orderTotalInfo['total_convenience_fee_ti'] + $orderTotalInfo['total_auto_add_services_ti'];
-                $totalTaxExcl = $orderTotalInfo['total_rooms_te'] + $orderTotalInfo['total_services_te'] + $orderTotalInfo['total_convenience_fee_te'] + $orderTotalInfo['total_auto_add_services_te'];
+                $totalTaxIncl = $orderTotalInfo['total_rooms_ti'] + $orderTotalInfo['total_services_ti'] + $orderTotalInfo['total_convenience_fee_ti'] + $orderTotalInfo['total_auto_add_services_ti'] + $orderTotalInfo['total_demands_price_ti'];
+                $totalTaxExcl = $orderTotalInfo['total_rooms_te'] + $orderTotalInfo['total_services_te'] + $orderTotalInfo['total_convenience_fee_te'] + $orderTotalInfo['total_auto_add_services_te'] + $orderTotalInfo['total_demands_price_te'];
                 $orderTotalInfo['total_tax_without_discount'] = $totalTaxIncl - $totalTaxExcl;
             }
 
diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html
index 4e161584f..763525bea 100755
--- a/mails/en/order_conf.html
+++ b/mails/en/order_conf.html
@@ -135,13 +135,8 @@
 	<td style="padding:7px 0">
 		<font size="2" face="Open-sans, sans-serif" color="#555454">
 			<table class="table table-recap" bgcolor="#ffffff" style="width:100%;border-collapse:collapse"><!-- Title -->
-				<tr>
-					<td colspan="9" style="border:1px solid #D6D4D4;text-align:center;color:#777;padding:7px 0">
-						&nbsp;&nbsp;{discounts}
-					</td>
-				</tr>
 				<tr class="conf_body">
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -154,7 +149,7 @@
 							</tr>
 						</table>
 					</td>
-					<td bgcolor="#f8f8f8" colspan="5" align="right" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" align="right" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -170,7 +165,7 @@
 				</tr>
 
 				<tr class="conf_body">
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -183,7 +178,7 @@
 							</tr>
 						</table>
 					</td>
-					<td bgcolor="#f8f8f8" colspan="5" align="right" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" align="right" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -198,7 +193,7 @@
 					</td>
 				</tr>
 				<tr class="conf_body">
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -211,7 +206,7 @@
 							</tr>
 						</table>
 					</td>
-					<td bgcolor="#f8f8f8" colspan="5" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -226,7 +221,7 @@
 					</td>
 				</tr>
 				<tr class="conf_body">
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -239,7 +234,7 @@
 							</tr>
 						</table>
 					</td>
-					<td bgcolor="#f8f8f8" colspan="5" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -254,7 +249,7 @@
 					</td>
 				</tr>
 				<tr class="conf_body">
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -267,7 +262,7 @@
 							</tr>
 						</table>
 					</td>
-					<td bgcolor="#f8f8f8" colspan="5" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -282,7 +277,7 @@
 					</td>
 				</tr>
 				<tr class="conf_body">
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -295,7 +290,7 @@
 							</tr>
 						</table>
 					</td>
-					<td bgcolor="#f8f8f8" colspan="5" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
diff --git a/mails/en/order_conf_admin.html b/mails/en/order_conf_admin.html
index ea4218d6a..09bc78bdd 100755
--- a/mails/en/order_conf_admin.html
+++ b/mails/en/order_conf_admin.html
@@ -149,11 +149,6 @@
 												{extra_demands_details_html}
 											</td>
 										</tr>
-										<tr>
-											<td colspan="9" style="border:1px solid #D6D4D4;text-align:center;color:#777;padding:7px 0">
-												&nbsp;&nbsp;{discounts}
-											</td>
-										</tr>
 										<tr class="conf_body">
 											<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 												<table class="table" style="width:100%;border-collapse:collapse">
diff --git a/mails/en/overbooking.html b/mails/en/overbooking.html
index 08122b12f..d005296c1 100755
--- a/mails/en/overbooking.html
+++ b/mails/en/overbooking.html
@@ -137,11 +137,6 @@
 	<td style="padding:7px 0">
 		<font size="2" face="Open-sans, sans-serif" color="#555454">
 			<table class="table table-recap" bgcolor="#ffffff" style="width:100%;border-collapse:collapse"><!-- Title -->
-				<tr>
-					<td colspan="2" style="border:1px solid #D6D4D4;text-align:center;color:#777;padding:7px 0">
-						&nbsp;&nbsp;{discounts}
-					</td>
-				</tr>
 				<tr class="conf_body">
 					<td bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
diff --git a/mails/en/overbooking.txt b/mails/en/overbooking.txt
index a9e93ab66..f4ad32eb3 100644
--- a/mails/en/overbooking.txt
+++ b/mails/en/overbooking.txt
@@ -29,8 +29,6 @@ Total Rooms Cost
 Total Extra Services Cost
 {total_extra_demands_te}
 
-{discounts}
-
 Discounts
 {total_discounts}
 
diff --git a/mails/en/overbooking_admin.html b/mails/en/overbooking_admin.html
index e2d0257c3..d06ff9a18 100755
--- a/mails/en/overbooking_admin.html
+++ b/mails/en/overbooking_admin.html
@@ -152,13 +152,6 @@
 												{extra_demands_details_html}
 											</td>
 										</tr>
-										<tr>
-											<td colspan="9" style="border:1px solid #D6D4D4;text-align:center;color:#777;padding:7px 0">
-												<table class="table" style="width:100%;border-collapse:collapse">
-													&nbsp;&nbsp;{discounts}
-												</table>
-											</td>
-										</tr>
 										<tr class="conf_body">
 											<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 												<table class="table" style="width:100%;border-collapse:collapse">