diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl
index 453398fd0..c697a8b6f 100644
--- a/admin/themes/default/template/controllers/orders/_product_line.tpl
+++ b/admin/themes/default/template/controllers/orders/_product_line.tpl
@@ -124,7 +124,7 @@
                     </button>
                     <ul class="dropdown-menu" role="menu">
                         <li>
-                            <a href="#" class="room_reallocate_swap" id="reallocate_room_{$data['id']}" data-room_type_name="{$data['room_type_name']}" data-toggle="modal" data-target="#mySwappigModal" data-id_htl_booking="{$data['id']}" data-id_order="{$data['id_order']}" data-room_num='{$data.room_num}' data-id_room_type='{$data.id_product}' data-cust_name='{$data.alloted_cust_name}' data-cust_email='{$data.alloted_cust_email}' data-avail_rm_swap='{$data.avail_rooms_to_swap|@json_encode}' data-avail_realloc_room_types='{$data.avail_room_types_to_realloc|@json_encode}' data-allotment_type='{$data['booking_type']}' data-allotment_type_label='{if $data['booking_type'] == $ALLOTMENT_MANUAL}{l s='Manual'}{else}{l s='Auto'}{/if}' data-comment='{$data.comment}'>
+                            <a href="#" class="room_reallocate_swap" id="reallocate_room_{$data['id']}" data-room_type_name="{$data['room_type_name']}" data-toggle="modal" data-target="#mySwappigModal" data-id_htl_booking="{$data['id']}" data-id_order="{$data['id_order']}" data-room_num='{$data.room_num}' data-id_room_type='{$data.id_product}' data-cust_name='{$data.alloted_cust_name}' data-cust_email='{$data.alloted_cust_email}' data-avail_rm_swap='{$data.avail_rooms_to_swap|@json_encode}' data-avail_realloc_room_types='{$data.avail_room_types_to_realloc|@json_encode}' data-allotment_type='{$data.booking_type}' data-allotment_type_label='{if $data.booking_type == $ALLOTMENT_MANUAL}{l s='Manual'}{else}{l s='Auto'}{/if}' data-comment='{$data.comment}'>
                                 <i class="icon-refresh"></i>
                                 {l s='Reallocate/Swap Room'}
                             </a>
diff --git a/admin/themes/default/template/controllers/orders/modals/_extra_services_facilities_tab_content.tpl b/admin/themes/default/template/controllers/orders/modals/_extra_services_facilities_tab_content.tpl
index 4dee95332..4112322bb 100644
--- a/admin/themes/default/template/controllers/orders/modals/_extra_services_facilities_tab_content.tpl
+++ b/admin/themes/default/template/controllers/orders/modals/_extra_services_facilities_tab_content.tpl
@@ -45,7 +45,7 @@
 									<td>
 										<div class="input-group">
 											<span class="input-group-addon">{$currencySign}</span>
-											<input type="text" class="form-control unit_price" value="{Tools::ps_round($demand['unit_price_tax_excl'], 2)}">
+											<input type="text" class="form-control unit_price" value="{$demand['unit_price_tax_excl']}">
 											{if $demand['price_calc_method'] == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY}
 												<span class="input-group-addon">{l s='/ night'}</span>
 											{/if}
@@ -115,7 +115,7 @@
 											{else}
 												{assign  var=demand_price value=$demand['price_tax_excl']}
 											{/if}
-											<input type="text" class="form-control unit_price" value="{Tools::ps_round($demand_price, 2)}" data-id-product="{$product['id_product']}">
+											<input type="text" class="form-control unit_price" value="{$demand_price}" data-id-product="{$product['id_product']}">
 											{if $demand['price_calc_method'] == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY}
 												<span class="input-group-addon">{l s='/ night'}</span>
 											{/if}
diff --git a/admin/themes/default/template/controllers/products/additionalfacilities.tpl b/admin/themes/default/template/controllers/products/additionalfacilities.tpl
index eb40e083e..6c45ffe9e 100644
--- a/admin/themes/default/template/controllers/products/additionalfacilities.tpl
+++ b/admin/themes/default/template/controllers/products/additionalfacilities.tpl
@@ -78,7 +78,7 @@
                                         <td class="demand_price_{$demand['id_global_demand']}">
                                             <div class="input-group price_input" {if !isset($selectedDemands[$demand['id_global_demand']])}style="display:none"{/if}>
                                                 <span class="input-group-addon">{$defaultcurrencySign|escape:'html':'UTF-8'}</span>
-                                                <input type="text" name="option_price_{$option['id']|escape:'html':'UTF-8'}" value="{if isset($selectedDemands[$demand['id_global_demand']]['adv_option'][$option['id']]['price'])}{Tools::ps_round($selectedDemands[$demand['id_global_demand']]['adv_option'][$option['id']]['price'], 2)|escape:'html':'UTF-8'}{else}{Tools::ps_round($option['price'], 2)|escape:'html':'UTF-8'}{/if}"/>
+                                                <input type="text" name="option_price_{$option['id']|escape:'html':'UTF-8'}" value="{if isset($selectedDemands[$demand['id_global_demand']]['adv_option'][$option['id']]['price'])}{$selectedDemands[$demand['id_global_demand']]['adv_option'][$option['id']]['price']|escape:'html':'UTF-8'}{else}{$option['price']|escape:'html':'UTF-8'}{/if}"/>
                                             </div>
                                             <div class="price_display" {if isset($selectedDemands[$demand['id_global_demand']])}style="display:none"{/if}>
                                                 {displayPrice price={$option['price']|escape:'html':'UTF-8'}  currency=$idDefaultcurrency}
@@ -112,7 +112,7 @@
                                             <div class="input-group price_input" {if !isset($selectedDemands[$demand['id_global_demand']])}style="display:none"{/if}>
                                                 <span class="input-group-addon">{$defaultcurrencySign|escape:'html':'UTF-8'}</span>
                                                 <input type="text" name="demand_price_{$demand['id_global_demand']|escape:'html':'UTF-8'}"
-                                                value="{if isset($selectedDemands[$demand['id_global_demand']]['price'])}{Tools::ps_round($selectedDemands[$demand['id_global_demand']]['price'], 2)|escape:'html':'UTF-8'}{elseif isset($demand['price'])}{Tools::ps_round($demand['price'], 2)|escape:'html':'UTF-8'}{/if}"/>
+                                                value="{if isset($selectedDemands[$demand['id_global_demand']]['price'])}{$selectedDemands[$demand['id_global_demand']]['price']|escape:'html':'UTF-8'}{elseif isset($demand['price'])}{$demand['price']|escape:'html':'UTF-8'}{/if}"/>
                                             </div>
                                             <div class="price_display" {if isset($selectedDemands[$demand['id_global_demand']])}style="display:none"{/if}>
                                                 {displayPrice price={$demand['price']|escape:'html':'UTF-8'} currency=$idDefaultcurrency}
diff --git a/classes/Cart.php b/classes/Cart.php
index dc03b79b3..6fef5ee79 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -721,29 +721,6 @@ public function getProducts($refresh = false, $id_product = false, $id_country =
                 $cart_shop_context
             );
 
-            /*Before Changes by webkul*/
-            // switch (Configuration::get('PS_ROUND_TYPE'))
-            // {
-            // 	case Order::ROUND_TOTAL:
-            // 		$row['total'] = $row['price_with_reduction_without_tax'] * (int)$row['cart_quantity'];
-            // 		$row['total_wt'] = $row['price_with_reduction'] * (int)$row['cart_quantity'];
-            // 		break;
-            // 	case Order::ROUND_LINE:
-            // 		$row['total'] = Tools::ps_round($row['price_with_reduction_without_tax'] * (int)$row['cart_quantity'], _PS_PRICE_COMPUTE_PRECISION_);
-            // 		$row['total_wt'] = Tools::ps_round($row['price_with_reduction'] * (int)$row['cart_quantity'], _PS_PRICE_COMPUTE_PRECISION_);
-            // 		break;
-
-            // 	case Order::ROUND_ITEM:
-            // 	default:
-            // 		$row['total'] = Tools::ps_round($row['price_with_reduction_without_tax'], _PS_PRICE_COMPUTE_PRECISION_) * (int)$row['cart_quantity'];
-            // 		$row['total_wt'] = Tools::ps_round($row['price_with_reduction'], _PS_PRICE_COMPUTE_PRECISION_) * (int)$row['cart_quantity'];
-            // 		break;
-            // }
-            //$row['price_wt'] = $row['price_with_reduction'];
-            //
-            //
-            /*By Webkul */
-
             if ($row['booking_product']) {
                 if (Module::isInstalled('hotelreservationsystem') && Module::isEnabled('hotelreservationsystem')) {
                     require_once _PS_MODULE_DIR_.'hotelreservationsystem/define.php';
@@ -757,81 +734,57 @@ public function getProducts($refresh = false, $id_product = false, $id_country =
                     $priceDisplay = Group::getPriceDisplayMethod(Group::getCurrent()->id);
                     foreach ($roomTypesByIdProduct as $key => $cartRoomInfo) {
                         $roomTotalPrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice(
-                        $cartRoomInfo['id_product'],
-                        $cartRoomInfo['date_from'],
-                        $cartRoomInfo['date_to'],
-                        0,
-                        Group::getCurrent()->id,
-                        $cartRoomInfo['id_cart'],
-                        $cartRoomInfo['id_guest'],
-                        $cartRoomInfo['id_room'],
-                        0
-                    );
+                            $cartRoomInfo['id_product'],
+                            $cartRoomInfo['date_from'],
+                            $cartRoomInfo['date_to'],
+                            0,
+                            Group::getCurrent()->id,
+                            $cartRoomInfo['id_cart'],
+                            $cartRoomInfo['id_guest'],
+                            $cartRoomInfo['id_room'],
+                            0
+                        );
                         $totalPriceByProductTaxIncl += $roomTotalPrice['total_price_tax_incl'];
                         $totalPriceByProductTaxExcl += $roomTotalPrice['total_price_tax_excl'];
                     }
 
-                    switch (Configuration::get('PS_ROUND_TYPE')) {
-                        case Order::ROUND_TOTAL:
-                            $row['total'] = $totalPriceByProductTaxExcl;
-                            $row['total_wt'] = $totalPriceByProductTaxIncl;
-                            break;
-                        case Order::ROUND_LINE:
-                            $row['total'] = Tools::ps_round($totalPriceByProductTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
-                            $row['total_wt'] = Tools::ps_round($totalPriceByProductTaxIncl, _PS_PRICE_COMPUTE_PRECISION_);
-                            break;
-
-                        case Order::ROUND_ITEM:
-                        default:
-                            $row['total'] = Tools::ps_round($totalPriceByProductTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
-                            $row['total_wt'] = Tools::ps_round($totalPriceByProductTaxIncl, _PS_PRICE_COMPUTE_PRECISION_);
-                            break;
-                    }
+                    // Rounding as per configurations
+                    $row['total'] = Tools::processPriceRounding($totalPriceByProductTaxExcl);
+                    $row['total_wt'] = Tools::processPriceRounding($totalPriceByProductTaxIncl);
                 }
             } else if  (Product::SERVICE_PRODUCT_WITH_ROOMTYPE == $row['service_product_type']) {
+                $row['total'] = 0;
+                $row['total_wt'] = 0;
                 $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
-                $totalPriceByProductTaxIncl = $objRoomTypeServiceProductCartDetail->getServiceProductsTotalInCart($this->id, (int)$row['id_product'], 0, 0, 0, 0, 0, true, null);
-                $totalPriceByProductTaxExcl = $objRoomTypeServiceProductCartDetail->getServiceProductsTotalInCart($this->id, (int)$row['id_product'], 0, 0, 0, 0, 0, false, null);
-
-
-                switch (Configuration::get('PS_ROUND_TYPE')) {
-                    case Order::ROUND_TOTAL:
-                        $row['total'] = $totalPriceByProductTaxExcl;
-                        $row['total_wt'] = $totalPriceByProductTaxIncl;
-                        break;
-                    case Order::ROUND_LINE:
-                        $row['total'] = Tools::ps_round($totalPriceByProductTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
-                        $row['total_wt'] = Tools::ps_round($totalPriceByProductTaxIncl, _PS_PRICE_COMPUTE_PRECISION_);
-                        break;
-
-                    case Order::ROUND_ITEM:
-                    default:
-                        $row['total'] = Tools::ps_round($totalPriceByProductTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
-                        $row['total_wt'] = Tools::ps_round($totalPriceByProductTaxIncl, _PS_PRICE_COMPUTE_PRECISION_);
-                        break;
+                if ($servicesWithRoom = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
+                    $this->id,
+                    (int)$row['id_product'],
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    null,
+                    $row['auto_add_to_cart'],
+                    null,
+                    null
+                )) {
+                    foreach ($servicesWithRoom as $service) {
+                        // Rounding as per configurations
+                        $row['total'] += Tools::processPriceRounding($service['unit_price_tax_excl'], $service['quantity']);
+                        $row['total_wt'] += Tools::processPriceRounding($service['unit_price_tax_incl'], $service['quantity']);
+                    }
                 }
             } else {
                 $objHotelServiceProductCartDetail = new HotelServiceProductCartDetail();
                 $unitPriceByProductTaxIncl = $objHotelServiceProductCartDetail->getHotelProductUnitPrice($this->id, (int)$row['id_product'], 0, true);
                 $unitPriceByProductTaxExcl = $objHotelServiceProductCartDetail->getHotelProductUnitPrice($this->id, (int)$row['id_product'], 0, false);
 
-                switch (Configuration::get('PS_ROUND_TYPE'))
-                {
-                    case Order::ROUND_TOTAL:
-                        $row['total'] = $unitPriceByProductTaxExcl * (int)$row['cart_quantity'];
-                        $row['total_wt'] = $unitPriceByProductTaxIncl * (int)$row['cart_quantity'];
-                        break;
-                    case Order::ROUND_LINE:
-                        $row['total'] = Tools::ps_round($unitPriceByProductTaxExcl * (int)$row['cart_quantity'], _PS_PRICE_COMPUTE_PRECISION_);
-                        $row['total_wt'] = Tools::ps_round($unitPriceByProductTaxIncl * (int)$row['cart_quantity'], _PS_PRICE_COMPUTE_PRECISION_);
-                        break;
+                // Rounding as per configurations
+                $row['total'] += Tools::processPriceRounding($unitPriceByProductTaxExcl, $row['cart_quantity']);
+                $row['total_wt'] += Tools::processPriceRounding($unitPriceByProductTaxIncl, $row['cart_quantity']);
 
-                    case Order::ROUND_ITEM:
-                    default:
-                        $row['total'] = Tools::ps_round($unitPriceByProductTaxExcl, _PS_PRICE_COMPUTE_PRECISION_) * (int)$row['cart_quantity'];
-                        $row['total_wt'] = Tools::ps_round($unitPriceByProductTaxIncl, _PS_PRICE_COMPUTE_PRECISION_) * (int)$row['cart_quantity'];
-                        break;
-                }
                 $row['price_wt'] = $row['price_with_reduction'];
             }
 
@@ -1794,19 +1747,36 @@ public function getOrderTotal($with_taxes = true, $type = Cart::BOTH, $products
                 $objHotelServiceProductCartDetail = new HotelServiceProductCartDetail();
                 $price = $objHotelServiceProductCartDetail->getHotelProductUnitPrice($this->id, (int)$product['id_product'], 0, $with_taxes);
             } else if (!$product['booking_product'] && Product::SERVICE_PRODUCT_WITH_ROOMTYPE == $product['service_product_type']) {
-
                 $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
-                $totalPriceByProduct = $objRoomTypeServiceProductCartDetail->getServiceProductsTotalInCart(
+                if ($servicesWithRoom = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
                     $this->id,
                     (int)$product['id_product'],
-                    isset($product['id_hotel']) ? $product['id_hotel'] : 0,
                     0,
                     0,
                     0,
                     0,
-                    $with_taxes,
+                    0,
+                    0,
+                    null,
+                    $product['auto_add_to_cart'],
+                    null,
                     null
-                );
+                )) {
+                    foreach ($servicesWithRoom as $service) {
+                        if ($with_taxes) {
+                            $servicePrice = $service['total_price_tax_incl'];
+                        } else {
+                            $servicePrice = $service['total_price_tax_excl'];
+                        }
+
+                        // Rounding as per configurations
+                        if ($ps_round_type == Order::ROUND_TOTAL) {
+                            $products_total[$id_tax_rules_group.'_'.$id_address] += $servicePrice;
+                        } else {
+                            $products_total[$id_tax_rules_group] += $servicePrice;
+                        }
+                    }
+                }
             } else if ($roomTypesByIdProduct = $objCartBookingData->getCartInfoIdCartIdProduct($this->id, $product['id_product'])) {
                 // by webkul to calculate rates of the product from hotelreservation syatem tables with feature prices....
                 $totalPriceByProduct = 0;
@@ -1825,9 +1795,9 @@ public function getOrderTotal($with_taxes = true, $type = Cart::BOTH, $products
                         0
                     );
                     if ($with_taxes) {
-                        $totalPriceByProduct += $roomTotalPrice['total_price_tax_incl'];
+                        $totalPriceByProduct = $roomTotalPrice['total_price_tax_incl'];
                     } else {
-                        $totalPriceByProduct += $roomTotalPrice['total_price_tax_excl'];
+                        $totalPriceByProduct = $roomTotalPrice['total_price_tax_excl'];
                     }
 
                     // If customer has selected advance payment of the cart
@@ -1846,40 +1816,16 @@ public function getOrderTotal($with_taxes = true, $type = Cart::BOTH, $products
                             $totalPriceByProduct = $advProductPrice;
                         }
                     }
-                }
-            }
-
-            switch ($ps_round_type) {
-                case Order::ROUND_TOTAL:
-                    if ($product['booking_product'] || (Product::SERVICE_PRODUCT_WITH_ROOMTYPE == $product['service_product_type'])) {
-                        $products_total[$id_tax_rules_group.'_'.$id_address] += $totalPriceByProduct;
-                    } else {
-                        $products_total[$id_tax_rules_group.'_'.$id_address] += $price * (int)$product['cart_quantity'];
-                    }
-                    break;
 
-                case Order::ROUND_LINE:
-                    if ($product['booking_product'] || (Product::SERVICE_PRODUCT_WITH_ROOMTYPE == $product['service_product_type'])) {
-                        $product_price = $totalPriceByProduct;
+                    // Rounding as per configurations
+                    if ($ps_round_type == Order::ROUND_TOTAL) {
+                        $products_total[$id_tax_rules_group.'_'.$id_address] += Tools::processPriceRounding($totalPriceByProduct);
                     } else {
-                        $product_price = $price * $product['cart_quantity'];
+                        $products_total[$id_tax_rules_group] += Tools::processPriceRounding($totalPriceByProduct);
                     }
-                    $products_total[$id_tax_rules_group] += Tools::ps_round($product_price, $compute_precision);
-                    break;
-
-                case Order::ROUND_ITEM:
-                default:
-                    if ($product['booking_product'] || (Product::SERVICE_PRODUCT_WITH_ROOMTYPE == $product['service_product_type'])) {
-                        $product_price = $totalPriceByProduct;
-                        $products_total[$id_tax_rules_group] += Tools::ps_round($product_price, $compute_precision);
-                    } else {
-                        $product_price = /*$with_taxes ? $tax_calculator->addTaxes($price) : */$price;
-                        $products_total[$id_tax_rules_group] += Tools::ps_round($product_price, $compute_precision) * (int)$product['cart_quantity'];
-                    }
-                    break;
+                }
             }
 
-
             // price of extra demands on room type in the cart
             $totalDemandsPrice += $objCartBookingData->getCartExtraDemands($this->id, $product['id_product'], 0, 0, 0, 1, 0, (int)$with_taxes);
         }
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 7916bd3ce..9c2cfb082 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -540,7 +540,7 @@ public function validateOrder($id_cart, $id_order_state, $amount_paid, $payment_
                         $price_wt = Product::getPriceStatic((int)$product['id_product'], true, ($product['id_product_attribute'] ? (int)$product['id_product_attribute'] : null), 2, null, false, true, $product['cart_quantity'], false, (int)$order->id_customer, (int)$order->id_cart);
 
 
-                        $product_price = Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt;
+                        $product_price = Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, _PS_PRICE_COMPUTE_PRECISION_) : $price_wt;
 
                         $product_var_tpl = array(
                             'reference' => $product['reference'],
@@ -819,10 +819,11 @@ public function validateOrder($id_cart, $id_order_state, $amount_paid, $payment_
                                     $objCartBookingData->id_room,
                                     0
                                 );
+
                                 $objBookingDetail->date_from = $objCartBookingData->date_from;
                                 $objBookingDetail->date_to = $objCartBookingData->date_to;
-                                $objBookingDetail->total_price_tax_excl = Tools::ps_round($total_price['total_price_tax_excl'], 6);
-                                $objBookingDetail->total_price_tax_incl = Tools::ps_round($total_price['total_price_tax_incl'], 6);
+                                $objBookingDetail->total_price_tax_excl = $total_price['total_price_tax_excl'];
+                                $objBookingDetail->total_price_tax_incl = $total_price['total_price_tax_incl'];
                                 $objBookingDetail->adults = $objCartBookingData->adults;
                                 $objBookingDetail->children = $objCartBookingData->children;
                                 $objBookingDetail->child_ages = $objCartBookingData->child_ages;
@@ -850,7 +851,7 @@ public function validateOrder($id_cart, $id_order_state, $amount_paid, $payment_
                                 }
 
                                 /*for saving details of the advance payment product wise*/
-                                $objBookingDetail->total_paid_amount = Tools::ps_round($total_price['total_price_tax_incl'], 5);
+                                $objBookingDetail->total_paid_amount = $total_price['total_price_tax_incl'];
                                 if ($this->context->cart->is_advance_payment) {
                                     $prod_adv_payment = $objAdvancedPayment->getIdAdvPaymentByIdProduct($idProduct);
                                     if (!$prod_adv_payment
@@ -898,18 +899,17 @@ public function validateOrder($id_cart, $id_order_state, $amount_paid, $payment_
                                                 $idOption,
                                                 1
                                             );
-                                            $qty = 1;
+
+                                            $numDays = 1;
                                             if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
                                                 $numDays = $objBookingDetail->getNumberOfDays(
                                                     $objBookingDetail->date_from,
                                                     $objBookingDetail->date_to
                                                 );
-                                                if ($numDays > 1) {
-                                                    $qty *= $numDays;
-                                                }
                                             }
-                                            $objBookingDemand->total_price_tax_excl = $objBookingDemand->unit_price_tax_excl * $qty;
-                                            $objBookingDemand->total_price_tax_incl = $objBookingDemand->unit_price_tax_incl * $qty;
+
+                                            $objBookingDemand->total_price_tax_excl = Tools::processPriceRounding(($objBookingDemand->unit_price_tax_excl * $numDays));
+                                            $objBookingDemand->total_price_tax_incl = Tools::processPriceRounding(($objBookingDemand->unit_price_tax_incl * $numDays));
 
                                             $objBookingDemand->price_calc_method = $objGlobalDemand->price_calc_method;
                                             $objBookingDemand->id_tax_rules_group = $objGlobalDemand->id_tax_rules_group;
diff --git a/classes/Tools.php b/classes/Tools.php
index b58175fab..dae105344 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -3800,6 +3800,27 @@ public static function arrayReplaceRecursive($base, $replacements)
         }
         return $base;
     }
+
+    public static function processPriceRounding($value, $qty = 1, $roundType = null, $roundMode = null)
+    {
+        if (!$roundType) {
+            $roundType = Configuration::get('PS_ROUND_TYPE');
+        }
+        switch ($roundType) {
+            case Order::ROUND_TOTAL:
+                $value = $value;
+                break;
+            case Order::ROUND_LINE:
+                $value = Tools::ps_round(($value * $qty), _PS_PRICE_COMPUTE_PRECISION_, $roundMode);
+                break;
+            case Order::ROUND_ITEM:
+            default:
+                $value = Tools::ps_round($value, _PS_PRICE_COMPUTE_PRECISION_, $roundMode) * $qty;
+                break;
+        }
+
+        return $value;
+    }
 }
 
 /**
diff --git a/classes/order/Order.php b/classes/order/Order.php
index 3b64e3df4..3b8565bc6 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -2535,20 +2535,8 @@ public function getProductTaxesDetails($limitToOrderDetails = false, $bookingPro
             }
             foreach ($tax_calculator->getTaxesAmount($discounted_price_tax_excl) as $id_tax => $unit_amount) {
                 $total_tax_base = 0;
-                switch ($round_type) {
-                    case Order::ROUND_ITEM:
-                        $total_tax_base = $quantity * Tools::ps_round($discounted_price_tax_excl, _PS_PRICE_COMPUTE_PRECISION_, $this->round_mode);
-                        $total_amount = $quantity * Tools::ps_round($unit_amount, _PS_PRICE_COMPUTE_PRECISION_, $this->round_mode);
-                        break;
-                    case Order::ROUND_LINE:
-                        $total_tax_base = Tools::ps_round($quantity * $discounted_price_tax_excl, _PS_PRICE_COMPUTE_PRECISION_, $this->round_mode);
-                        $total_amount = Tools::ps_round($quantity * $unit_amount, _PS_PRICE_COMPUTE_PRECISION_, $this->round_mode);
-                        break;
-                    case Order::ROUND_TOTAL:
-                        $total_tax_base = $quantity * $discounted_price_tax_excl;
-                        $total_amount = $quantity * $unit_amount;
-                        break;
-                }
+                $total_tax_base = Tools::processPriceRounding($discounted_price_tax_excl, $quantity);
+                $totalPrice = Tools::processPriceRounding($unit_amount, $quantity);
 
                 if (!isset($breakdown[$id_tax])) {
                     $breakdown[$id_tax] = array('tax_base' => 0, 'tax_amount' => 0);
diff --git a/classes/order/OrderDetail.php b/classes/order/OrderDetail.php
index 60898f126..70b1d88dc 100644
--- a/classes/order/OrderDetail.php
+++ b/classes/order/OrderDetail.php
@@ -398,22 +398,10 @@ public function saveTaxCalculator(Order $order, $replace = false)
 
         $values = '';
         foreach ($this->tax_calculator->getTaxesAmount($discounted_price_tax_excl) as $id_tax => $amount) {
-            switch (Configuration::get('PS_ROUND_TYPE')) {
-                case Order::ROUND_ITEM:
-                    $unit_amount = (float)Tools::ps_round($amount, _PS_PRICE_COMPUTE_PRECISION_);
-                    $total_amount = $unit_amount * $this->product_quantity;
-                    break;
-                case Order::ROUND_LINE:
-                    $unit_amount = $amount;
-                    $total_amount = Tools::ps_round($unit_amount * $this->product_quantity, _PS_PRICE_COMPUTE_PRECISION_);
-                    break;
-                case Order::ROUND_TOTAL:
-                    $unit_amount = $amount;
-                    $total_amount = $unit_amount * $this->product_quantity;
-                    break;
-            }
 
-            $values .= '('.(int)$this->id.','.(int)$id_tax.','.(float)$unit_amount.','.(float)$total_amount.'),';
+            $total_amount = Tools::processPriceRounding($unit_amount, $this->product_quantity, $order->round_type, $order->round_mode);
+
+            $values .= '('.(int)$this->id.','.(int)$id_tax.','.(float)$amount.','.(float)$total_amount.'),';
         }
 
         if ($replace) {
diff --git a/classes/order/OrderSlip.php b/classes/order/OrderSlip.php
index b7b89bc49..9b455f6e4 100644
--- a/classes/order/OrderSlip.php
+++ b/classes/order/OrderSlip.php
@@ -283,7 +283,6 @@ public static function getSlipsIdByDate($dateFrom, $dateTo)
 
     /**
      * @deprecated since 1.6.0.10 use OrderSlip::create() instead
-     *
      */
     public static function createOrderSlip($order, $productList, $qtyList, $shipping_cost = false)
     {
@@ -374,49 +373,55 @@ public static function create(Order $order, $booking_list, $shipping_cost = fals
             $id_tax_rules_group = Product::getIdTaxRulesGroupByIdProduct((int)$order_detail->product_id);
             $tax_calculator = TaxManagerFactory::getManager($address, $id_tax_rules_group)->getTaxCalculator();
 
-            $order_slip->{'total_products_tax_'.$inc_or_ex_1} += $price * $numDays;
-
-            if (in_array(Configuration::get('PS_ROUND_TYPE'), array(Order::ROUND_ITEM, Order::ROUND_LINE))) {
-                if (!isset($total_products[$id_tax_rules_group])) {
-                    $total_products[$id_tax_rules_group] = 0;
-                }
-            } else {
+            $ps_round_type = Configuration::get('PS_ROUND_TYPE');
+            if ($ps_round_type == Order::ROUND_TOTAL) {
                 if (!isset($total_products[$id_tax_rules_group.'_'.$id_address])) {
                     $total_products[$id_tax_rules_group.'_'.$id_address] = 0;
                 }
+            } else {
+                if (!isset($total_products[$id_tax_rules_group])) {
+                    $total_products[$id_tax_rules_group] = 0;
+                }
             }
 
-            $product_tax_incl_line = Tools::ps_round($tax_calculator->{$add_or_remove.'Taxes'}($price) * $numDays, _PS_PRICE_COMPUTE_PRECISION_);
-
-            switch (Configuration::get('PS_ROUND_TYPE')) {
-                case Order::ROUND_ITEM:
-                    $product_tax_incl = Tools::ps_round($tax_calculator->{$add_or_remove.'Taxes'}($price), _PS_PRICE_COMPUTE_PRECISION_) * $numDays;
-                    $total_products[$id_tax_rules_group] += $product_tax_incl;
-                    break;
-                case Order::ROUND_LINE:
-                    $product_tax_incl = $product_tax_incl_line;
-                    $total_products[$id_tax_rules_group] += $product_tax_incl;
-                    break;
-                case Order::ROUND_TOTAL:
-                    $product_tax_incl = $product_tax_incl_line;
-                    $total_products[$id_tax_rules_group.'_'.$id_address] += $price * $numDays;
-                    break;
+            $product_tax_inc_or_ex_1 = Tools::processPriceRounding(
+                ($price * $numDays),
+                1,
+                $order->round_type,
+                $order->round_mode
+            );
+
+            $order_slip->{'total_products_tax_'.$inc_or_ex_1} += $product_tax_inc_or_ex_1;
+
+            $product_tax_inc_or_ex_2 = Tools::processPriceRounding(
+                ($tax_calculator->{$add_or_remove.'Taxes'}($price * $numDays)),
+                1,
+                $order->round_type,
+                $order->round_mode
+            );
+            if ($ps_round_type == Order::ROUND_TOTAL) {
+                $total_products[$id_tax_rules_group.'_'.$id_address] += $product_tax_inc_or_ex_2;
+            } else {
+                $total_products[$id_tax_rules_group] += $product_tax_inc_or_ex_2;
             }
 
             $booking['unit_price_tax_'.$inc_or_ex_1] = $price;
-            $booking['unit_price_tax_'.$inc_or_ex_2] = Tools::ps_round($tax_calculator->{$add_or_remove.'Taxes'}($price), _PS_PRICE_COMPUTE_PRECISION_);
-            $booking['total_price_tax_'.$inc_or_ex_1] = Tools::ps_round($price * $numDays, _PS_PRICE_COMPUTE_PRECISION_);
-            $booking['total_price_tax_'.$inc_or_ex_2] = Tools::ps_round($product_tax_incl, _PS_PRICE_COMPUTE_PRECISION_);
+            $booking['unit_price_tax_'.$inc_or_ex_2] = $tax_calculator->{$add_or_remove.'Taxes'}($price);
+            $booking['total_price_tax_'.$inc_or_ex_1] = $product_tax_inc_or_ex_1;
+            $booking['total_price_tax_'.$inc_or_ex_2] = $product_tax_inc_or_ex_2;
         }
 
-        unset($product);
-
         foreach ($total_products as $key => $price) {
             if (Configuration::get('PS_ROUND_TYPE') == Order::ROUND_TOTAL) {
                 $tmp = explode('_', $key);
                 $address = Address::initialize((int)$tmp[1], true);
                 $tax_calculator = TaxManagerFactory::getManager($address, $tmp[0])->getTaxCalculator();
-                $order_slip->{'total_products_tax_'.$inc_or_ex_2} += Tools::ps_round($tax_calculator->{$add_or_remove.'Taxes'}($price), _PS_PRICE_COMPUTE_PRECISION_);
+                $order_slip->{'total_products_tax_'.$inc_or_ex_2} += Tools::processPriceRounding(
+                    ($tax_calculator->{$add_or_remove.'Taxes'}($price)),
+                    1,
+                    $order->round_type,
+                    $order->round_mode
+                );
             } else {
                 $order_slip->{'total_products_tax_'.$inc_or_ex_2} += $price;
             }
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index c0969803a..fb7ae888b 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -841,6 +841,7 @@ public function displayAjaxSearchCarts()
                 $cart['total_price'] = Tools::displayPrice($cart_obj->getOrderTotal(), $currency);
             }
         }
+
         if (count($orders)) {
             foreach ($orders as &$order) {
                 $order['total_paid_real'] = Tools::displayPrice($order['total_paid_real'], $currency);
@@ -1113,11 +1114,14 @@ public function ajaxProcessGetRoomTypeCartDemands()
                     $dateTo,
                     $idRoom
                 )) {
-                    $selectedRoomServiceProduct['selected_service'] = $objRoomTypeServiceProductCartDetail->getRoomServiceProducts(
-                        $selectedRoomServiceProduct['id'],
+                    $selectedRoomServiceProduct['selected_service'] = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
+                        $idCart,
+                        0,
+                        0,
                         0,
-                        null,
-                        null
+                        0,
+                        0,
+                        $selectedRoomServiceProduct['id'],
                     );
                 }
                 $this->context->smarty->assign(array(
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 9bfd6affa..30bd234cc 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -1175,7 +1175,7 @@ public function postProcess()
                             $this->errors[] = $this->l('Selected room is not available for reallocation.');
                         } elseif (!in_array($idRoomToReallocate, array_column($availableRooms, 'id_room'))) {
                             $this->errors[] = $this->l('Selected room is not available for reallocation.');
-                        } elseif (!Validate::isFloat($priceDiff)) {
+                        } elseif (!Validate::isPrice($priceDiff)) {
                             $this->errors[] = $this->l('Invalid price difference of the room types.');
                         }
                     } else {
@@ -2059,9 +2059,9 @@ public function postProcess()
                     $order->total_discounts_tax_incl = ($order->total_discounts_tax_incl - $order_cart_rule->value) > 0 ? ($order->total_discounts_tax_incl - $order_cart_rule->value) : 0;
                     $order->total_discounts_tax_excl = ($order->total_discounts_tax_excl - $order_cart_rule->value_tax_excl) > 0 ? ($order->total_discounts_tax_excl - $order_cart_rule->value_tax_excl) : 0;
 
-                    $order->total_paid += $order_cart_rule->value;
-                    $order->total_paid_tax_incl += $order_cart_rule->value;
-                    $order->total_paid_tax_excl += $order_cart_rule->value_tax_excl;
+                    $order->total_paid += Tools::ps_round($order_cart_rule->value, _PS_PRICE_COMPUTE_PRECISION_);
+                    $order->total_paid_tax_incl += Tools::ps_round($order_cart_rule->value, _PS_PRICE_COMPUTE_PRECISION_);
+                    $order->total_paid_tax_excl += Tools::ps_round($order_cart_rule->value_tax_excl, _PS_PRICE_COMPUTE_PRECISION_);
 
                     // Delete Order Cart Rule and update Order
                     $order_cart_rule->delete();
@@ -2098,8 +2098,8 @@ public function postProcess()
                         case 1:
                             if ($discount_value <= 100) {
                                 if (isset($order_invoice)) {
-                                    $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round($order_invoice->total_paid_tax_incl * $discount_value / 100, 2);
-                                    $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round($order_invoice->total_paid_tax_excl * $discount_value / 100, 2);
+                                    $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round($order_invoice->total_paid_tax_incl * $discount_value / 100, _PS_PRICE_COMPUTE_PRECISION_);
+                                    $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round($order_invoice->total_paid_tax_excl * $discount_value / 100, _PS_PRICE_COMPUTE_PRECISION_);
 
                                     // Update OrderInvoice
                                     $this->applyDiscountOnInvoice($order_invoice, $cart_rules[$order_invoice->id]['value_tax_incl'], $cart_rules[$order_invoice->id]['value_tax_excl']);
@@ -2107,15 +2107,15 @@ public function postProcess()
                                     $order_invoices_collection = $order->getInvoicesCollection();
                                     foreach ($order_invoices_collection as $order_invoice) {
                                         /** @var OrderInvoice $order_invoice */
-                                        $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round($order_invoice->total_paid_tax_incl * $discount_value / 100, 2);
-                                        $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round($order_invoice->total_paid_tax_excl * $discount_value / 100, 2);
+                                        $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round($order_invoice->total_paid_tax_incl * $discount_value / 100, _PS_PRICE_COMPUTE_PRECISION_);
+                                        $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round($order_invoice->total_paid_tax_excl * $discount_value / 100, _PS_PRICE_COMPUTE_PRECISION_);
 
                                         // Update OrderInvoice
                                         $this->applyDiscountOnInvoice($order_invoice, $cart_rules[$order_invoice->id]['value_tax_incl'], $cart_rules[$order_invoice->id]['value_tax_excl']);
                                     }
                                 } else {
-                                    $cart_rules[0]['value_tax_incl'] = Tools::ps_round($order->total_paid_tax_incl * $discount_value / 100, 2);
-                                    $cart_rules[0]['value_tax_excl'] = Tools::ps_round($order->total_paid_tax_excl * $discount_value / 100, 2);
+                                    $cart_rules[0]['value_tax_incl'] = Tools::ps_round($order->total_paid_tax_incl * $discount_value / 100, _PS_PRICE_COMPUTE_PRECISION_);
+                                    $cart_rules[0]['value_tax_excl'] = Tools::ps_round($order->total_paid_tax_excl * $discount_value / 100, _PS_PRICE_COMPUTE_PRECISION_);
                                 }
                             } else {
                                 $this->errors[] = Tools::displayError('The discount value is invalid.');
@@ -2127,8 +2127,8 @@ public function postProcess()
                                 if ($discount_value > $order_invoice->total_paid_tax_incl) {
                                     $this->errors[] = Tools::displayError('The discount value is greater than the order invoice total.');
                                 } else {
-                                    $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round($discount_value, 2);
-                                    $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round($discount_value / (1 + ($order->getTaxesAverageUsed() / 100)), 2);
+                                    $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round($discount_value, _PS_PRICE_COMPUTE_PRECISION_);
+                                    $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round($discount_value / (1 + ($order->getTaxesAverageUsed() / 100)), _PS_PRICE_COMPUTE_PRECISION_);
 
                                     // Update OrderInvoice
                                     $this->applyDiscountOnInvoice($order_invoice, $cart_rules[$order_invoice->id]['value_tax_incl'], $cart_rules[$order_invoice->id]['value_tax_excl']);
@@ -2140,8 +2140,8 @@ public function postProcess()
                                     if ($discount_value > $order_invoice->total_paid_tax_incl) {
                                         $this->errors[] = Tools::displayError('The discount value is greater than the order invoice total.').$order_invoice->getInvoiceNumberFormatted(Context::getContext()->language->id, (int)$order->id_shop).')';
                                     } else {
-                                        $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round($discount_value, 2);
-                                        $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round($discount_value / (1 + ($order->getTaxesAverageUsed() / 100)), 2);
+                                        $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round($discount_value, _PS_PRICE_COMPUTE_PRECISION_);
+                                        $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round($discount_value / (1 + ($order->getTaxesAverageUsed() / 100)), _PS_PRICE_COMPUTE_PRECISION_);
 
                                         // Update OrderInvoice
                                         $this->applyDiscountOnInvoice($order_invoice, $cart_rules[$order_invoice->id]['value_tax_incl'], $cart_rules[$order_invoice->id]['value_tax_excl']);
@@ -2151,8 +2151,8 @@ public function postProcess()
                                 if ($discount_value > $order->total_paid_tax_incl) {
                                     $this->errors[] = Tools::displayError('The discount value is greater than the order total.');
                                 } else {
-                                    $cart_rules[0]['value_tax_incl'] = Tools::ps_round($discount_value, 2);
-                                    $cart_rules[0]['value_tax_excl'] = Tools::ps_round($discount_value / (1 + ($order->getTaxesAverageUsed() / 100)), 2);
+                                    $cart_rules[0]['value_tax_incl'] = Tools::ps_round($discount_value, _PS_PRICE_COMPUTE_PRECISION_);
+                                    $cart_rules[0]['value_tax_excl'] = Tools::ps_round($discount_value / (1 + ($order->getTaxesAverageUsed() / 100)), _PS_PRICE_COMPUTE_PRECISION_);
                                 }
                             }
                             break;
@@ -2226,12 +2226,12 @@ public function postProcess()
                                 $order_cart_rule->free_shipping = $cart_rule['free_shipping'];
                                 $res &= $order_cart_rule->add();
 
-                                $order->total_discounts = Tools::ps_round($order->total_discounts + $order_cart_rule->value, 6);
-                                $order->total_discounts_tax_incl = Tools::ps_round($order->total_discounts_tax_incl + $order_cart_rule->value, 6);
-                                $order->total_discounts_tax_excl = Tools::ps_round($order->total_discounts_tax_excl + $order_cart_rule->value_tax_excl, 6);
-                                $order->total_paid = Tools::ps_round($order->total_paid - $order_cart_rule->value, 6);
-                                $order->total_paid_tax_incl = Tools::ps_round($order->total_paid_tax_incl - $order_cart_rule->value, 6);
-                                $order->total_paid_tax_excl = Tools::ps_round($order->total_paid_tax_excl - $order_cart_rule->value_tax_excl, 6);
+                                $order->total_discounts = Tools::ps_round($order->total_discounts + $order_cart_rule->value, _PS_PRICE_COMPUTE_PRECISION_);
+                                $order->total_discounts_tax_incl = Tools::ps_round($order->total_discounts_tax_incl + $order_cart_rule->value, _PS_PRICE_COMPUTE_PRECISION_);
+                                $order->total_discounts_tax_excl = Tools::ps_round($order->total_discounts_tax_excl + $order_cart_rule->value_tax_excl, _PS_PRICE_COMPUTE_PRECISION_);
+                                $order->total_paid = Tools::ps_round($order->total_paid - $order_cart_rule->value, _PS_PRICE_COMPUTE_PRECISION_);
+                                $order->total_paid_tax_incl = Tools::ps_round($order->total_paid_tax_incl - $order_cart_rule->value, _PS_PRICE_COMPUTE_PRECISION_);
+                                $order->total_paid_tax_excl = Tools::ps_round($order->total_paid_tax_excl - $order_cart_rule->value_tax_excl, _PS_PRICE_COMPUTE_PRECISION_);
                             }
 
                             // Update Order
@@ -3716,8 +3716,8 @@ public function ajaxProcessAddServiceProductOnOrder()
                 $carrier = new Carrier((int)$order->id_carrier);
                 $tax_calculator = $carrier->getTaxCalculator($invoice_address);
 
-                $order_invoice->total_paid_tax_excl = Tools::ps_round((float)$cart->getOrderTotal(false, $total_method), 2);
-                $order_invoice->total_paid_tax_incl = Tools::ps_round((float)$cart->getOrderTotal($use_taxes, $total_method), 2);
+                $order_invoice->total_paid_tax_excl = (float)$cart->getOrderTotal(false, $total_method);
+                $order_invoice->total_paid_tax_incl = (float)$cart->getOrderTotal($use_taxes, $total_method);
                 $order_invoice->total_products = (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS);
                 $order_invoice->total_products_wt = (float)$cart->getOrderTotal($use_taxes, Cart::ONLY_PRODUCTS);
                 $order_invoice->total_shipping_tax_excl = (float)$cart->getTotalShippingCost(null, false);
@@ -3750,8 +3750,8 @@ public function ajaxProcessAddServiceProductOnOrder()
             }
             // Update current invoice
             else {
-                $order_invoice->total_paid_tax_excl += Tools::ps_round((float)($cart->getOrderTotal(false, $total_method)), 2);
-                $order_invoice->total_paid_tax_incl += Tools::ps_round((float)($cart->getOrderTotal($use_taxes, $total_method)), 2);
+                $order_invoice->total_paid_tax_excl += (float)$cart->getOrderTotal(false, $total_method);
+                $order_invoice->total_paid_tax_incl += (float)$cart->getOrderTotal($use_taxes, $total_method);
                 $order_invoice->total_products += (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS);
                 $order_invoice->total_products_wt += (float)$cart->getOrderTotal($use_taxes, Cart::ONLY_PRODUCTS);
                 $order_invoice->update();
@@ -3766,9 +3766,9 @@ public function ajaxProcessAddServiceProductOnOrder()
         $order->total_products += (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS);
         $order->total_products_wt += (float)$cart->getOrderTotal($use_taxes, Cart::ONLY_PRODUCTS);
 
-        $order->total_paid += Tools::ps_round((float)($cart->getOrderTotal(true, $total_method)), 2);
-        $order->total_paid_tax_excl += Tools::ps_round((float)($cart->getOrderTotal(false, $total_method)), 2);
-        $order->total_paid_tax_incl += Tools::ps_round((float)($cart->getOrderTotal($use_taxes, $total_method)), 2);
+        $order->total_paid += (float)$cart->getOrderTotal(true, $total_method);
+        $order->total_paid_tax_excl += (float)$cart->getOrderTotal(false, $total_method);
+        $order->total_paid_tax_incl += (float)$cart->getOrderTotal($use_taxes, $total_method);
 
         if (isset($order_invoice) && Validate::isLoadedObject($order_invoice)) {
             $order->total_shipping = $order_invoice->total_shipping_tax_incl;
@@ -4306,8 +4306,8 @@ public function ajaxProcessAddProductOnOrder()
             }
             // Update current invoice
             else {
-                $order_invoice->total_paid_tax_excl += Tools::ps_round((float)($cart->getOrderTotal(false, $total_method)), 2);
-                $order_invoice->total_paid_tax_incl += Tools::ps_round((float)($cart->getOrderTotal($use_taxes, $total_method)), 2);
+                $order_invoice->total_paid_tax_excl += (float)$cart->getOrderTotal(false, $total_method);
+                $order_invoice->total_paid_tax_incl += (float)$cart->getOrderTotal($use_taxes, $total_method);
                 $order_invoice->total_products += (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS);
                 $order_invoice->total_products_wt += (float)$cart->getOrderTotal($use_taxes, Cart::ONLY_PRODUCTS);
                 $order_invoice->update();
@@ -4321,10 +4321,9 @@ public function ajaxProcessAddProductOnOrder()
         // update totals amount of order
         $order->total_products += (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS);
         $order->total_products_wt += (float)$cart->getOrderTotal($use_taxes, Cart::ONLY_PRODUCTS);
-
-        $order->total_paid += Tools::ps_round((float)($cart->getOrderTotal(true, $total_method)), 2);
-        $order->total_paid_tax_excl += Tools::ps_round((float)($cart->getOrderTotal(false, $total_method)), 2);
-        $order->total_paid_tax_incl += Tools::ps_round((float)($cart->getOrderTotal($use_taxes, $total_method)), 2);
+        $order->total_paid += (float)$cart->getOrderTotal(true, $total_method);
+        $order->total_paid_tax_excl += (float)$cart->getOrderTotal(false, $total_method);
+        $order->total_paid_tax_incl += (float)$cart->getOrderTotal($use_taxes, $total_method);
 
         if (isset($order_invoice) && Validate::isLoadedObject($order_invoice)) {
             $order->total_shipping = $order_invoice->total_shipping_tax_incl;
@@ -4484,7 +4483,7 @@ public function ajaxProcessAddProductOnOrder()
                 );
                 $objBookingDetail->total_price_tax_excl = $total_price['total_price_tax_excl'];
                 $objBookingDetail->total_price_tax_incl = $total_price['total_price_tax_incl'];
-                $objBookingDetail->total_paid_amount = Tools::ps_round($total_price['total_price_tax_incl'], 5);
+                $objBookingDetail->total_paid_amount = $total_price['total_price_tax_incl'];
 
                 // Save hotel information/location/contact
                 if (Validate::isLoadedObject($objRoom = new HotelRoomInformation($objCartBookingData->id_room))) {
@@ -4515,7 +4514,18 @@ public function ajaxProcessAddProductOnOrder()
                     $objRoomTypeServiceProduct = new RoomTypeServiceProduct();
                     $objRoomTypeServiceProductPrice = new RoomTypeServiceProductPrice();
                     $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
-                    if ($services = $objRoomTypeServiceProductCartDetail->getRoomServiceProducts($objCartBookingData->id, 0, null, 1)) {
+                    if ($services = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
+                        $objCartBookingData->id_cart,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        $objCartBookingData->id,
+                        0,
+                        null,
+                        1
+                    )) {
                         foreach ($services as $service) {
                             $insertedServiceProductIdOrderDetail = $objBookingDetail->getLastInsertedServiceIdOrderDetail($order->id, $service['id_product']);
                             $numDays = 1;
@@ -4539,24 +4549,22 @@ public function ajaxProcessAddProductOnOrder()
                                 $objBookingDetail->date_to,
                                 true
                             );
-                            $unitPriceTaxExcl = $totalPriceTaxExcl / $numDays;
-                            $unitPriceTaxIncl = $totalPriceTaxIncl / $numDays;
-                            switch (Configuration::get('PS_ROUND_TYPE')) {
-                                case Order::ROUND_TOTAL:
-                                    $service['total'] = $totalPriceTaxExcl;
-                                    $service['total_wt'] = $totalPriceTaxIncl;
-                                    break;
-                                case Order::ROUND_LINE:
-                                    $service['total'] = Tools::ps_round($totalPriceTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
-                                    $service['total_wt'] = Tools::ps_round($totalPriceTaxIncl, _PS_PRICE_COMPUTE_PRECISION_);
-                                    break;
-
-                                case Order::ROUND_ITEM:
-                                default:
-                                    $service['total'] = Tools::ps_round($totalPriceTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
-                                    $service['total_wt'] = Tools::ps_round($totalPriceTaxIncl, _PS_PRICE_COMPUTE_PRECISION_);
-                                    break;
-                            }
+                            $unitPriceTaxIncl = $objRoomTypeServiceProductPrice->getServicePrice(
+                                (int)$service['id_product'],
+                                $roomTypeInfo['id'],
+                                1,
+                                null,
+                                null,
+                                true
+                            );
+                            $unitPriceTaxExcl = $objRoomTypeServiceProductPrice->getServicePrice(
+                                (int) $service['id_product'],
+                                $roomTypeInfo['id'],
+                                1,
+                                null,
+                                null,
+                                false
+                            );
 
                             $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
                             $objRoomTypeServiceProductOrderDetail->id_product = $service['id_product'];
@@ -4667,6 +4675,7 @@ public function ajaxProcessEditRoomOnOrder()
         if (Tools::isSubmit('product_invoice')) {
             $order_invoice = new OrderInvoice((int) Tools::getValue('product_invoice'));
         }
+
         /*By webkul To edit Order and cart entries when edit rooms from the orderLine when editing the order*/
         $obj_booking_detail = new HotelBookingDetail((int) Tools::getValue('id_booking_detail'));
         $cart = new Cart($obj_booking_detail->id_cart);
@@ -4688,149 +4697,96 @@ public function ajaxProcessEditRoomOnOrder()
         $children = $occupancy['children'];
         $child_ages = $occupancy['child_ages'];
 
-        // By webkul to calculate rates of the product from hotelreservationsystem tables with feature prices....
-        // add feature price for updated price
-
-        $hotelCartBookingData = new HotelCartBookingData();
-        $totalProductPriceBeforeTE = (float) $order_detail->total_price_tax_excl;
-        $totalProductPriceBeforeTI = (float) $order_detail->total_price_tax_incl;
-        $totalProductPriceAfterTE = 0;
-        $totalProductPriceAfterTI = 0;
+        $totalRoomPriceBeforeTE = $obj_booking_detail->total_price_tax_excl;
+        $totalRoomPriceBeforeTI = $obj_booking_detail->total_price_tax_incl;
         $totalRoomPriceAfterTE = 0;
         $totalRoomPriceAfterTI = 0;
-        $bookedRooms = $obj_booking_detail->getBookedRoomsByIdOrderDetail((int) Tools::getValue('id_order_detail'), $id_product);
-        if ($bookedRooms) {
+
+        if (Validate::isLoadedObject($objProduct = new Product($id_product))) {
+            // If room type is NOT DELETED then use current room type price calculation
             $params = array(
                 'id_cart' => $cart->id,
                 'id_guest' => $cart->id_guest,
+                'id_product' => $id_product,
+                'id_room' => $id_room,
                 'price' => $room_unit_price,
+                'date_from' => $new_date_from,
+                'date_to' => $new_date_to
             );
+            HotelRoomTypeFeaturePricing::createAutoFeaturePrice($params);
 
-            foreach ($bookedRooms as $roomInfo) {
-                $params['id_product'] = $roomInfo['id_product'];
-                $params['id_room'] = $roomInfo['id_room'];
-
-                if ($roomInfo['id_room'] == $id_room && (strtotime($roomInfo['date_from']) == strtotime($old_date_from))) {
-                    // Check if room type is still not deleted
-                    if (Validate::isLoadedObject($objProduct = new Product($roomInfo['id_product']))) {
-                        // If room type is NOT DELETED then use current room type price calculation
-                        $params = array_merge($params, array('date_from' => $new_date_from, 'date_to' => $new_date_to));
-                        HotelRoomTypeFeaturePricing::createAutoFeaturePrice($params);
-
-                        $roomTotalPrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice(
-                            $roomInfo['id_product'],
-                            $new_date_from,
-                            $new_date_to,
-                            0,
-                            Group::getCurrent()->id,
-                            $cart->id,
-                            $cart->id_guest,
-                            $roomInfo['id_room'],
-                            0
-                        );
-
-                        $totalProductPriceAfterTE += (float) $roomTotalPrice['total_price_tax_excl'];
-                        $totalProductPriceAfterTI += (float) $roomTotalPrice['total_price_tax_incl'];
-
-                        $totalRoomPriceAfterTE += (float) $roomTotalPrice['total_price_tax_excl'];
-                        $totalRoomPriceAfterTI += (float) $roomTotalPrice['total_price_tax_incl'];
-                    } else {
-                        // If room type is DELETED use order details information for price calculation
-                        $taxCalculator = $order_detail->getTaxCalculator();
-                        // room price with tax
-                        $roomPriceTI = $taxCalculator->addTaxes($room_unit_price);
-
-                        $totalRoomPriceTE = Tools::ps_round(($room_unit_price * $product_quantity), _PS_PRICE_COMPUTE_PRECISION_);
-                        $totalRoomPriceTI = Tools::ps_round(($roomPriceTI * $product_quantity), _PS_PRICE_COMPUTE_PRECISION_);
+            $roomTotalPrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice(
+                $id_product,
+                $new_date_from,
+                $new_date_to,
+                0,
+                Group::getCurrent()->id,
+                $cart->id,
+                $cart->id_guest,
+                $id_room,
+                0
+            );
 
-                        // room price changes
-                        $totalRoomPriceAfterTE += (float) $totalRoomPriceTE;
-                        $totalRoomPriceAfterTI += (float) $totalRoomPriceTI;
+            $totalRoomPriceAfterTE = (float) $roomTotalPrice['total_price_tax_excl'];
+            $totalRoomPriceAfterTI = (float) $roomTotalPrice['total_price_tax_incl'];
+        } else {
+            // If room type is DELETED use order details information for price calculation
+            $taxCalculator = $order_detail->getTaxCalculator();
+            // room price with tax
+            $roomPriceTI = $taxCalculator->addTaxes($room_unit_price);
 
-                        // Total product price changes
-                        $totalProductPriceAfterTE += (float) $totalRoomPriceTE;
-                        $totalProductPriceAfterTI += (float) $totalRoomPriceTI;
-                    }
-                } else {
-                    $totalProductPriceAfterTE += (float) $roomInfo['total_price_tax_excl'];
-                    $totalProductPriceAfterTI += (float) $roomInfo['total_price_tax_incl'];
-                }
-            }
+            $totalRoomPriceAfterTE = Tools::processPriceRounding($room_unit_price, $product_quantity, $order->round_type, $order->round_mode);
+            $totalRoomPriceAfterTI = Tools::processPriceRounding($roomPriceTI, $product_quantity, $order->round_type, $order->round_mode);
         }
 
         // delete cart feature prices after booking update success
         HotelRoomTypeFeaturePricing::deleteByIdCart($cart->id);
-        // END
 
-        /*This code is commented by webkul because in our case quantity of the product will be number of days for which room is booked*/
-        // If multiple product_quantity, the order details concern a product customized
-        /*$product_quantity = 0;
-        if (is_array(Tools::getValue('product_quantity')))
-            foreach (Tools::getValue('product_quantity') as $id_customization => $qty)
-            {
-                // Update quantity of each customization
-                Db::getInstance()->update('customization', array('quantity' => (int)$qty), 'id_customization = '.(int)$id_customization);
-                // Calculate the real quantity of the product
-                $product_quantity += $qty;
-            }
-        else
-            $product_quantity = Tools::getValue('product_quantity');*/
-        /*End*/
-        $product_price_tax_incl = Tools::ps_round(Tools::getValue('product_price_tax_incl'), 2);
-        $product_price_tax_excl = Tools::ps_round(Tools::getValue('product_price_tax_excl'), 2);
         // Calculate differences of price (Before / After)
-        //$diff_price_tax_incl = $product_price_tax_incl * $qty_diff;
-        $diff_price_tax_incl = $totalProductPriceAfterTI - $totalProductPriceBeforeTI;
-        //$diff_price_tax_excl = $product_price_tax_excl * $qty_diff;
-        $diff_price_tax_excl = $totalProductPriceAfterTE - $totalProductPriceBeforeTE;
-        //var_dump($order_invoice);
+        $diff_price_tax_incl = $totalRoomPriceAfterTI - $totalRoomPriceBeforeTI;
+        $diff_price_tax_excl = $totalRoomPriceAfterTE - $totalRoomPriceBeforeTE;
+
         // Apply change on OrderInvoice
         if (isset($order_invoice)) {
             // If OrderInvoice to use is different, we update the old invoice and new invoice
             if ($order_detail->id_order_invoice != $order_invoice->id) {
                 $old_order_invoice = new OrderInvoice($order_detail->id_order_invoice);
                 // We remove cost of products
-                $old_order_invoice->total_products -= Tools::ps_round($order_detail->total_price_tax_excl, 6);
-                $old_order_invoice->total_products_wt -= Tools::ps_round($order_detail->total_price_tax_incl, 6);
-
-                $old_order_invoice->total_paid_tax_excl -= Tools::ps_round($order_detail->total_price_tax_excl, 6);
-                $old_order_invoice->total_paid_tax_incl -= Tools::ps_round($order_detail->total_price_tax_incl, 6);
+                $old_order_invoice->total_products -= $order_detail->total_price_tax_excl;
+                $old_order_invoice->total_products_wt -= $order_detail->total_price_tax_incl;
+                $old_order_invoice->total_paid_tax_excl -= $order_detail->total_price_tax_excl;
+                $old_order_invoice->total_paid_tax_incl -= $order_detail->total_price_tax_incl;
 
                 $res &= $old_order_invoice->update();
 
-                $order_invoice->total_products += Tools::ps_round($order_detail->total_price_tax_excl, 6);
-                $order_invoice->total_products_wt += Tools::ps_round($order_detail->total_price_tax_incl, 6);
-
-                $order_invoice->total_paid_tax_excl += Tools::ps_round($order_detail->total_price_tax_excl, 6);
-                $order_invoice->total_paid_tax_incl += Tools::ps_round($order_detail->total_price_tax_incl, 6);
+                $order_invoice->total_products += $order_detail->total_price_tax_excl;
+                $order_invoice->total_products_wt += $order_detail->total_price_tax_incl;
+                $order_invoice->total_paid_tax_excl += $order_detail->total_price_tax_excl;
+                $order_invoice->total_paid_tax_incl += $order_detail->total_price_tax_incl;
 
                 $order_detail->id_order_invoice = $order_invoice->id;
             }
         }
 
         if ($diff_price_tax_incl != 0 && $diff_price_tax_excl != 0) {
-            $order_detail->unit_price_tax_excl = Tools::ps_round($product_price_tax_excl, 6);
-            $order_detail->unit_price_tax_incl = Tools::ps_round($product_price_tax_incl, 6);
-
-            $order_detail->total_price_tax_incl += Tools::ps_round((float)$diff_price_tax_incl, 6);
-            $order_detail->total_price_tax_excl += Tools::ps_round((float)$diff_price_tax_excl, 6);
+            $order_detail->total_price_tax_incl += (float)$diff_price_tax_incl;
+            $order_detail->total_price_tax_excl += (float)$diff_price_tax_excl;
 
             if (isset($order_invoice)) {
                 // Apply changes on OrderInvoice
-                $order_invoice->total_products += Tools::ps_round((float)$diff_price_tax_excl, 6);
-                $order_invoice->total_products_wt += Tools::ps_round((float)$diff_price_tax_incl, 6);
-
-                $order_invoice->total_paid_tax_excl += Tools::ps_round((float)$diff_price_tax_excl, 6);
-                $order_invoice->total_paid_tax_incl += Tools::ps_round((float)$diff_price_tax_incl, 6);
+                $order_invoice->total_products += (float)$diff_price_tax_excl;
+                $order_invoice->total_products_wt += (float)$diff_price_tax_incl;
+                $order_invoice->total_paid_tax_excl += (float)$diff_price_tax_excl;
+                $order_invoice->total_paid_tax_incl += (float)$diff_price_tax_incl;
             }
 
             // Apply changes on Order
             $order = new Order($order_detail->id_order);
-            $order->total_products += Tools::ps_round((float)$diff_price_tax_excl, 6);
-            $order->total_products_wt += Tools::ps_round((float)$diff_price_tax_incl, 6);
-            $order->total_paid += Tools::ps_round((float)$diff_price_tax_incl, 6);
-            $order->total_paid_tax_excl += Tools::ps_round((float)$diff_price_tax_excl, 6);
-            $order->total_paid_tax_incl += Tools::ps_round((float)$diff_price_tax_incl, 6);
+            $order->total_products += (float)$diff_price_tax_excl;
+            $order->total_products_wt += (float)$diff_price_tax_incl;
+            $order->total_paid += (float)$diff_price_tax_incl;
+            $order->total_paid_tax_excl += (float)$diff_price_tax_excl;
+            $order->total_paid_tax_incl += (float)$diff_price_tax_incl;
 
             $res &= $order->update();
         }
@@ -4998,8 +4954,18 @@ public function ajaxProcessEditRoomOnOrder()
                                 $objOrder->total_paid -= $objBookingDemand->total_price_tax_incl;
 
                                 $numDays = $obj_booking_detail->getNumberOfDays($new_date_from, $new_date_to);
-                                $demandPriceTE = $objBookingDemand->unit_price_tax_excl * $numDays;
-                                $demandPriceTI = $objBookingDemand->unit_price_tax_incl * $numDays;
+                                $demandPriceTE = Tools::processPriceRounding(
+                                    ($objBookingDemand->unit_price_tax_excl * $numDays),
+                                    1,
+                                    $objOrder->round_type,
+                                    $objOrder->round_mode
+                                );
+                                $demandPriceTI = Tools::processPriceRounding(
+                                    ($objBookingDemand->unit_price_tax_incl * $numDays),
+                                    1,
+                                    $objOrder->round_type,
+                                    $objOrder->round_mode
+                                );
 
                                 $objOrder->total_paid_tax_excl += $demandPriceTE;
                                 $objOrder->total_paid_tax_incl += $demandPriceTI;
@@ -5034,8 +5000,18 @@ public function ajaxProcessEditRoomOnOrder()
                                 $unitPriceTaxExcl = $objRoomTypeServiceProductOrderDetail->unit_price_tax_excl;
                                 $unitPriceTaxIncl = $objRoomTypeServiceProductOrderDetail->unit_price_tax_incl;
 
-                                $newTotalPriceTaxExcl =  $newNumDays * $objRoomTypeServiceProductOrderDetail->quantity * $unitPriceTaxExcl;                                $unitPriceTaxIncl = $objRoomTypeServiceProductOrderDetail->unit_price_tax_incl;
-                                $newTotalPriceTaxIncl = $newNumDays * $objRoomTypeServiceProductOrderDetail->quantity * $unitPriceTaxIncl;
+                                $newTotalPriceTaxExcl = Tools::processPriceRounding(
+                                    ($newNumDays * $unitPriceTaxExcl),
+                                    $objRoomTypeServiceProductOrderDetail->quantity,
+                                    $objOrder->round_type,
+                                    $objOrder->round_mode
+                                );
+                                $newTotalPriceTaxIncl = Tools::processPriceRounding(
+                                    ($newNumDays * $unitPriceTaxIncl),
+                                    $objRoomTypeServiceProductOrderDetail->quantity,
+                                    $objOrder->round_type,
+                                    $objOrder->round_mode
+                                );
 
                                 $objOrder->total_products -= $objRoomTypeServiceProductOrderDetail->total_price_tax_excl;
                                 $objOrder->total_products_wt -= $objRoomTypeServiceProductOrderDetail->total_price_tax_incl;
@@ -5053,6 +5029,7 @@ public function ajaxProcessEditRoomOnOrder()
                                 $objOrderDetail = new OrderDetail((int) $serviceProduct['id_order_detail']);
                                 $objOrderDetail->total_price_tax_excl -= $objRoomTypeServiceProductOrderDetail->total_price_tax_excl;
                                 $objOrderDetail->total_price_tax_incl -= $objRoomTypeServiceProductOrderDetail->total_price_tax_incl;
+
                                 $objOrderDetail->total_price_tax_excl += $newTotalPriceTaxExcl;
                                 $objOrderDetail->total_price_tax_incl += $newTotalPriceTaxIncl;
 
@@ -5067,7 +5044,6 @@ public function ajaxProcessEditRoomOnOrder()
                                 $objRoomTypeServiceProductOrderDetail->total_price_tax_excl = $newTotalPriceTaxExcl;
                                 $objRoomTypeServiceProductOrderDetail->total_price_tax_incl = $newTotalPriceTaxIncl;
                                 $objRoomTypeServiceProductOrderDetail->save();
-
                             }
                         }
                     }
@@ -5141,58 +5117,35 @@ public function ajaxProcessEditProductOnOrder()
 
         $product_price_tax_incl = $order_detail->unit_price_tax_incl;
         $product_price_tax_excl = $order_detail->unit_price_tax_excl;
-        $total_products_tax_incl = $product_price_tax_incl * $product_quantity;
-        $total_products_tax_excl = $product_price_tax_excl * $product_quantity;
+
+
+        $total_products_tax_excl = Tools::processPriceRounding($product_price_tax_excl, $product_quantity);
+        $total_products_tax_incl = Tools::processPriceRounding($product_price_tax_incl, $product_quantity);
 
         // Calculate differences of price (Before / After)
         $diff_price_tax_incl = $total_products_tax_incl - $order_detail->total_price_tax_incl;
         $diff_price_tax_excl = $total_products_tax_excl - $order_detail->total_price_tax_excl;
 
-        // Apply change on OrderInvoice
-        if (isset($order_invoice)) {
-            // If OrderInvoice to use is different, we update the old invoice and new invoice
-            if ($order_detail->id_order_invoice != $order_invoice->id) {
+
+        if ($diff_price_tax_incl != 0 && $diff_price_tax_excl != 0) {
+            // Apply change on OrderInvoice
+            if ($order_detail->id_order_invoice) {
                 $old_order_invoice = new OrderInvoice($order_detail->id_order_invoice);
-                // We remove cost of products
                 $old_order_invoice->total_products -= $order_detail->total_price_tax_excl;
                 $old_order_invoice->total_products_wt -= $order_detail->total_price_tax_incl;
-
                 $old_order_invoice->total_paid_tax_excl -= $order_detail->total_price_tax_excl;
                 $old_order_invoice->total_paid_tax_incl -= $order_detail->total_price_tax_incl;
 
                 $res &= $old_order_invoice->update();
-
-                $order_invoice->total_products += $order_detail->total_price_tax_excl;
-                $order_invoice->total_products_wt += $order_detail->total_price_tax_incl;
-
-                $order_invoice->total_paid_tax_excl += $order_detail->total_price_tax_excl;
-                $order_invoice->total_paid_tax_incl += $order_detail->total_price_tax_incl;
-
-                $order_detail->id_order_invoice = $order_invoice->id;
             }
-        }
-
-        if ($diff_price_tax_incl != 0 && $diff_price_tax_excl != 0) {
-            $order_detail->unit_price_tax_excl = $product_price_tax_excl;
-            $order_detail->unit_price_tax_incl = $product_price_tax_incl;
 
             $order_detail->total_price_tax_incl += $diff_price_tax_incl;
             $order_detail->total_price_tax_excl += $diff_price_tax_excl;
 
-            if (isset($order_invoice)) {
-                // Apply changes on OrderInvoice
-                $order_invoice->total_products += $diff_price_tax_excl;
-                $order_invoice->total_products_wt += $diff_price_tax_incl;
-
-                $order_invoice->total_paid_tax_excl += $diff_price_tax_excl;
-                $order_invoice->total_paid_tax_incl += $diff_price_tax_incl;
-            }
-
             // Apply changes on Order
             $order = new Order($order_detail->id_order);
             $order->total_products += $diff_price_tax_excl;
             $order->total_products_wt += $diff_price_tax_incl;
-
             $order->total_paid += $diff_price_tax_incl;
             $order->total_paid_tax_excl += $diff_price_tax_excl;
             $order->total_paid_tax_incl += $diff_price_tax_incl;
@@ -5334,8 +5287,9 @@ public function ajaxProcessDeleteRoomLine()
         $this->doDeleteProductLineValidation($order_detail, $order);
         Hook::exec('actionOrderProductLineDeleteBefore', array('order' => $order));
 
-        $bookingPriceTaxIncl = $objBookingDetail->total_price_tax_incl;
-        $bookingPriceTaxExcl = $objBookingDetail->total_price_tax_excl;
+        $bookingPriceTaxIncl = Tools::processPriceRounding($objBookingDetail->total_price_tax_incl, 1, $order->round_type, $order->round_mode);
+        $bookingPriceTaxExcl = Tools::processPriceRounding($objBookingDetail->total_price_tax_excl, 1, $order->round_type, $order->round_mode);
+
         $objBookingDemand = new HotelBookingDemands();
         $roomExtraDemandTI = $objBookingDemand->getRoomTypeBookingExtraDemands(
             $id_order,
@@ -5396,8 +5350,8 @@ public function ajaxProcessDeleteRoomLine()
         } else {
             // Calculate differences of price (Before / After)
 
-            $order_detail->total_price_tax_incl -= Tools::ps_round($diff_products_tax_incl, 6);
-            $order_detail->total_price_tax_excl -= Tools::ps_round($diff_products_tax_excl, 6);
+            $order_detail->total_price_tax_incl -= $diff_products_tax_incl;
+            $order_detail->total_price_tax_excl -= $diff_products_tax_excl;
 
             $old_quantity = $order_detail->product_quantity;
 
@@ -5421,8 +5375,8 @@ public function ajaxProcessDeleteRoomLine()
             if ($cart_quantity >= $serviceOrderDetail->product_quantity) {
                 $serviceOrderDetail->delete();
             } else {
-                $serviceOrderDetail->total_price_tax_incl -= Tools::ps_round($service['total_price_tax_incl'], 6);
-                $serviceOrderDetail->total_price_tax_excl -= Tools::ps_round($service['total_price_tax_excl'], 6);
+                $serviceOrderDetail->total_price_tax_incl -= $service['total_price_tax_incl'];
+                $serviceOrderDetail->total_price_tax_excl -= $service['total_price_tax_excl'];
                 $serviceOrderDetail->product_quantity -= $cart_quantity;
 
                 // update taxes
@@ -5438,16 +5392,16 @@ public function ajaxProcessDeleteRoomLine()
         if ($order_detail->id_order_invoice != 0) {
             // values changes as values are calculated accoding to the quantity of the product by webkul
             $order_invoice = new OrderInvoice($order_detail->id_order_invoice);
-            $order_invoice->total_paid_tax_excl -= Tools::ps_round(($diff_products_tax_excl + $roomExtraDemandTE + $additionlServicesTE), 6);
+            $order_invoice->total_paid_tax_excl -= ($diff_products_tax_excl + $roomExtraDemandTE + $additionlServicesTE);
             $order_invoice->total_paid_tax_excl = $order_invoice->total_paid_tax_excl > 0 ? $order_invoice->total_paid_tax_excl : 0;
 
-            $order_invoice->total_paid_tax_incl -= Tools::ps_round(($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI), 6);
+            $order_invoice->total_paid_tax_incl -= ($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI);
             $order_invoice->total_paid_tax_incl = $order_invoice->total_paid_tax_incl > 0 ? $order_invoice->total_paid_tax_incl : 0;
 
-            $order_invoice->total_products -= Tools::ps_round($diff_products_tax_excl, 6);
+            $order_invoice->total_products -= $diff_products_tax_excl;
             $order_invoice->total_products = $order_invoice->total_products > 0 ? $order_invoice->total_products : 0;
 
-            $order_invoice->total_products_wt -= Tools::ps_round($diff_products_tax_incl, 6);
+            $order_invoice->total_products_wt -= $diff_products_tax_incl;
             $order_invoice->total_products_wt = $order_invoice->total_products_wt > 0 ? $order_invoice->total_products_wt : 0;
 
             $res &= $order_invoice->update();
@@ -5455,19 +5409,19 @@ public function ajaxProcessDeleteRoomLine()
 
         // Update Order
         // values changes as values are calculated accoding to the quantity of the product by webkul
-        $order->total_paid -= Tools::ps_round(($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI), 6);
+        $order->total_paid -= ($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI);
         $order->total_paid = $order->total_paid > 0 ? $order->total_paid : 0;
 
-        $order->total_paid_tax_incl -= Tools::ps_round(($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI), 6);
+        $order->total_paid_tax_incl -= ($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI);
         $order->total_paid_tax_incl = $order->total_paid_tax_incl > 0 ? $order->total_paid_tax_incl : 0;
 
-        $order->total_paid_tax_excl -= Tools::ps_round(($diff_products_tax_excl + $roomExtraDemandTE + $additionlServicesTE), 6);
+        $order->total_paid_tax_excl -= ($diff_products_tax_excl + $roomExtraDemandTE + $additionlServicesTE);
         $order->total_paid_tax_excl = $order->total_paid_tax_excl > 0 ? $order->total_paid_tax_excl : 0;
 
-        $order->total_products -= Tools::ps_round(($diff_products_tax_excl + $additionlServicesTE), 6);
+        $order->total_products -= ($diff_products_tax_excl + $additionlServicesTE);
         $order->total_products = $order->total_products > 0 ? $order->total_products : 0;
 
-        $order->total_products_wt -= Tools::ps_round(($diff_products_tax_incl + $additionlServicesTI), 6);
+        $order->total_products_wt -= ($diff_products_tax_incl + $additionlServicesTI);
         $order->total_products_wt = $order->total_products_wt > 0 ? $order->total_products_wt : 0;
 
         $res &= $order->update();
@@ -5558,19 +5512,19 @@ public function ajaxProcessDeleteProductLine()
         // Update OrderInvoice of this OrderDetail
         if ($order_detail->id_order_invoice != 0) {
             $order_invoice = new OrderInvoice($order_detail->id_order_invoice);
-            $order_invoice->total_paid_tax_excl -= $order_detail->total_price_tax_excl;
-            $order_invoice->total_paid_tax_incl -= $order_detail->total_price_tax_incl;
-            $order_invoice->total_products -= $order_detail->total_price_tax_excl;
-            $order_invoice->total_products_wt -= $order_detail->total_price_tax_incl;
+            $order_invoice->total_paid_tax_excl -= Tools::ps_round($order_detail->total_price_tax_excl, _PS_PRICE_COMPUTE_PRECISION_);
+            $order_invoice->total_paid_tax_incl -= Tools::ps_round($order_detail->total_price_tax_incl, _PS_PRICE_COMPUTE_PRECISION_);
+            $order_invoice->total_products -= Tools::ps_round($order_detail->total_price_tax_excl, _PS_PRICE_COMPUTE_PRECISION_);
+            $order_invoice->total_products_wt -= Tools::ps_round($order_detail->total_price_tax_incl, _PS_PRICE_COMPUTE_PRECISION_);
             $res &= $order_invoice->update();
         }
 
         // Update Order
-        $order->total_paid -= $order_detail->total_price_tax_incl;
-        $order->total_paid_tax_incl -= $order_detail->total_price_tax_incl;
-        $order->total_paid_tax_excl -= $order_detail->total_price_tax_excl;
-        $order->total_products -= $order_detail->total_price_tax_excl;
-        $order->total_products_wt -= $order_detail->total_price_tax_incl;
+        $order->total_paid -= Tools::ps_round($order_detail->total_price_tax_incl, _PS_PRICE_COMPUTE_PRECISION_);
+        $order->total_paid_tax_incl -= Tools::ps_round($order_detail->total_price_tax_incl, _PS_PRICE_COMPUTE_PRECISION_);
+        $order->total_paid_tax_excl -= Tools::ps_round($order_detail->total_price_tax_excl, _PS_PRICE_COMPUTE_PRECISION_);
+        $order->total_products -= Tools::ps_round($order_detail->total_price_tax_excl, _PS_PRICE_COMPUTE_PRECISION_);
+        $order->total_products_wt -= Tools::ps_round($order_detail->total_price_tax_incl, _PS_PRICE_COMPUTE_PRECISION_);
 
         $res &= $order->update();
 
@@ -6261,14 +6215,20 @@ public function ajaxProcessUpdateRoomAdditionalServices()
                 $response['hasError'] = true;
                 $response['errors'] = $this->l('Invalid unit price');
             }
+
             $objHotelBookingDetail = new HotelBookingDetail($objRoomTypeServiceProductOrderDetail->id_htl_booking_detail);
             $res = true;
             if (!$response['hasError']) {
+                $order = new Order($objRoomTypeServiceProductOrderDetail->id_order);
+
                 $oldUnitPriceTaxExcl = $objRoomTypeServiceProductOrderDetail->unit_price_tax_excl;
                 $oldUnitPriceTaxIncl = $objRoomTypeServiceProductOrderDetail->unit_price_tax_incl;
+
                 $oldTotalPriceTaxExcl = $objRoomTypeServiceProductOrderDetail->total_price_tax_excl;
                 $oldTotalPriceTaxIncl = $objRoomTypeServiceProductOrderDetail->total_price_tax_incl;
+
                 $oldQuantity = $objRoomTypeServiceProductOrderDetail->quantity;
+
                 if ($oldUnitPriceTaxExcl > 0) {
                     $oldTaxMultiplier = $oldUnitPriceTaxIncl / $oldUnitPriceTaxExcl;
                 } else {
@@ -6277,28 +6237,44 @@ public function ajaxProcessUpdateRoomAdditionalServices()
                 if ($quantity <= 0) {
                     $quantity = 1;
                 }
+
                 $objRoomTypeServiceProductOrderDetail->quantity = $quantity;
-                $objRoomTypeServiceProductOrderDetail->unit_price_tax_excl = Tools::ps_round($unitPrice, 6);
-                $objRoomTypeServiceProductOrderDetail->unit_price_tax_incl = Tools::ps_round($unitPrice * $oldTaxMultiplier, 6);
+                $objRoomTypeServiceProductOrderDetail->unit_price_tax_excl = $unitPrice;
+                $objRoomTypeServiceProductOrderDetail->unit_price_tax_incl = $unitPrice * $oldTaxMultiplier;
+
+                $numDays = 1;
                 if ($objOrderDetail->product_price_calculation_method == Product::PRICE_CALCULATION_METHOD_PER_DAY) {
-                    $quantity = $quantity * HotelHelper::getNumberOfDays(
+                    $numDays = HotelHelper::getNumberOfDays(
                         $objHotelBookingDetail->date_from,
                         $objHotelBookingDetail->date_to
                     );
                 }
-                $objRoomTypeServiceProductOrderDetail->total_price_tax_excl = Tools::ps_round($objRoomTypeServiceProductOrderDetail->unit_price_tax_excl * $quantity, 6);
-                $objRoomTypeServiceProductOrderDetail->total_price_tax_incl = Tools::ps_round($objRoomTypeServiceProductOrderDetail->unit_price_tax_incl * $quantity, 6);
+                $objRoomTypeServiceProductOrderDetail->total_price_tax_excl = Tools::processPriceRounding(
+                    ($objRoomTypeServiceProductOrderDetail->unit_price_tax_excl * $numDays),
+                    $quantity,
+                    $order->round_type,
+                    $order->round_mode
+                );
+                $objRoomTypeServiceProductOrderDetail->total_price_tax_incl = Tools::processPriceRounding(
+                    ($objRoomTypeServiceProductOrderDetail->unit_price_tax_incl * $numDays),
+                    $quantity,
+                    $order->round_type,
+                    $order->round_mode
+                );
+
                 if ($res &= $objRoomTypeServiceProductOrderDetail->save()) {
-                    $order = new Order($objRoomTypeServiceProductOrderDetail->id_order);
                     $priceDiffTaxExcl = $objRoomTypeServiceProductOrderDetail->total_price_tax_excl - $oldTotalPriceTaxExcl;
                     $priceDiffTaxIncl = $objRoomTypeServiceProductOrderDetail->total_price_tax_incl - $oldTotalPriceTaxIncl;
+
                     $quantityDiff = $objRoomTypeServiceProductOrderDetail->quantity - $oldQuantity;
 
                     $objOrderDetail->product_quantity += $quantityDiff;
                     $objOrderDetail->total_price_tax_excl += $priceDiffTaxExcl;
                     $objOrderDetail->total_price_tax_incl += $priceDiffTaxIncl;
-                    $objOrderDetail->unit_price_tax_excl = Tools::ps_round(($objOrderDetail->total_price_tax_excl / $objOrderDetail->product_quantity), 6);
-                    $objOrderDetail->unit_price_tax_incl = Tools::ps_round(($objOrderDetail->total_price_tax_incl / $objOrderDetail->product_quantity), 6);
+
+                    $objOrderDetail->unit_price_tax_excl = ($objOrderDetail->total_price_tax_excl / $objOrderDetail->product_quantity);
+                    $objOrderDetail->unit_price_tax_incl = ($objOrderDetail->total_price_tax_incl / $objOrderDetail->product_quantity);
+
                     $res &= $objOrderDetail->updateTaxAmount($order);
 
                     $res &= $objOrderDetail->update();
@@ -6306,16 +6282,16 @@ public function ajaxProcessUpdateRoomAdditionalServices()
                     if ($objOrderDetail->id_order_invoice != 0) {
                         // values changes as values are calculated accoding to the quantity of the product by webkul
                         $order_invoice = new OrderInvoice($objOrderDetail->id_order_invoice);
-                        $order_invoice->total_paid_tax_excl += $priceDiffTaxExcl;
-                        $order_invoice->total_paid_tax_incl += $priceDiffTaxIncl;
+                        $order_invoice->total_paid_tax_excl = Tools::ps_round((float)($order_invoice->total_paid_tax_excl + $priceDiffTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
+                        $order_invoice->total_paid_tax_incl = Tools::ps_round((float)($order_invoice->total_paid_tax_incl + $priceDiffTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
                         $res &= $order_invoice->update();
                     }
 
-                    $order->total_products += $priceDiffTaxExcl;
-                    $order->total_products_wt += $priceDiffTaxIncl;
-                    $order->total_paid_tax_excl += $priceDiffTaxExcl;
-                    $order->total_paid_tax_incl += $priceDiffTaxIncl;
-                    $order->total_paid += $priceDiffTaxIncl;
+                    $order->total_products = Tools::ps_round((float)($order->total_products + $priceDiffTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
+                    $order->total_products_wt = Tools::ps_round((float)($order->total_products_wt + $priceDiffTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
+                    $order->total_paid_tax_excl = Tools::ps_round((float)($order->total_paid_tax_excl + $priceDiffTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
+                    $order->total_paid_tax_incl = Tools::ps_round((float)($order->total_paid_tax_incl + $priceDiffTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
+                    $order->total_paid = Tools::ps_round((float)($order->total_paid + $priceDiffTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
 
                     $res &= $order->update();
                 }
@@ -6362,8 +6338,18 @@ public function ajaxProcessDeleteRoomAdditionalService()
                 } else {
                     $objOrderDetail->product_quantity -= $quantity;
 
-                    $objOrderDetail->total_price_tax_excl -= $priceTaxExcl;
-                    $objOrderDetail->total_price_tax_incl -= $priceTaxIncl;
+                    $objOrderDetail->total_price_tax_excl -= Tools::processPriceRounding(
+                        $priceTaxExcl,
+                        1,
+                        $order->round_type,
+                        $order->round_mode
+                    );
+                    $objOrderDetail->total_price_tax_incl -= Tools::processPriceRounding(
+                        $priceTaxIncl,
+                        1,
+                        $order->round_type,
+                        $order->round_mode
+                    );
 
                     $res &= $objOrderDetail->updateTaxAmount($order);
 
@@ -6373,16 +6359,16 @@ public function ajaxProcessDeleteRoomAdditionalService()
                 if ($objOrderDetail->id_order_invoice != 0) {
                     // values changes as values are calculated
                     $objOrderInvoice = new OrderInvoice($objOrderDetail->id_order_invoice);
-                    $objOrderInvoice->total_paid_tax_excl -= $priceTaxExcl;
-                    $objOrderInvoice->total_paid_tax_incl -= $priceTaxIncl;
+                    $objOrderInvoice->total_paid_tax_excl = Tools::ps_round((float)($objOrderInvoice->total_paid_tax_excl - $priceTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
+                    $objOrderInvoice->total_paid_tax_incl = Tools::ps_round((float)($objOrderInvoice->total_paid_tax_incl - $priceTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
                     $res &= $objOrderInvoice->update();
                 }
 
-                $order->total_products -= $priceTaxExcl;
-                $order->total_products_wt -= $priceTaxIncl;
-                $order->total_paid_tax_excl -= $priceTaxExcl;
-                $order->total_paid_tax_incl -= $priceTaxIncl;
-                $order->total_paid -= $priceTaxIncl;
+                $order->total_products = Tools::ps_round((float)($order->total_products - $priceTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
+                $order->total_products_wt = Tools::ps_round((float)($order->total_products_wt - $priceTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
+                $order->total_paid_tax_excl = Tools::ps_round((float)($order->total_paid_tax_excl - $priceTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
+                $order->total_paid_tax_incl = Tools::ps_round((float)($order->total_paid_tax_incl - $priceTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
+                $order->total_paid = Tools::ps_round((float)($order->total_paid - $priceTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
 
                 $res &= $order->update();
             }
@@ -6526,7 +6512,7 @@ public function ajaxProcessAddRoomAdditionalServices()
                         $totalPriceChangeTaxIncl = 0;
                         $unitPriceTaxIncl = 0;
                         $unitPriceTaxExcl = 0;
-                        foreach ($productList as &$product) {
+                        foreach ($productList as $product) {
                             // This is used to get the actual quanity of the service as it is calculated incorrectly if the service is per night
                             if ($id_room_type_service_product_cart_detail = $objRoomTypeServiceProductCartDetail->alreadyExists(
                                 $service['id'],
@@ -6539,7 +6525,6 @@ public function ajaxProcessAddRoomAdditionalServices()
                                     $numDays = HotelHelper::getNumberOfDays($objHotelBookingDetail->date_from, $objHotelBookingDetail->date_to);
                                 }
 
-                                $product['cart_quantity'] = $objRoomTypeServiceProductCartDetail->quantity * $numDays;
                                 $unitPriceTaxExcl = $objRoomTypeServiceProductPrice->getServicePrice(
                                     (int)$product['id_product'],
                                     $roomHtlCartInfo['id_product'],
@@ -6559,24 +6544,21 @@ public function ajaxProcessAddRoomAdditionalServices()
                                     $cart->id
                                 );
 
-                                $totalPriceChangeTaxExcl += $totalPriceTaxExcl = ($unitPriceTaxExcl * $product['cart_quantity']);
-                                $totalPriceChangeTaxIncl += $totalPriceTaxIncl = ($unitPriceTaxIncl * $product['cart_quantity']);
-                                switch (Configuration::get('PS_ROUND_TYPE')) {
-                                    case Order::ROUND_TOTAL:
-                                        $product['total'] = $totalPriceTaxExcl;
-                                        $product['total_wt'] = $totalPriceTaxIncl;
-                                        break;
-                                    case Order::ROUND_LINE:
-                                        $product['total'] = Tools::ps_round($totalPriceTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
-                                        $product['total_wt'] = Tools::ps_round($totalPriceTaxIncl, _PS_PRICE_COMPUTE_PRECISION_);
-                                        break;
-
-                                    case Order::ROUND_ITEM:
-                                    default:
-                                        $product['total'] = Tools::ps_round($totalPriceTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
-                                        $product['total_wt'] = Tools::ps_round($totalPriceTaxIncl, _PS_PRICE_COMPUTE_PRECISION_);
-                                        break;
-                                }
+                                $totalPriceChangeTaxExcl += $totalPriceTaxExcl = Tools::processPriceRounding(
+                                    ($unitPriceTaxExcl * $numDays),
+                                    $objRoomTypeServiceProductCartDetail->quantity,
+                                    $objOrder->round_type,
+                                    $objOrder->round_mode
+                                );
+                                $totalPriceChangeTaxIncl += $totalPriceTaxIncl = Tools::processPriceRounding(
+                                    ($unitPriceTaxIncl * $numDays),
+                                    $objRoomTypeServiceProductCartDetail->quantity,
+                                    $objOrder->round_type,
+                                    $objOrder->round_mode
+                                );
+
+                                $product['total'] = $totalPriceTaxExcl;
+                                $product['total_wt'] = $totalPriceTaxIncl;
                             }
                         }
 
@@ -6584,7 +6566,7 @@ public function ajaxProcessAddRoomAdditionalServices()
                         $order_detail->createList($order, $cart, $order->getCurrentOrderState(), $productList, (isset($objOrderInvoice) ? $objOrderInvoice->id : 0), true);
 
                         $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
-                        $objRoomTypeServiceProductOrderDetail->id_product = $product['id_product'];
+                        $objRoomTypeServiceProductOrderDetail->id_product = $service['id'];
                         $objRoomTypeServiceProductOrderDetail->id_order = $objHotelBookingDetail->id_order;
                         $objRoomTypeServiceProductOrderDetail->id_order_detail = $order_detail->id;
                         $objRoomTypeServiceProductOrderDetail->id_cart = $cart->id;
@@ -6593,22 +6575,21 @@ public function ajaxProcessAddRoomAdditionalServices()
                         $objRoomTypeServiceProductOrderDetail->unit_price_tax_incl = $unitPriceTaxIncl;
                         $objRoomTypeServiceProductOrderDetail->total_price_tax_excl = $totalPriceTaxExcl;
                         $objRoomTypeServiceProductOrderDetail->total_price_tax_incl = $totalPriceTaxIncl;
-                        $objRoomTypeServiceProductOrderDetail->name = $product['name'];
+                        $objRoomTypeServiceProductOrderDetail->name = $service['name'];
                         $objRoomTypeServiceProductOrderDetail->quantity = $objRoomTypeServiceProductCartDetail->quantity;
                         $objRoomTypeServiceProductOrderDetail->save();
 
                         // update totals amount of order
-                        $order->total_products += (float)$totalPriceChangeTaxExcl;
-                        $order->total_products_wt += (float)$totalPriceChangeTaxIncl;
-
-                        $order->total_paid += Tools::ps_round((float)$totalPriceChangeTaxIncl, 2);
-                        $order->total_paid_tax_excl += Tools::ps_round((float)($totalPriceChangeTaxExcl), 2);
-                        $order->total_paid_tax_incl += Tools::ps_round((float)($totalPriceChangeTaxIncl), 2);
+                        $order->total_products = Tools::ps_round((float)($order->total_products + $totalPriceChangeTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
+                        $order->total_products_wt = Tools::ps_round((float)($order->total_products_wt + $totalPriceChangeTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
+                        $order->total_paid = Tools::ps_round((float)($order->total_paid + $totalPriceChangeTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
+                        $order->total_paid_tax_excl = Tools::ps_round((float)($order->total_paid_tax_excl + $totalPriceChangeTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
+                        $order->total_paid_tax_incl = Tools::ps_round((float)($order->total_paid_tax_incl + $totalPriceChangeTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
 
                         // update invoice total
                         if (isset($objOrderInvoice) && Validate::isLoadedObject($objOrderInvoice)) {
-                            $objOrderInvoice->total_paid_tax_excl += Tools::ps_round((float)($totalPriceChangeTaxExcl), 2);
-                            $objOrderInvoice->total_paid_tax_incl += Tools::ps_round((float)($totalPriceChangeTaxIncl), 2);
+                            $objOrderInvoice->total_paid_tax_excl += Tools::ps_round((float)$totalPriceChangeTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
+                            $objOrderInvoice->total_paid_tax_incl += Tools::ps_round((float)$totalPriceChangeTaxIncl, _PS_PRICE_COMPUTE_PRECISION_);
                             $objOrderInvoice->save();
                         }
 
@@ -6711,33 +6692,40 @@ public function ajaxProcessAddRoomExtraDemands()
                                 null,
                                 $demand['unit_price']
                             );
-                            $qty = 1;
+                            $numDays = 1;
                             if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
                                 $numDays = $objHtlBkDtl->getNumberOfDays(
                                     $objBookingDetail->date_from,
                                     $objBookingDetail->date_to
                                 );
-                                if ($numDays > 1) {
-                                    $qty *= $numDays;
-                                }
                             }
-                            $objBookingDemand->total_price_tax_excl = $objBookingDemand->unit_price_tax_excl * $qty;
-                            $objBookingDemand->total_price_tax_incl = $objBookingDemand->unit_price_tax_incl * $qty;
+                            $objBookingDemand->total_price_tax_excl = $totalPriceTaxIncl = Tools::processPriceRounding(
+                                ($objBookingDemand->unit_price_tax_excl * $numDays),
+                                1,
+                                $order->round_type,
+                                $order->round_mode
+                            );
+                            $objBookingDemand->total_price_tax_incl = $totalPriceTaxIncl = Tools::processPriceRounding(
+                                ($objBookingDemand->unit_price_tax_incl * $numDays),
+                                1,
+                                $order->round_type,
+                                $order->round_mode
+                            );
 
                             $order_detail = new OrderDetail($objBookingDetail->id_order_detail);
                             // Update OrderInvoice of this OrderDetail
                             if ($order_detail->id_order_invoice != 0) {
                                 // values changes as values are calculated accoding to the quantity of the product by webkul
                                 $order_invoice = new OrderInvoice($order_detail->id_order_invoice);
-                                $order_invoice->total_paid_tax_excl += $objBookingDemand->total_price_tax_excl;
-                                $order_invoice->total_paid_tax_incl += $objBookingDemand->total_price_tax_incl;
+                                $order_invoice->total_paid_tax_excl = Tools::ps_round((float)($order_invoice->total_paid_tax_excl + $objBookingDemand->total_price_tax_excl), _PS_PRICE_COMPUTE_PRECISION_);
+                                $order_invoice->total_paid_tax_incl = Tools::ps_round((float)($order_invoice->total_paid_tax_incl + $objBookingDemand->total_price_tax_incl), _PS_PRICE_COMPUTE_PRECISION_);
                                 $res &= $order_invoice->update();
                             }
 
                             // change order total
-                            $order->total_paid_tax_excl += $objBookingDemand->total_price_tax_excl;
-                            $order->total_paid_tax_incl += $objBookingDemand->total_price_tax_incl;
-                            $order->total_paid += $objBookingDemand->total_price_tax_incl;
+                            $order->total_paid_tax_excl = Tools::ps_round((float)($order->total_paid_tax_excl + $objBookingDemand->total_price_tax_excl), _PS_PRICE_COMPUTE_PRECISION_);
+                            $order->total_paid_tax_incl = Tools::ps_round((float)($order->total_paid_tax_incl + $objBookingDemand->total_price_tax_incl), _PS_PRICE_COMPUTE_PRECISION_);
+                            $order->total_paid = Tools::ps_round((float)($order->total_paid + $objBookingDemand->total_price_tax_incl), _PS_PRICE_COMPUTE_PRECISION_);
 
                             $objBookingDemand->price_calc_method = $objGlobalDemand->price_calc_method;
                             $objBookingDemand->id_tax_rules_group = $objGlobalDemand->id_tax_rules_group;
@@ -6789,19 +6777,43 @@ public function ajaxProcessUpdateRoomExtraDemands()
                 } else {
                     $oldTaxMultiplier = 1;
                 }
+
                 $objBookingDemand->unit_price_tax_excl = $unitPrice;
                 $objBookingDemand->unit_price_tax_incl = $unitPrice * $oldTaxMultiplier;
+
                 $objBookingDetail = new HotelBookingDetail($objBookingDemand->id_htl_booking);
+                $order = new Order($objBookingDetail->id_order);
                 if ($objBookingDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
                     $numDays = $objBookingDetail->getNumberOfDays(
                         $objBookingDetail->date_from,
                         $objBookingDetail->date_to
                     );
-                    $objBookingDemand->total_price_tax_excl = $objBookingDemand->unit_price_tax_excl * $numDays;
-                    $objBookingDemand->total_price_tax_incl = $objBookingDemand->unit_price_tax_incl * $numDays;
+
+                    $objBookingDemand->total_price_tax_excl = Tools::processPriceRounding(
+                        ($objBookingDemand->unit_price_tax_excl * $numDays),
+                        1,
+                        $order->round_type,
+                        $order->round_mode
+                    );
+                    $objBookingDemand->total_price_tax_excl = Tools::processPriceRounding(
+                        ($objBookingDemand->unit_price_tax_incl * $numDays),
+                        1,
+                        $order->round_type,
+                        $order->round_mode
+                    );
                 } else {
-                    $objBookingDemand->total_price_tax_excl = $objBookingDemand->unit_price_tax_excl;
-                    $objBookingDemand->total_price_tax_incl = $objBookingDemand->unit_price_tax_incl;
+                    $objBookingDemand->total_price_tax_excl = Tools::processPriceRounding(
+                        $objBookingDemand->unit_price_tax_excl,
+                        1,
+                        $order->round_type,
+                        $order->round_mode
+                    );
+                    $objBookingDemand->total_price_tax_excl = Tools::processPriceRounding(
+                        $objBookingDemand->unit_price_tax_incl,
+                        1,
+                        $order->round_type,
+                        $order->round_mode
+                    );
                 }
                 if ($objBookingDemand->save()) {
                     $objBookingDemand->setBookingDemandTaxDetails(1);
@@ -6815,15 +6827,15 @@ public function ajaxProcessUpdateRoomExtraDemands()
                     if ($order_detail->id_order_invoice != 0) {
                         // values changes as values are calculated accoding to the quantity of the product by webkul
                         $order_invoice = new OrderInvoice($order_detail->id_order_invoice);
-                        $order_invoice->total_paid_tax_excl += $priceDiffTaxExcl;
-                        $order_invoice->total_paid_tax_incl += $priceDiffTaxIncl;
+
+                        $order_invoice->total_paid_tax_excl = Tools::ps_round((float)($order_invoice->total_paid_tax_excl + $priceDiffTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
+                        $order_invoice->total_paid_tax_incl = Tools::ps_round((float)($order_invoice->total_paid_tax_incl + $priceDiffTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
                         $order_invoice->update();
                     }
 
-                    $order = new Order($objBookingDetail->id_order);
-                    $order->total_paid_tax_excl += $priceDiffTaxExcl;
-                    $order->total_paid_tax_incl += $priceDiffTaxIncl;
-                    $order->total_paid += $priceDiffTaxIncl;
+                    $order->total_paid_tax_excl = Tools::ps_round((float)($order->total_paid_tax_excl + $priceDiffTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
+                    $order->total_paid_tax_incl = Tools::ps_round((float)($order->total_paid_tax_incl + $priceDiffTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
+                    $order->total_paid = Tools::ps_round((float)($order->total_paid + $priceDiffTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
                     if ($order->save()) {
                         $response['facilities_panel'] = $this->processRenderFacilitiesBlock(
                             $order->id,
@@ -6855,9 +6867,11 @@ public function ajaxProcessDeleteRoomExtraDemand()
                         if (Validate::isLoadedObject($objBookingDetail = new HotelBookingDetail($objBookingDemand->id_htl_booking))) {
                             // change order total
                             $order = new Order($objBookingDetail->id_order);
-                            $order->total_paid_tax_excl -= $objBookingDemand->total_price_tax_excl;
-                            $order->total_paid_tax_incl -= $objBookingDemand->total_price_tax_incl;
-                            $order->total_paid -= $objBookingDemand->total_price_tax_incl;
+
+                            $order->total_paid_tax_excl = Tools::ps_round((float)($order->total_paid_tax_excl - $objBookingDemand->total_price_tax_excl), _PS_PRICE_COMPUTE_PRECISION_);
+                            $order->total_paid_tax_incl = Tools::ps_round((float)($order->total_paid_tax_incl - $objBookingDemand->total_price_tax_incl), _PS_PRICE_COMPUTE_PRECISION_);
+                            $order->total_paid = Tools::ps_round((float)($order->total_paid - $objBookingDemand->total_price_tax_incl), _PS_PRICE_COMPUTE_PRECISION_);
+
                             $order->save();
 
                             $order_detail = new OrderDetail($objBookingDetail->id_order_detail);
@@ -6865,8 +6879,8 @@ public function ajaxProcessDeleteRoomExtraDemand()
                             if ($order_detail->id_order_invoice != 0) {
                                 // values changes as values are calculated accoding to the quantity of the product by webkul
                                 $order_invoice = new OrderInvoice($order_detail->id_order_invoice);
-                                $order_invoice->total_paid_tax_excl -= $objBookingDemand->total_price_tax_excl;
-                                $order_invoice->total_paid_tax_incl -= $objBookingDemand->total_price_tax_incl;
+                                $order_invoice->total_paid_tax_excl = Tools::ps_round((float)($order_invoice->total_paid_tax_excl - $objBookingDemand->total_price_tax_excl), _PS_PRICE_COMPUTE_PRECISION_);
+                                $order_invoice->total_paid_tax_incl = Tools::ps_round((float)($order_invoice->total_paid_tax_incl - $objBookingDemand->total_price_tax_incl), _PS_PRICE_COMPUTE_PRECISION_);
                                 $res &= $order_invoice->update();
                             }
                             if ($res) {
@@ -7050,7 +7064,7 @@ public function ajaxProcessChangeRoomTypeToReallocate()
                     );
                     if ($objHotelBooking->total_price_tax_excl != $newRoomTotalPrice['total_price_tax_excl']) {
                         $result['has_price_changes'] = 1;
-                        $result['price_diff'] = Tools::ps_round(($newRoomTotalPrice['total_price_tax_excl'] - $objHotelBooking->total_price_tax_excl), 6);
+                        $result['price_diff'] = $newRoomTotalPrice['total_price_tax_excl'] - $objHotelBooking->total_price_tax_excl;
                     }
                 }
             } else {
diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index ff1248344..58988d92a 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -1032,11 +1032,14 @@ public function getRoomTypeBookingServices()
                 $roomTypeServiceProducts = $objRoomTypeServiceProduct->getServiceProductsData($idProduct, 1, 0, true, 1);
                 $cartRooms = $objCartBookingData->getHotelCartRoomsInfoByRoomType($this->context->cart->id, $idProduct,$dateFrom, $dateTo);
                 foreach($cartRooms as &$room) {
-                    $room['selected_service'] = $objRoomTypeServiceProductCartDetail->getRoomServiceProducts(
-                        $room['id'],
+                    $room['selected_service'] = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
+                        $room['id_cart'],
                         0,
-                        null,
-                        null
+                        0,
+                        0,
+                        0,
+                        0,
+                        $room['id']
                     );
                 }
                 $this->context->smarty->assign(array(
diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml
index ab955c1f2..956aa3aff 100644
--- a/install/data/xml/configuration.xml
+++ b/install/data/xml/configuration.xml
@@ -885,7 +885,7 @@
 		<value>1</value>
 	</configuration>
 	<configuration id="PS_ROUND_TYPE" name="PS_ROUND_TYPE">
-		<value>2</value>
+		<value>1</value>
 	</configuration>
 	<configuration id="PS_PRICE_DISPLAY_PRECISION" name="PS_PRICE_DISPLAY_PRECISION">
 		<value>2</value>
diff --git a/modules/hotelreservationsystem/classes/HotelBookingDemands.php b/modules/hotelreservationsystem/classes/HotelBookingDemands.php
index fc613a6c0..a8d50ea81 100644
--- a/modules/hotelreservationsystem/classes/HotelBookingDemands.php
+++ b/modules/hotelreservationsystem/classes/HotelBookingDemands.php
@@ -119,9 +119,9 @@ public function getRoomTypeBookingExtraDemands(
             if ($getTotalPrice) {
                 foreach ($roomTypeDemands as $demand) {
                     if ($useTax) {
-                        $totalDemandsPrice += $demand['total_price_tax_incl'];
+                        $totalDemandsPrice += Tools::processPriceRounding($demand['total_price_tax_incl']);
                     } else {
-                        $totalDemandsPrice += $demand['total_price_tax_excl'];
+                        $totalDemandsPrice += Tools::processPriceRounding($demand['total_price_tax_excl']);
                     }
                 }
             } else {
@@ -202,24 +202,11 @@ public function setBookingDemandTaxDetails($replace = 0)
                         $objBkDetail = new HotelBookingDetail($this->id_htl_booking);
                         $quantity = $objBkDetail->getNumberOfDays($objBkDetail->date_from, $objBkDetail->date_to);
                     }
-                    switch (Configuration::get('PS_ROUND_TYPE')) {
-                        case Order::ROUND_ITEM:
-                            $unitAmount = (float)Tools::ps_round($amount, _PS_PRICE_COMPUTE_PRECISION_);
-                            $totalAmount = $unitAmount * $quantity;
-                            break;
-                        case Order::ROUND_LINE:
-                            $unitAmount = $amount;
-                            $totalAmount = Tools::ps_round(
-                                $unitAmount * $quantity,
-                                _PS_PRICE_COMPUTE_PRECISION_
-                            );
-                            break;
-                        case Order::ROUND_TOTAL:
-                            $unitAmount = $amount;
-                            $totalAmount = $unitAmount * $quantity;
-                            break;
-                    }
-                    $values .= '('.(int)$this->id.','.(int)$idTax.','.(float)$unitAmount.','.
+
+                    // Rounding as per configurations
+                    $totalAmount += Tools::processPriceRounding($amount, $quantity);
+
+                    $values .= '('.(int)$this->id.','.(int)$idTax.','.(float)$amount.','.
                     (float)$totalAmount.'),';
                 }
 
@@ -274,29 +261,15 @@ public function getExtraDemandsTaxesDetails($idOrder, $idsOrderDetail = [])
         if ($taxDetails) {
             foreach ($taxDetails as &$detail) {
                 $priceTaxExcl = $detail['unit_price_tax_excl'];
-                $quantity = 1;
+                $numDays = 1;
                 $objBkDemand = new HotelBookingDemands($detail['id_booking_demand']);
                 if ($objBkDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
                     $objBkDetail = new HotelBookingDetail($detail['id_htl_booking']);
-                    $quantity = $objBkDetail->getNumberOfDays($objBkDetail->date_from, $objBkDetail->date_to);
-                }
-                switch (Configuration::get('PS_ROUND_TYPE')) {
-                    case Order::ROUND_ITEM:
-                        $unitAmount = (float)Tools::ps_round($priceTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
-                        $totalTaxBase = $unitAmount * $quantity;
-                        break;
-                    case Order::ROUND_LINE:
-                        $unitAmount = $priceTaxExcl;
-                        $totalTaxBase = Tools::ps_round(
-                            $unitAmount * $quantity,
-                            _PS_PRICE_COMPUTE_PRECISION_
-                        );
-                        break;
-                    case Order::ROUND_TOTAL:
-                        $unitAmount = $priceTaxExcl;
-                        $totalTaxBase = $unitAmount * $quantity;
-                        break;
+                    $numDays = $objBkDetail->getNumberOfDays($objBkDetail->date_from, $objBkDetail->date_to);
                 }
+
+                $totalTaxBase = $unitAmount * $numDays;
+
                 $detail['total_tax_base'] = $totalTaxBase;
             }
         }
diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
index 074dc1ea5..1fe761d73 100644
--- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php
+++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
@@ -1902,6 +1902,7 @@ public function reallocateRoomWithAvailableSameRoomType($currentRoomId, $dateFro
     public function reallocateBooking($idHotelBooking, $idRoom, $priceDiffTaxExcl = 0)
     {
         $result = true;
+        $reallocatedBookingId = 0;
         // get the cart booking data for the given booking
         if (Validate::isLoadedObject($objOldHotelBooking = new HotelBookingDetail($idHotelBooking))) {
             $objHotelRoomInfo = new HotelRoomInformation($idRoom);
@@ -1912,7 +1913,10 @@ public function reallocateBooking($idHotelBooking, $idRoom, $priceDiffTaxExcl =
 
                 $productQty = (int)$objOldHotelBooking->getNumberOfDays($objOldHotelBooking->date_from, $objOldHotelBooking->date_to);
                 $oldRoomPriceTaxExcl = $objOldHotelBooking->total_price_tax_excl / $productQty;
-                $newRoomPriceTaxExcl = $oldRoomPriceTaxExcl + $priceDiffTaxExcl;
+
+                // Calculate new room price per qty
+                $priceDiffPerQtyTaxExcl = $priceDiffTaxExcl / $productQty;
+                $newRoomPriceTaxExcl = $oldRoomPriceTaxExcl + $priceDiffPerQtyTaxExcl;
 
                 $totalRoomPriceTaxIncl = $objOldHotelBooking->total_price_tax_incl;
                 $totalRoomPriceTaxExcl = $objOldHotelBooking->total_price_tax_excl;
@@ -1936,6 +1940,7 @@ public function reallocateBooking($idHotelBooking, $idRoom, $priceDiffTaxExcl =
                 $cart->add();
 
                 // Save context (in order to apply cart rule)
+                $this->context = Context::getContext();
                 $this->context->cart = $cart;
                 $this->context->customer = new Customer($objOrder->id_customer);
                 $this->context->currency = new Currency($objOrder->id_currency);
@@ -1947,7 +1952,7 @@ public function reallocateBooking($idHotelBooking, $idRoom, $priceDiffTaxExcl =
                     $idNewRoomType,
                     $useTaxes,
                     null,
-                    2,
+                    6,
                     null,
                     false,
                     true,
@@ -1991,7 +1996,8 @@ public function reallocateBooking($idHotelBooking, $idRoom, $priceDiffTaxExcl =
                         $objCartBookingData->id_product = $roomInfo['id_product'];
                         $objCartBookingData->id_room = $roomInfo['id_room'];
                         $objCartBookingData->id_hotel = $roomInfo['id_hotel'];
-                        $objCartBookingData->booking_type = 1;
+                        $objCartBookingData->booking_type = $objOldHotelBooking->booking_type;
+                        $objCartBookingData->comment = $objOldHotelBooking->comment;
                         $objCartBookingData->quantity = $productQty;
                         $objCartBookingData->date_from = $objOldHotelBooking->date_from;
                         $objCartBookingData->date_to = $objOldHotelBooking->date_to;
@@ -2016,18 +2022,6 @@ public function reallocateBooking($idHotelBooking, $idRoom, $priceDiffTaxExcl =
                     return false;
                 }
 
-                $totalRoomTypePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice(
-                    $idNewRoomType,
-                    $objCartBookingData->date_from,
-                    $objCartBookingData->date_to,
-                    0,
-                    Group::getCurrent()->id,
-                    $this->context->cart->id,
-                    $this->context->cookie->id_guest,
-                    $objCartBookingData->id_room,
-                    0
-                );
-
                 // Add product to cart
                 $updateQuantity = $cart->updateQty(
                     $productQty,
@@ -2046,7 +2040,7 @@ public function reallocateBooking($idHotelBooking, $idRoom, $priceDiffTaxExcl =
                     $objOrderInvoice->total_paid_tax_incl += (float)($cart->getOrderTotal($useTaxes, $totalMethod));
                     $objOrderInvoice->total_products += (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS);
                     $objOrderInvoice->total_products_wt += (float)$cart->getOrderTotal($useTaxes, Cart::ONLY_PRODUCTS);
-                    $objOrderInvoice->update();
+                    $result &= $objOrderInvoice->update();
                 }
 
                 // Create Order detail information
@@ -2062,7 +2056,7 @@ public function reallocateBooking($idHotelBooking, $idRoom, $priceDiffTaxExcl =
                 $objOrder->total_paid_tax_incl += (float)($cart->getOrderTotal($useTaxes, $totalMethod));
 
                 // Save changes of order
-                $objOrder->update();
+                $result &= $objOrder->update();
 
                 // Update Tax lines
                 $objOrderDetail->updateTaxAmount($objOrder);
@@ -2090,10 +2084,9 @@ public function reallocateBooking($idHotelBooking, $idRoom, $priceDiffTaxExcl =
                         $objBookingDetail->id_hotel = $objCartBookingData->id_hotel;
                         $objBookingDetail->id_customer = $objOrder->id_customer;
                         $objBookingDetail->booking_type = $objCartBookingData->booking_type;
-                        $objBookingDetail->id_status = 1;
                         $objBookingDetail->comment = $objCartBookingData->comment;
+                        $objBookingDetail->id_status = 1;
                         $objBookingDetail->room_type_name = Product::getProductName($idNewRoomType, null, $objOrder->id_lang);
-
                         $objBookingDetail->date_from = $objCartBookingData->date_from;
                         $objBookingDetail->date_to = $objCartBookingData->date_to;
                         $objBookingDetail->adults = $objCartBookingData->adults;
@@ -2135,7 +2128,8 @@ public function reallocateBooking($idHotelBooking, $idRoom, $priceDiffTaxExcl =
                             $objBookingDetail->check_out_time = $objHotelBranch->check_out;
                         }
 
-                        if ($objBookingDetail->save()) {
+                        if ($result &= $objBookingDetail->save()) {
+                            $reallocatedBookingId = $objBookingDetail->id;
                             // Get Booking Demands of the old booking to add in the new booking creation
                             $objBookingDemand = new HotelBookingDemands();
                             if ($oldBookingDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
@@ -2167,10 +2161,12 @@ public function reallocateBooking($idHotelBooking, $idRoom, $priceDiffTaxExcl =
                             }
                         }
                     }
+                } else {
+                    return false;
                 }
 
                 // delete cart feature prices after room addition success
-                HotelRoomTypeFeaturePricing::deleteByIdCart($this->context->cart->id);
+                // HotelRoomTypeFeaturePricing::deleteByIdCart($this->context->cart->id);
 
                 // ===============================================================
                 // END: Add Process of the old booking
@@ -2184,58 +2180,94 @@ public function reallocateBooking($idHotelBooking, $idRoom, $priceDiffTaxExcl =
                     $deleteQty = true;
                 } else {
                     // Calculate differences of price (Before / After)
-
-                    $objOldOrderDetail->total_price_tax_incl -= $totalRoomPriceTaxIncl;
-                    $objOldOrderDetail->total_price_tax_excl -= $totalRoomPriceTaxExcl;
+                    $objOldOrderDetail->total_price_tax_incl -= Tools::processPriceRounding(
+                        ($objOldOrderDetail->total_price_tax_incl - $totalRoomPriceTaxIncl),
+                        1,
+                        $objOrder->round_type,
+                        $objOrder->round_mode
+                    );
+                    $objOldOrderDetail->total_price_tax_excl -= Tools::processPriceRounding(
+                        ($objOldOrderDetail->total_price_tax_excl - $totalRoomPriceTaxExcl),
+                        1,
+                        $objOrder->round_type,
+                        $objOrder->round_mode
+                    );
 
                     $old_quantity = $objOldOrderDetail->product_quantity;
 
-                    $objOldOrderDetail->product_quantity = $old_quantity - $product_quantity;
+                    $objOldOrderDetail->product_quantity = $old_quantity - $productQty;
                     $objOldOrderDetail->reduction_percent = 0;
 
                     // update taxes
-                    $res &= $objOldOrderDetail->updateTaxAmount($objOrder);
+                    $result &= $objOldOrderDetail->updateTaxAmount($objOrder);
 
                     // Save order detail
-                    $res &= $objOldOrderDetail->update();
+                    $result &= $objOldOrderDetail->update();
                 }
 
                 // Update OrderInvoice of this OrderDetail
                 if ($objOldOrderDetail->id_order_invoice != 0) {
                     // values changes as values are calculated accoding to the quantity of the product by webkul
                     $objOrderInvoice = new OrderInvoice($objOldOrderDetail->id_order_invoice);
-                    $objOrderInvoice->total_paid_tax_excl -= $totalRoomPriceTaxExcl;
+                    $objOrderInvoice->total_paid_tax_excl = Tools::ps_round(
+                        ($objOrderInvoice->total_paid_tax_excl - $totalRoomPriceTaxExcl),
+                        _PS_PRICE_COMPUTE_PRECISION_
+                    );
                     $objOrderInvoice->total_paid_tax_excl = $objOrderInvoice->total_paid_tax_excl > 0 ? $objOrderInvoice->total_paid_tax_excl : 0;
 
-                    $objOrderInvoice->total_paid_tax_incl -= $totalRoomPriceTaxIncl;
+                    $objOrderInvoice->total_paid_tax_incl = Tools::ps_round(
+                        ($objOrderInvoice->total_paid_tax_incl - $totalRoomPriceTaxIncl),
+                        _PS_PRICE_COMPUTE_PRECISION_
+                    );
                     $objOrderInvoice->total_paid_tax_incl = $objOrderInvoice->total_paid_tax_incl > 0 ? $objOrderInvoice->total_paid_tax_incl : 0;
 
-                    $objOrderInvoice->total_products -= $totalRoomPriceTaxExcl;
+                    $objOrderInvoice->total_products = Tools::ps_round(
+                        ($objOrderInvoice->total_products - $totalRoomPriceTaxExcl),
+                        _PS_PRICE_COMPUTE_PRECISION_
+                    );
                     $objOrderInvoice->total_products = $objOrderInvoice->total_products > 0 ? $objOrderInvoice->total_products : 0;
 
-                    $objOrderInvoice->total_products_wt -= $totalRoomPriceTaxIncl;
+                    $objOrderInvoice->total_products_wt = Tools::ps_round(
+                        ($objOrderInvoice->total_products_wt - $totalRoomPriceTaxIncl),
+                        _PS_PRICE_COMPUTE_PRECISION_
+                    );
                     $objOrderInvoice->total_products_wt = $objOrderInvoice->total_products_wt > 0 ? $objOrderInvoice->total_products_wt : 0;
 
-                    $res &= $objOrderInvoice->update();
+                    $result &= $objOrderInvoice->update();
                 }
 
                 // values changes as values are calculated accoding to the quantity of the product by webkul
-                $objOrder->total_paid -= $totalRoomPriceTaxIncl;
+                $objOrder->total_paid = Tools::ps_round(
+                    ($objOrder->total_paid_tax_incl - $totalRoomPriceTaxIncl),
+                    _PS_PRICE_COMPUTE_PRECISION_
+                );
                 $objOrder->total_paid = $objOrder->total_paid > 0 ? $objOrder->total_paid : 0;
 
-                $objOrder->total_paid_tax_incl -= $totalRoomPriceTaxIncl;
+                $objOrder->total_paid_tax_incl = Tools::ps_round(
+                    ($objOrder->total_paid_tax_incl - $totalRoomPriceTaxIncl),
+                    _PS_PRICE_COMPUTE_PRECISION_
+                );
                 $objOrder->total_paid_tax_incl = $objOrder->total_paid_tax_incl > 0 ? $objOrder->total_paid_tax_incl : 0;
 
-                $objOrder->total_paid_tax_excl -= $totalRoomPriceTaxExcl;
+                $objOrder->total_paid_tax_excl = Tools::ps_round(
+                    ($objOrder->total_paid_tax_excl - $totalRoomPriceTaxExcl),
+                    _PS_PRICE_COMPUTE_PRECISION_
+                );
                 $objOrder->total_paid_tax_excl = $objOrder->total_paid_tax_excl > 0 ? $objOrder->total_paid_tax_excl : 0;
 
-                $objOrder->total_products -= $totalRoomPriceTaxExcl;
+                $objOrder->total_products = Tools::ps_round(
+                    ($objOrder->total_products - $totalRoomPriceTaxExcl),
+                    _PS_PRICE_COMPUTE_PRECISION_
+                );
                 $objOrder->total_products = $objOrder->total_products > 0 ? $objOrder->total_products : 0;
 
-                $objOrder->total_products_wt -= $totalRoomPriceTaxIncl;
+                $objOrder->total_products_wt = Tools::ps_round(
+                    ($objOrder->total_products_wt - $totalRoomPriceTaxIncl),
+                    _PS_PRICE_COMPUTE_PRECISION_
+                );
                 $objOrder->total_products_wt = $objOrder->total_products_wt > 0 ? $objOrder->total_products_wt : 0;
 
-                $objOrder->update();
+                $result &= $objOrder->update();
 
                 // Reinject quantity in stock
                 $objOldOrderDetail->reinjectQuantity($objOldOrderDetail, $objOldOrderDetail->product_quantity, $deleteQty);
@@ -2276,16 +2308,22 @@ public function reallocateBooking($idHotelBooking, $idRoom, $priceDiffTaxExcl =
                 $objOldHotelBooking->is_back_order = 0;
 
                 $result &= $objOldHotelBooking->save();
+
+                $reallocatedBookingId = $objOldHotelBooking->id;
             }
 
-            if ($result) {
+            if ($result && $reallocatedBookingId) {
                 Hook::exec(
                     'actionRoomReallocateAfter',
                     array(
-                        'id_htl_booking' => $idHotelBooking,
-                        'id_room' => $idRoom
+                        'id_htl_booking_from' => $idHotelBooking,
+                        'id_htl_booking_to' => $reallocatedBookingId,
                     )
                 );
+
+                return $reallocatedBookingId;
+            } else {
+                $result = false;
             }
         } else {
             $result = false;
@@ -2519,7 +2557,7 @@ public function updateHotelCartHotelOrderOnOrderEdit(
         $newDateFrom,
         $newDateTo,
         $occupancy,
-        $newTotalPrice = null,
+        $newTotalPrice,
         $idHotelBookingDetail
     ) {
         $objHotelBookingDetail = new self((int) $idHotelBookingDetail);
@@ -2535,19 +2573,7 @@ public function updateHotelCartHotelOrderOnOrderEdit(
             $objHotelCartBookingData = new HotelCartBookingData($idHotelCartBookingData);
             if (Validate::isLoadedObject($objHotelCartBookingData)) {
                 // calculate new prices
-                $newTotalPriceTE = '';
-                $newTotalPriceTI = '';
                 $newNumDays = $this->getNumberOfDays($newDateFrom, $newDateTo);
-                if ($newTotalPrice) {
-                    $newTotalPriceTE = $newTotalPrice['tax_excl'];
-                    $newTotalPriceTI = $newTotalPrice['tax_incl'];
-                } else {
-                    $oldNumDays = $this->getNumberOfDays($oldDateFrom, $oldDateTo);
-                    $unitRoomPriceTE = $objHotelBookingDetail->total_price_tax_excl / $oldNumDays;
-                    $unitRoomPriceTI = $objHotelBookingDetail->total_price_tax_incl / $oldNumDays;
-                    $newTotalPriceTE = $unitRoomPriceTE * $newNumDays;
-                    $newTotalPriceTI = $unitRoomPriceTI * $newNumDays;
-                }
 
                 // update $objHotelCartBookingData
                 $objHotelCartBookingData->date_from = $newDateFrom;
@@ -2560,8 +2586,8 @@ public function updateHotelCartHotelOrderOnOrderEdit(
                 // update $objHotelBookingDetail
                 $objHotelBookingDetail->date_from = $newDateFrom;
                 $objHotelBookingDetail->date_to = $newDateTo;
-                $objHotelBookingDetail->total_price_tax_excl = Tools::ps_round($newTotalPriceTE, 6);
-                $objHotelBookingDetail->total_price_tax_incl = Tools::ps_round($newTotalPriceTI, 6);
+                $objHotelBookingDetail->total_price_tax_excl = $newTotalPrice['tax_excl'];
+                $objHotelBookingDetail->total_price_tax_incl = $newTotalPrice['tax_incl'];
                 $objHotelBookingDetail->adults = $occupancy['adults'];
                 $objHotelBookingDetail->children = $occupancy['children'];
                 $objHotelBookingDetail->child_ages = json_encode($occupancy['child_ages']);
@@ -3324,10 +3350,10 @@ public function processRefundInBookingTables()
                 $objHotelBookingDemands = new HotelBookingDemands();
                 $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
 
-                $reduction_amount['total_price_tax_excl'] = Tools::ps_round((float) $this->total_price_tax_excl, 6);
-                $reduction_amount['total_products_tax_excl'] = Tools::ps_round((float) $this->total_price_tax_excl, 6);
-                $reduction_amount['total_price_tax_incl'] = Tools::ps_round((float) $this->total_price_tax_incl, 6);
-                $reduction_amount['total_products_tax_incl'] = Tools::ps_round((float) $this->total_price_tax_incl, 6);
+                $reduction_amount['total_price_tax_excl'] = (float) $this->total_price_tax_excl;
+                $reduction_amount['total_products_tax_excl'] = (float) $this->total_price_tax_excl;
+                $reduction_amount['total_price_tax_incl'] = (float) $this->total_price_tax_incl;
+                $reduction_amount['total_products_tax_incl'] = (float) $this->total_price_tax_incl;
 
                 // reduce facilities amount from order and services_detail
                 if ($roomDemands = $objHotelBookingDemands->getRoomTypeBookingExtraDemands(
@@ -3343,8 +3369,8 @@ public function processRefundInBookingTables()
                 )) {
                     foreach ($roomDemands as $roomDemand) {
                         $objHotelBookingDemands = new HotelBookingDemands($roomDemand['id_booking_demand']);
-                        $reduction_amount['total_price_tax_excl'] += Tools::ps_round((float) $objHotelBookingDemands->total_price_tax_excl, 6);
-                        $reduction_amount['total_price_tax_incl'] += Tools::ps_round((float) $objHotelBookingDemands->total_price_tax_incl, 6);
+                        $reduction_amount['total_price_tax_excl'] += (float) $objHotelBookingDemands->total_price_tax_excl;
+                        $reduction_amount['total_price_tax_incl'] += (float) $objHotelBookingDemands->total_price_tax_incl;
                         $objHotelBookingDemands->total_price_tax_excl = 0;
                         $objHotelBookingDemands->total_price_tax_incl = 0;
                         $objHotelBookingDemands->save();
@@ -3359,10 +3385,10 @@ public function processRefundInBookingTables()
                         $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(
                             $roomService['id_room_type_service_product_order_detail']
                         );
-                        $reduction_amount['total_price_tax_excl'] += Tools::ps_round((float) $objRoomTypeServiceProductOrderDetail->total_price_tax_excl, 6);
-                        $reduction_amount['total_products_tax_excl'] += Tools::ps_round((float) $objRoomTypeServiceProductOrderDetail->total_price_tax_excl, 6);
-                        $reduction_amount['total_price_tax_incl'] += Tools::ps_round((float) $objRoomTypeServiceProductOrderDetail->total_price_tax_incl, 6);
-                        $reduction_amount['total_products_tax_incl'] += Tools::ps_round((float) $objRoomTypeServiceProductOrderDetail->total_price_tax_incl, 6);
+                        $reduction_amount['total_price_tax_excl'] += (float) $objRoomTypeServiceProductOrderDetail->total_price_tax_excl;
+                        $reduction_amount['total_products_tax_excl'] += (float) $objRoomTypeServiceProductOrderDetail->total_price_tax_excl;
+                        $reduction_amount['total_price_tax_incl'] += (float) $objRoomTypeServiceProductOrderDetail->total_price_tax_incl;
+                        $reduction_amount['total_products_tax_incl'] += (float) $objRoomTypeServiceProductOrderDetail->total_price_tax_incl;
 
                         if (Validate::isLoadedObject($objOrderDetail = new OrderDetail($objRoomTypeServiceProductOrderDetail->id_order_detail))) {
                             $objOrderDetail->product_quantity_refunded += $objRoomTypeServiceProductOrderDetail->quantity;
@@ -3370,13 +3396,17 @@ public function processRefundInBookingTables()
                                 $objOrderDetail->product_quantity_refunded = $objOrderDetail->product_quantity;
                             }
 
-                            $objOrderDetail->total_price_tax_excl = Tools::ps_round(
-                                ($objOrderDetail->total_price_tax_excl - $objRoomTypeServiceProductOrderDetail->total_price_tax_excl),
-                                6
+                            $objOrderDetail->total_price_tax_excl -= Tools::processPriceRounding(
+                                $objOrderDetail->total_price_tax_excl,
+                                1,
+                                $objOrder->round_type,
+                                $objOrder->round_mode
                             );
-                            $objOrderDetail->total_price_tax_incl = Tools::ps_round(
-                                ($objOrderDetail->total_price_tax_incl - $objRoomTypeServiceProductOrderDetail->total_price_tax_incl),
-                                6
+                            $objOrderDetail->total_price_tax_incl -= Tools::processPriceRounding(
+                                $objOrderDetail->total_price_tax_incl,
+                                1,
+                                $objOrder->round_type,
+                                $objOrder->round_mode
                             );
 
                             $objOrderDetail->save();
@@ -3404,42 +3434,44 @@ public function processRefundInBookingTables()
 
                 if (!$hasOrderDiscountOrPayment) {
                     // reduce room amount from order and order detail
-                    $objOrderDetail->total_price_tax_incl = Tools::ps_round(
-                        ($objOrderDetail->total_price_tax_incl - $this->total_price_tax_incl),
-                        6
+                    $objOrderDetail->total_price_tax_incl -= Tools::processPriceRounding(
+                        $this->total_price_tax_incl,
+                        1,
+                        $objOrder->round_type,
+                        $objOrder->round_mode
                     );
-                    $objOrderDetail->total_price_tax_excl = Tools::ps_round(
-                        ($objOrderDetail->total_price_tax_excl - $this->total_price_tax_excl),
-                        6
+
+                    $objOrderDetail->total_price_tax_excl -= Tools::processPriceRounding(
+                        $this->total_price_tax_excl,
+                        1,
+                        $objOrder->round_type,
+                        $objOrder->round_mode
                     );
+
                     if (Validate::isLoadedObject($objOrder = new Order($this->id_order))) {
                         $objOrder->total_paid = Tools::ps_round(
                             ($objOrder->total_paid - $reduction_amount['total_price_tax_incl']),
-                            6
+                            _PS_PRICE_COMPUTE_PRECISION_
                         );
                         $objOrder->total_paid = $objOrder->total_paid > 0 ? $objOrder->total_paid : 0;
 
-                        $objOrder->total_paid_tax_excl = Tools::ps_round(
-                            ($objOrder->total_paid_tax_excl - $reduction_amount['total_price_tax_excl']),
-                            6
+                        $objOrder->total_paid_tax_excl = Tools::ps_round(($objOrder->total_paid_tax_excl - $reduction_amount['total_price_tax_excl']),
+                            _PS_PRICE_COMPUTE_PRECISION_
                         );
                         $objOrder->total_paid_tax_excl = $objOrder->total_paid_tax_excl > 0 ? $objOrder->total_paid_tax_excl : 0;
 
-                        $objOrder->total_paid_tax_incl = Tools::ps_round(
-                            ($objOrder->total_paid_tax_incl - $reduction_amount['total_price_tax_incl']),
-                            6
+                        $objOrder->total_paid_tax_incl = Tools::ps_round(($objOrder->total_paid_tax_incl - $reduction_amount['total_price_tax_incl']),
+                            _PS_PRICE_COMPUTE_PRECISION_
                         );
                         $objOrder->total_paid_tax_incl = $objOrder->total_paid_tax_incl > 0 ? $objOrder->total_paid_tax_incl : 0;
 
-                        $objOrder->total_products = Tools::ps_round(
-                            ($objOrder->total_products - $reduction_amount['total_products_tax_excl']),
-                            6
+                        $objOrder->total_products = Tools::ps_round(($objOrder->total_products - $reduction_amount['total_products_tax_excl']),
+                            _PS_PRICE_COMPUTE_PRECISION_
                         );
                         $objOrder->total_products = $objOrder->total_products > 0 ? $objOrder->total_products : 0;
 
-                        $objOrder->total_products_wt = Tools::ps_round(
-                            ($objOrder->total_products_wt - $reduction_amount['total_products_tax_incl']),
-                            6
+                        $objOrder->total_products_wt = Tools::ps_round(($objOrder->total_products_wt - $reduction_amount['total_products_tax_incl']),
+                            _PS_PRICE_COMPUTE_PRECISION_
                         );
                         $objOrder->total_products_wt = $objOrder->total_products_wt > 0 ? $objOrder->total_products_wt : 0;
 
diff --git a/modules/hotelreservationsystem/classes/HotelCartBookingData.php b/modules/hotelreservationsystem/classes/HotelCartBookingData.php
index 29d5ddfa0..e5189efc2 100644
--- a/modules/hotelreservationsystem/classes/HotelCartBookingData.php
+++ b/modules/hotelreservationsystem/classes/HotelCartBookingData.php
@@ -1170,13 +1170,16 @@ public function getCartFormatedBookinInfoByIdCart($id_cart)
                     2,
                     null
                 );
-                $cart_detail_data[$key]['selected_services'] = $objRoomTypeServiceProductCartDetail->getRoomServiceProducts(
-                    $value['id'],
+                $cart_detail_data[$key]['selected_services'] = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
+                    $value['id_cart'],
                     0,
-                    null,
-                    null
+                    0,
+                    0,
+                    0,
+                    0,
+                    $value['id']
                 );
-                $cart_detail_data[$key]['additional_service_price'] = $objRoomTypeServiceProductCartDetail->getServiceProductsTotalInCart(
+                $cart_detail_data[$key]['additional_service_price'] = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
                     $id_cart,
                     0,
                     0,
@@ -1184,9 +1187,10 @@ public function getCartFormatedBookinInfoByIdCart($id_cart)
                     $value['date_from'],
                     $value['date_to'],
                     $value['id'],
+                    1,
                     false
                 );
-                $cart_detail_data[$key]['additional_services_auto_add_price'] = $objRoomTypeServiceProductCartDetail->getServiceProductsTotalInCart(
+                $cart_detail_data[$key]['additional_services_auto_add_price'] = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
                     $id_cart,
                     0,
                     0,
@@ -1194,10 +1198,11 @@ public function getCartFormatedBookinInfoByIdCart($id_cart)
                     $value['date_from'],
                     $value['date_to'],
                     $value['id'],
+                    1,
                     false,
                     1
                 );
-                $cart_detail_data[$key]['additional_services_auto_add_with_room_price'] = $objRoomTypeServiceProductCartDetail->getServiceProductsTotalInCart(
+                $cart_detail_data[$key]['additional_services_auto_add_with_room_price'] = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
                     $id_cart,
                     0,
                     0,
@@ -1205,12 +1210,13 @@ public function getCartFormatedBookinInfoByIdCart($id_cart)
                     $value['date_from'],
                     $value['date_to'],
                     $value['id'],
+                    1,
                     false,
                     1,
                     null,
                     Product::PRICE_ADDITION_TYPE_WITH_ROOM
                 );
-                $cart_detail_data[$key]['additional_services_auto_add_independent_price'] = $objRoomTypeServiceProductCartDetail->getServiceProductsTotalInCart(
+                $cart_detail_data[$key]['additional_services_auto_add_independent_price'] = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
                     $id_cart,
                     0,
                     0,
@@ -1218,6 +1224,7 @@ public function getCartFormatedBookinInfoByIdCart($id_cart)
                     $value['date_from'],
                     $value['date_to'],
                     $value['id'],
+                    1,
                     false,
                     1,
                     null,
@@ -1534,14 +1541,15 @@ public static function getHotelCartBookingData($detailed = 1)
                                     $data_v['date_to'],
                                     1
                                 );
-                                $serviceProductPrice = $objRoomTypeServiceProductCartDetail->getServiceProductsTotalInCart(
+                                $serviceProductPrice = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
                                     $context->cart->id,
                                     0,
                                     $data_v['id_hotel'],
                                     $data_v['id_product'],
                                     $data_v['date_from'],
                                     $data_v['date_to'],
-                                    $data_v['id']
+                                    $data_v['id'],
+                                    1
                                 );
                                 $totalAdditionalServicePrice = $demandPrice + $serviceProductPrice;
 
@@ -1698,6 +1706,7 @@ public static function getHotelCartBookingData($detailed = 1)
                 }
             }
         }
+
         return $cartHotelData;
     }
 
diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php b/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php
index 522b78584..f4b37ffe0 100644
--- a/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php
+++ b/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php
@@ -95,9 +95,12 @@ public function getRoomTypeDemandsTotalPrice($idProduct, $roomDemands, $useTax =
                         }
                     }
                 }
-                $totalDemandsPrice += $price;
+
+                // Rounding as per configurations
+                $totalDemandsPrice += Tools::processPriceRounding($price);
             }
         }
+
         return $totalDemandsPrice;
     }
 
diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php
index de0131c57..c6a9321b5 100644
--- a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php
+++ b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php
@@ -729,7 +729,7 @@ public static function getRoomTypeTotalPrice(
                 $use_reduc
             )) {
                 foreach($servicesWithTax as $service) {
-                    $totalPrice['total_price_tax_incl'] += $service['price'];
+                    $totalPrice['total_price_tax_incl'] += Tools::processPriceRounding($service['price']);
                 }
             }
             if ($servicesWithoutTax = RoomTypeServiceProduct::getAutoAddServices(
@@ -743,14 +743,17 @@ public static function getRoomTypeTotalPrice(
                 $use_reduc
             )) {
                 foreach($servicesWithoutTax as $service) {
-                    $totalPrice['total_price_tax_excl'] += $service['price'];
+                    $totalPrice['total_price_tax_excl'] += Tools::processPriceRounding($service['price']);
                 }
             }
         }
-        if ($quantity) {
-            $totalPrice['total_price_tax_incl'] = $totalPrice['total_price_tax_incl'] * $quantity;
-            $totalPrice['total_price_tax_excl'] = $totalPrice['total_price_tax_excl'] * $quantity;
+
+        if (!$quantity) {
+            $quantity = 1;
         }
+        $totalPrice['total_price_tax_incl'] = Tools::processPriceRounding($totalPrice['total_price_tax_incl'], $quantity);
+        $totalPrice['total_price_tax_excl'] = Tools::processPriceRounding($totalPrice['total_price_tax_excl'], $quantity);
+
         return $totalPrice;
     }
 
diff --git a/modules/hotelreservationsystem/classes/RoomTypeServiceProduct.php b/modules/hotelreservationsystem/classes/RoomTypeServiceProduct.php
index 90c3b85e0..d4b6c965a 100644
--- a/modules/hotelreservationsystem/classes/RoomTypeServiceProduct.php
+++ b/modules/hotelreservationsystem/classes/RoomTypeServiceProduct.php
@@ -163,6 +163,7 @@ public static function getAutoAddServices($idProduct, $dateFrom = null, $dateTo
                         $use_reduc
                     );
                 }
+
                 return $services;
             }
         }
diff --git a/modules/hotelreservationsystem/classes/RoomTypeServiceProductCartDetail.php b/modules/hotelreservationsystem/classes/RoomTypeServiceProductCartDetail.php
index e40082572..0690e7374 100644
--- a/modules/hotelreservationsystem/classes/RoomTypeServiceProductCartDetail.php
+++ b/modules/hotelreservationsystem/classes/RoomTypeServiceProductCartDetail.php
@@ -132,6 +132,9 @@ public function removeServiceProductByIdHtlCartBooking($htlCartBookingId)
         return true;
     }
 
+    /**
+     * @deprecated since 1.6.1 use getServiceProductsInCart() instead
+    */
     public function getServiceProductsTotalInCart(
         $idCart,
         $idProduct = 0,
@@ -145,61 +148,25 @@ public function getServiceProductsTotalInCart(
         $id_address = null,
         $priceAdditionType = null
     ) {
-        if ($useTax === null)
-            $useTax = Product::$_taxCalculationMethod == PS_TAX_EXC ? false : true;
-
-        $sql = 'SELECT rscd.`id_product`, rscd.`quantity`, cbd.`id_product` as `room_type_id_product`, cbd.`date_from`, cbd.`date_to`
-            FROM `'._DB_PREFIX_.'htl_cart_booking_data` cbd
-            LEFT JOIN `'._DB_PREFIX_.'htl_room_type_service_product_cart_detail` rscd ON(rscd.`htl_cart_booking_id` = cbd.`id`)
-            LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = rscd.`id_product`)
-            WHERE 1';
-
-        if (!is_null($autoAddToCart)) {
-            $sql .= ' AND p.`auto_add_to_cart` = '. (int)$autoAddToCart;
-            if ($autoAddToCart == 1 && !is_null($priceAdditionType)) {
-                $sql .= ' AND p.`price_addition_type` = '.$priceAdditionType;
-            }
-        }
-        if ($idCart) {
-            $sql .= ' AND cbd.`id_cart`='.(int) $idCart;
-        }
-        if ($idProduct) {
-            $sql .= ' AND rscd.`id_product`='.(int) $idProduct;
-        }
-        if ($idHotel) {
-            $sql .= ' AND cbd.`id_hotel`='.(int) $idHotel;
-        }
-        if ($roomTypeIdProduct) {
-            $sql .= ' AND cbd.`id_product`='.(int) $roomTypeIdProduct;
-        }
-        if ($dateFrom && $dateTo) {
-            $sql .= ' AND cbd.`date_from` = \''.pSQL($dateFrom).'\' AND cbd.`date_to` = \''.pSQL($dateTo).'\'';
-        }
-        if ($htlCartBookingId) {
-            $sql .= ' AND cbd.`id`='.(int) $htlCartBookingId;
-        }
-        $sql .= ' ORDER BY cbd.`id`';
-        $totalPrice = 0;
-
-        $objRoomTypeServiceProductPrice = new RoomTypeServiceProductPrice();
-        if ($serviceProducts = Db::getInstance()->executeS($sql)) {
-            foreach ($serviceProducts as $product) {
-                $qty = $product['quantity'] ? (int)$product['quantity'] : 1;
-                $totalPrice += $objRoomTypeServiceProductPrice->getServicePrice(
-                    (int)$product['id_product'],
-                    (int)$product['room_type_id_product'],
-                    $qty,
-                    $product['date_from'],
-                    $product['date_to'],
-                    $useTax,
-                    false,
-                    $id_address
-                );
-            }
-        }
-        return $totalPrice;
+        return $this->getServiceProductsInCart(
+            $idCart,
+            $idProduct,
+            $idHotel,
+            $roomTypeIdProduct,
+            $dateFrom,
+            $dateTo,
+            $htlCartBookingId,
+            1,
+            $useTax,
+            $autoAddToCart,
+            $id_address,
+            $priceAdditionType
+        );
     }
 
+    /**
+     * @deprecated since 1.6.1 use getServiceProductsInCart() instead
+    */
     public function getRoomServiceProducts(
         $htlCartBookingId,
         $idLang = 0,
@@ -208,129 +175,28 @@ public function getRoomServiceProducts(
         $id_address = null,
         $priceAdditionType = null
     ) {
-        if ($useTax === null)
-            $useTax = Product::$_taxCalculationMethod == PS_TAX_EXC ? false : true;
-
-        if (!$idLang) {
-            $idLang = Context::getContext()->language->id;
-        }
-
-        $sql = 'SELECT rscd.`id_product`, rscd.`quantity`, cbd.`id_cart`, p.`auto_add_to_cart`, p.`allow_multiple_quantity`, cbd.`id` as `htl_cart_booking_id`,
-            p.`price_addition_type`, cbd.`id_product` as `room_type_id_product`, pl.`name`, cbd.`date_from`, cbd.`date_to`
-            FROM `'._DB_PREFIX_.'htl_cart_booking_data` cbd
-            INNER JOIN `'._DB_PREFIX_.'htl_room_type_service_product_cart_detail` rscd ON(rscd.`htl_cart_booking_id` = cbd.`id`)
-            LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = rscd.`id_product`)
-            LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (p.`id_product` = pl.`id_product` AND pl.`id_lang` = '.(int)$idLang.')
-            WHERE 1';
-
-        if (!is_null($autoAddToCart)) {
-            $sql .= ' AND p.`auto_add_to_cart` = '. (int)$autoAddToCart;
-            if ($autoAddToCart == 1 && !is_null($priceAdditionType)) {
-                $sql .= ' AND p.`price_addition_type` = '.$priceAdditionType;
-            }
-        }
-        if ($htlCartBookingId) {
-            $sql .= ' AND cbd.`id`='.(int) $htlCartBookingId;
-        }
-        $sql .= ' ORDER BY cbd.`id`';
-
-        $objRoomTypeServiceProductPrice = new RoomTypeServiceProductPrice();
-        $selectedServiceProducts = array();
-
-        if ($serviceProducts = Db::getInstance()->executeS($sql)) {
-            foreach ($serviceProducts as $product) {
-                $qty = $product['quantity'] ? (int)$product['quantity'] : 1;
-                if (isset($selectedServiceProducts[$product['id_product']])) {
-                    $selectedServiceProducts[$product['id_product']]['quantity'] += $product['quantity'];
-                    $selectedServiceProducts[$product['id_product']]['total_price'] += $objRoomTypeServiceProductPrice->getServicePrice(
-                        (int)$product['id_product'],
-                        (int)$product['room_type_id_product'],
-                        $qty,
-                        $product['date_from'],
-                        $product['date_to'],
-                        $useTax,
-                        false,
-                        $id_address
-                    );
-                    $selectedServiceProducts[$product['id_product']]['total_price_tax_excl'] += $objRoomTypeServiceProductPrice->getServicePrice(
-                        (int)$product['id_product'],
-                        (int)$product['room_type_id_product'],
-                        $qty,
-                        $product['date_from'],
-                        $product['date_to'],
-                        false,
-                        false,
-                        $id_address
-                    );
-                    $selectedServiceProducts[$product['id_product']]['total_price_tax_incl'] += $objRoomTypeServiceProductPrice->getServicePrice(
-                        (int)$product['id_product'],
-                        (int)$product['room_type_id_product'],
-                        $qty,
-                        $product['date_from'],
-                        $product['date_to'],
-                        true,
-                        false,
-                        $id_address
-                    );
-                } else {
-                    $selectedServiceProducts[$product['id_product']] = $product;
+        if (Validate::isLoadedObject($objHotelCartBookingData = new HotelCartBookingData($htlCartBookingId))) {
+            $selectedServiceProducts = $this->getServiceProductsInCart(
+                $objHotelCartBookingData->id_cart,
+                0,
+                0,
+                0,
+                0,
+                0,
+                $htlCartBookingId,
+                0,
+                $useTax,
+                $autoAddToCart,
+                $id_address,
+                $priceAdditionType
+            );
 
-                    $selectedServiceProducts[$product['id_product']]['unit_price_tax_excl'] = $objRoomTypeServiceProductPrice->getServicePrice(
-                        (int)$product['id_product'],
-                        (int)$product['room_type_id_product'],
-                        1,
-                        null,
-                        null,
-                        false,
-                        false,
-                        $id_address
-                    );
-                    $selectedServiceProducts[$product['id_product']]['unit_price_tax_incl'] = $objRoomTypeServiceProductPrice->getServicePrice(
-                        (int)$product['id_product'],
-                        (int)$product['room_type_id_product'],
-                        1,
-                        null,
-                        null,
-                        true,
-                        false,
-                        $id_address
-                    );
-                    $selectedServiceProducts[$product['id_product']]['total_price'] = $objRoomTypeServiceProductPrice->getServicePrice(
-                        (int)$product['id_product'],
-                        (int)$product['room_type_id_product'],
-                        $qty,
-                        $product['date_from'],
-                        $product['date_to'],
-                        $useTax,
-                        false,
-                        $id_address
-                    );
-                    $selectedServiceProducts[$product['id_product']]['total_price_tax_excl'] = $objRoomTypeServiceProductPrice->getServicePrice(
-                        (int)$product['id_product'],
-                        (int)$product['room_type_id_product'],
-                        $qty,
-                        $product['date_from'],
-                        $product['date_to'],
-                        false,
-                        false,
-                        $id_address
-                    );
-                    $selectedServiceProducts[$product['id_product']]['total_price_tax_incl'] = $objRoomTypeServiceProductPrice->getServicePrice(
-                        (int)$product['id_product'],
-                        (int)$product['room_type_id_product'],
-                        $qty,
-                        $product['date_from'],
-                        $product['date_to'],
-                        true,
-                        false,
-                        $id_address
-                    );
-                }
+            if (isset($selectedServiceProducts[$htlCartBookingId]['selected_products_info'])) {
+                return $selectedServiceProducts;
             }
-
         }
 
-        return $selectedServiceProducts;
+        return array();
     }
 
     public function getServiceProductsInCart(
@@ -404,12 +270,12 @@ public function getServiceProductsInCart(
 
         if ($serviceProducts = Db::getInstance()->executeS($sql)) {
             foreach ($serviceProducts as $product) {
+                $qty = $product['quantity'] ? (int)$product['quantity'] : 1;
                 if ($getTotalPrice) {
-                    $qty = $product['quantity'] ? (int)$product['quantity'] : 1;
-                    $totalPrice += $objRoomTypeServiceProductPrice->getServicePrice(
+                    $servicePrice = $objRoomTypeServiceProductPrice->getServicePrice(
                         (int)$product['id_product'],
                         (int)$product['room_type_id_product'],
-                        $qty,
+                        1,
                         $product['date_from'],
                         $product['date_to'],
                         $useTax,
@@ -417,8 +283,8 @@ public function getServiceProductsInCart(
                         $id_address
                     );
 
+                    $totalPrice += Tools::processPriceRounding($servicePrice, $qty);
                 } else {
-                    $qty = $product['quantity'] ? (int)$product['quantity'] : 1;
                     if (isset($selectedServiceProducts[$product['htl_cart_booking_id']])) {
                         if ($idProduct) {
                             $selectedServiceProducts[$product['htl_cart_booking_id']]['quantity'] += $product['quantity'];
@@ -452,36 +318,43 @@ public function getServiceProductsInCart(
                                 ),
                             );
                         }
-                        $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price'] += $objRoomTypeServiceProductPrice->getServicePrice(
+
+                        $servicePrice = $objRoomTypeServiceProductPrice->getServicePrice(
                             (int)$product['id_product'],
                             (int)$product['room_type_id_product'],
-                            $qty,
+                            1,
                             $product['date_from'],
                             $product['date_to'],
                             $useTax,
                             false,
                             $id_address
                         );
-                        $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_excl'] += $objRoomTypeServiceProductPrice->getServicePrice(
+
+                        $servicePriceTE = $objRoomTypeServiceProductPrice->getServicePrice(
                             (int)$product['id_product'],
                             (int)$product['room_type_id_product'],
-                            $qty,
+                            1,
                             $product['date_from'],
                             $product['date_to'],
                             false,
                             false,
                             $id_address
                         );
-                        $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_incl'] += $objRoomTypeServiceProductPrice->getServicePrice(
+
+                        $servicePriceTI = $objRoomTypeServiceProductPrice->getServicePrice(
                             (int)$product['id_product'],
                             (int)$product['room_type_id_product'],
-                            $qty,
+                            1,
                             $product['date_from'],
                             $product['date_to'],
                             true,
                             false,
                             $id_address
                         );
+
+                        $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price'] += Tools::processPriceRounding($servicePrice, $qty);
+                        $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_excl'] += Tools::processPriceRounding($servicePriceTE, $qty);
+                        $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_incl'] += Tools::processPriceRounding($servicePriceTI, $qty);
                     } else {
                         $selectedServiceProducts[$product['htl_cart_booking_id']]['htl_cart_booking_id'] = $product['htl_cart_booking_id'];
                         $selectedServiceProducts[$product['htl_cart_booking_id']]['id_cart'] = $product['id_cart'];
@@ -553,40 +426,45 @@ public function getServiceProductsInCart(
                             );
                         }
 
-                        $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price'] = $objRoomTypeServiceProductPrice->getServicePrice(
+                        $servicePrice = $objRoomTypeServiceProductPrice->getServicePrice(
                             (int)$product['id_product'],
                             (int)$product['room_type_id_product'],
-                            $qty,
+                            1,
                             $product['date_from'],
                             $product['date_to'],
                             $useTax,
                             false,
                             $id_address
                         );
-                        $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_excl'] = $objRoomTypeServiceProductPrice->getServicePrice(
+
+                        $servicePriceTE = $objRoomTypeServiceProductPrice->getServicePrice(
                             (int)$product['id_product'],
                             (int)$product['room_type_id_product'],
-                            $qty,
+                            1,
                             $product['date_from'],
                             $product['date_to'],
                             false,
                             false,
                             $id_address
                         );
-                        $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_incl'] = $objRoomTypeServiceProductPrice->getServicePrice(
+
+                        $servicePriceTI = $objRoomTypeServiceProductPrice->getServicePrice(
                             (int)$product['id_product'],
                             (int)$product['room_type_id_product'],
-                            $qty,
+                            1,
                             $product['date_from'],
                             $product['date_to'],
                             true,
                             false,
                             $id_address
                         );
+
+                        $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price'] = Tools::processPriceRounding($servicePrice, $qty);
+                        $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_excl'] = Tools::processPriceRounding($servicePriceTE, $qty);
+                        $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_incl'] = Tools::processPriceRounding($servicePriceTI, $qty);
                     }
                 }
             }
-
         }
 
         if ($getTotalPrice) {
@@ -641,4 +519,4 @@ public static function validateServiceProductsInCart()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/hotelreservationsystem/classes/RoomTypeServiceProductPrice.php b/modules/hotelreservationsystem/classes/RoomTypeServiceProductPrice.php
index 8d7b37bdd..8763f8ee3 100644
--- a/modules/hotelreservationsystem/classes/RoomTypeServiceProductPrice.php
+++ b/modules/hotelreservationsystem/classes/RoomTypeServiceProductPrice.php
@@ -101,7 +101,7 @@ public function getProductRoomTypeLinkPriceInfo($idProduct, $idElement, $element
         );
     }
 
-    public function getServicePrice($idProduct, $idProductRoomType, $quantity, $dateFrom = null, $dateTo = null, $useTax = null, $id_cart = false, $id_address = null, $use_reduc= 1)
+    public function getServicePrice($idProduct, $idProductRoomType, $quantity = 1, $dateFrom = null, $dateTo = null, $useTax = null, $id_cart = false, $id_address = null, $use_reduc= 1)
     {
         if ($useTax === null)
             $useTax = Product::$_taxCalculationMethod == PS_TAX_EXC ? false : true;
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
index b1fea57e4..3203d74e2 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
@@ -149,11 +149,6 @@ public function postProcess()
                 $occupancy = array();
             }
 
-            // $booking_product = 1;
-            // if (Tools::getisset('booking_product')) {
-            //     $booking_product = Tools::getValue('booking_product');
-            // }
-
             $this->id_cart = (int) $this->context->cart->id;
             $this->id_guest = (int) $this->context->cookie->id_guest;
             $this->id_hotel = $id_hotel;
@@ -177,7 +172,6 @@ public function postProcess()
             Tools::redirectAdmin($this->context->link->getAdminLink('AdminHotelRoomsBooking').'&'.http_build_query($urlData));
         }
 
-        // Process reallocation of rooms
         // Process reallocation of rooms
         if (Tools::isSubmit('realloc_allocated_rooms')) {
             if ($this->tabAccess['edit'] === '1') {
@@ -204,7 +198,7 @@ public function postProcess()
                             $this->errors[] = $this->l('Selected room is not available for reallocation.');
                         } elseif (!in_array($idRoomToReallocate, array_column($availableRooms, 'id_room'))) {
                             $this->errors[] = $this->l('Selected room is not available for reallocation.');
-                        } elseif (!Validate::isFloat($priceDiff)) {
+                        } elseif (!Validate::isPrice($priceDiff)) {
                             $this->errors[] = $this->l('Invalid price difference of the room types.');
                         }
                     } else {
@@ -379,7 +373,8 @@ public function assignRoomBookingForm()
             'occupancy_required_for_booking' => $occupancyRequiredForBooking,
             'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'),
             'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'),
-            'link' => $this->context->link
+            'link' => $this->context->link,
+            'ALLOTMENT_MANUAL' => HotelBookingDetail::ALLOTMENT_MANUAL,
         ));
 
         if (Configuration::get('PS_BACKOFFICE_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS) {
diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl
index 308be4ba8..1fbada998 100644
--- a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl
+++ b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl
@@ -224,7 +224,7 @@
                                                     </td>
                                                     <td>
                                                         {if $rm_dtl_v['booking_type'] == HotelBookingDetail::ALLOTMENT_AUTO}
-                                                            <button type="button" class="btn btn-primary room_reallocate_swap" id="reallocate_room_{$rm_dtl_v['id_htl_booking']}" data-room_type_name="{$rm_dtl_v['room_type_name']}" data-id_htl_booking="{$rm_dtl_v['id_htl_booking']}" data-id_order="{$rm_dtl_v['id_order']}" data-room_num='{$booked_v['room_num']}' data-currency_sign='{$rm_dtl_v['currency_sign']}' data-id_room_type='{$booked_v['id_product']}' data-cust_name='{$rm_dtl_v['alloted_cust_name']}' data-cust_email='{$rm_dtl_v['alloted_cust_email']}' data-avail_rm_swap='{$rm_dtl_v['avail_rooms_to_swap']|@json_encode}' data-avail_realloc_room_types='{$rm_dtl_v['avail_room_types_to_realloc']|@json_encode}' data-allotment_type_label='{if $rm_dtl_v['booking_type'] == $ALLOTMENT_MANUAL}{l s='Manual'}{else}{l s='Auto'}{/if}' data-comment='{$rm_dtl_v.comment}'>
+                                                            <button type="button" class="btn btn-primary room_reallocate_swap" id="reallocate_room_{$rm_dtl_v.id_htl_booking}" data-room_type_name="{$rm_dtl_v.room_type_name}" data-id_htl_booking="{$rm_dtl_v.id_htl_booking}" data-id_order="{$rm_dtl_v.id_order}" data-room_num="{$booked_v.room_num}" data-currency_sign="{$rm_dtl_v.currency_sign}" data-id_room_type="{$booked_v.id_product}" data-cust_name="{$rm_dtl_v.alloted_cust_name}" data-cust_email="{$rm_dtl_v.alloted_cust_email}" data-avail_rm_swap='{$rm_dtl_v.avail_rooms_to_swap|@json_encode}' data-avail_realloc_room_types='{$rm_dtl_v.avail_room_types_to_realloc|@json_encode}' data-allotment_type_label="{if $rm_dtl_v.booking_type == $ALLOTMENT_MANUAL}{l s='Manual'}{else}{l s='Auto'}{/if}" data-comment="{$rm_dtl_v.comment}">
                                                                 {l s='Reallocate Room' mod='hotelreservationsystem'}
                                                             </button>
                                                         {else}
diff --git a/pdf/order-slip.product-tab.tpl b/pdf/order-slip.product-tab.tpl
index 22ba8f900..31ccaa55b 100644
--- a/pdf/order-slip.product-tab.tpl
+++ b/pdf/order-slip.product-tab.tpl
@@ -27,11 +27,11 @@
 
 	<thead>
 		<tr>
-			<th class="product header small" width="30%">{l s='Room Type / Reference' pdf='true'}</th>
-			<th class="product header small" width="30%">{l s='Duration' pdf='true'}</th>
+			<th class="product header small" width="35%">{l s='Room Type / Reference' pdf='true'}</th>
+			<th class="product header small" width="35%">{l s='Duration' pdf='true'}</th>
 			<th class="product header small" width="10%">{l s='Num rooms' pdf='true'}</th>
-			<th class="product header-right small" width="15%">{l s='Unit price' pdf='true'}<br />{if $tax_excluded_display}{l s='(Tax Excl.)' pdf='true'}{else}{l s='(Tax Incl.)' pdf='true'}{/if}</th>
-			<th class="product header-right small" width="15%">{l s='Price' pdf='true'}<br />{if $tax_excluded_display}{l s='(Tax Excl.)' pdf='true'}{else}{l s='(Tax Incl.)' pdf='true'}{/if}</th>
+			{* <th class="product header-right small" width="15%">{l s='Unit price' pdf='true'}<br />{if $tax_excluded_display}{l s='(Tax Excl.)' pdf='true'}{else}{l s='(Tax Incl.)' pdf='true'}{/if}</th> *}
+			<th class="product header-right small" width="20%">{l s='Total Price' pdf='true'}<br />{if $tax_excluded_display}{l s='(Tax Excl.)' pdf='true'}{else}{l s='(Tax Incl.)' pdf='true'}{/if}</th>
 		</tr>
 	</thead>
 
@@ -55,13 +55,13 @@
 					<td class="product center">
 						{$order_detail.num_rooms}
 					</td>
-					<td class="product right">
+					{* <td class="product right">
 						{if $tax_excluded_display}
 							- {displayPrice currency=$order->id_currency price=$order_detail.unit_price_tax_excl}
 						{else}
 							- {displayPrice currency=$order->id_currency price=$order_detail.unit_price_tax_incl}
 						{/if}
-					</td>
+					</td> *}
 					<td class="product right">
 						{if $tax_excluded_display}
 							- {displayPrice currency=$order->id_currency price=$order_detail.total_price_tax_excl}