diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
index 16e0859ede..8fe050c7a7 100644
--- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -160,7 +160,7 @@
 					{if $refund_allowed && !$hasCompletelyRefunded}
 						<a id="desc-order-standard_refund" class="btn btn-default" href="#refundForm">
 							<i class="icon-exchange"></i>
-							{if $order->hasBeenPaid()}
+							{if $order->getTotalPaid()|floatval}
 								{l s='Initiate refund'}
 							{else}
 								{l s='Cancel bookings'}
@@ -520,12 +520,7 @@
 									<td>{$payment_types[$payment['payment_type']]['name']|escape:'html':'UTF-8'}</td>
 									<td>{$payment['transaction_id']|escape:'html':'UTF-8'}</td>
 									<td>{displayPrice price=$payment['real_paid_amount'] currency=$payment['id_currency']}</td>
-									<td>
-									{if $payment['invoice_number']}
-										{$payment['invoice_number']}
-									{else}
-									{/if}
-									</td>
+									<td>{if isset($payment['invoice_number'])}{$payment['invoice_number']}{else}--{/if}</td>
 									<td class="actions">
 										<button class="btn btn-default open_payment_information">
 											<i class="icon-search"></i>
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 6fb4d60c6f..9cc4f2b652 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -2558,15 +2558,52 @@ public function ajaxProcessAddProductOnOrder()
         )));
     }
 
+    /**
+     * This function is called when order is changed (Add/Edit/Delete room on order)
+     */
     public function sendChangedNotification(Order $order = null)
     {
         if (is_null($order)) {
             $order = new Order(Tools::getValue('id_order'));
         }
 
+        $this->updateOrderStatusOnOrderChange($order);
+
+        // load updated object
+        $order = new Order(Tools::getValue('id_order'));
+
         Hook::exec('actionOrderEdited', array('order' => $order));
     }
 
+    /**
+     * This function is called to manage order status when order is changed
+     */
+    public function updateOrderStatusOnOrderChange($objOrder)
+    {
+        // check if new order amount is greater that old order amount and order payment is accepted
+        // then update order status to partial payment accepted
+        $currentOrderState = $objOrder->getCurrentOrderState();
+        $psOsPartialPaymentAccepted = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
+        if ($currentOrderState->paid == 1 && $currentOrderState->id != $psOsPartialPaymentAccepted) {
+            // calculate due amount
+            $dueAmount = $objOrder->total_paid_tax_incl - $objOrder->total_paid_real;
+            if ($dueAmount > 0) {
+                // now change order status to partial payment
+                $objOrderHistory = new OrderHistory();
+                $objOrderHistory->id_order = $objOrder->id;
+                $objOrderHistory->id_employee = (int) $this->context->employee->id;
+
+                $useExistingPayment = false;
+                if (!$objOrder->hasInvoice()) {
+                    $useExistingPayment = true;
+                }
+
+                $objOrderHistory->changeIdOrderState($psOsPartialPaymentAccepted, $objOrder, $useExistingPayment);
+                $objOrderHistory->add();
+            }
+        }
+    }
+
     public function ajaxProcessLoadProductInformation()
     {
         // $order_detail = new OrderDetail(Tools::getValue('id_order_detail'));
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
index 88ce7db9cb..9bad576c73 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
@@ -238,7 +238,7 @@ public function renderView()
 
             $this->context->smarty->assign(
                 array (
-                    'hasOrderPaid' => $objOrder->hasBeenPaid(),
+                    'orderTotalPaid' => $objOrder->getTotalPaid(),
                     'customer_name' => $objCustomer->firstname.' '.$objCustomer->lastname,
                     'customer_email' => $objCustomer->email,
                     'orderReturnInfo' => (array)$objOrderReturn,
@@ -274,13 +274,13 @@ public function postProcess()
             $idsReturnDetail = Tools::getValue('id_order_return_detail');
             if (Validate::isLoadedObject($objOrderReturn = new OrderReturn($idOrderReturn))) {
                 $objOrder = new Order($objOrderReturn->id_order);
-                $hasOrderPaid = $objOrder->hasBeenPaid();
+                $orderTotalPaid = $objOrder->getTotalPaid();
                 $idRefundState = Tools::getValue('id_refund_state');
                 if (Validate::isLoadedObject($objRefundState = new OrderReturnState($idRefundState))) {
                     if ($objRefundState->refunded) {
                         $refundedAmounts = Tools::getValue('refund_amounts');
 
-                        if ($hasOrderPaid) {
+                        if ((float) $orderTotalPaid) {
                             if ($idsReturnDetail && count($idsReturnDetail)) {
                                 if ($refundedAmounts) {
                                     foreach ($idsReturnDetail as $idRetDetail) {
@@ -393,7 +393,7 @@ public function postProcess()
                             $objOrderReturn->id_transaction = $idTransaction;
                         } elseif (Tools::isSubmit('generateDiscount')) {
                             $objOrderReturn->payment_mode = 'Voucher';
-                        } elseif (!$hasOrderPaid) {
+                        } elseif (!((float) $orderTotalPaid)) {
                             $objOrderReturn->payment_mode = 'Unpaid by customer';
                             $objOrderReturn->id_transaction = '-';
                         }
@@ -405,18 +405,25 @@ public function postProcess()
                     // change state of the order refund
                     $objOrderReturn->changeIdOrderReturnState($idRefundState);
 
-                    if ($objRefundState->refunded || $objRefundState->denied) {
+                    if ($objRefundState->refunded) {
                         // check if order is paid the set status of the order to refunded
                         $objOrderHistory = new OrderHistory();
                         $objOrderHistory->id_order = (int)$objOrder->id;
 
-                        if ($hasOrderPaid
-                            && $objOrder->hasCompletelyRefunded(OrderReturnState::ORDER_RETURN_STATE_FLAG_REFUNDED)
-                        ) {
-                            $objOrderHistory->changeIdOrderState(Configuration::get('PS_OS_REFUND'), $objOrder);
-                            $objOrderHistory->addWithemail();
-                        } elseif ($objOrder->hasCompletelyRefunded(OrderReturnState::ORDER_RETURN_STATE_FLAG_DENIED)) {
-                            $objOrderHistory->changeIdOrderState(Configuration::get('PS_OS_CANCELED'), $objOrder);
+                        if ($objOrder->hasCompletelyRefunded(OrderReturnState::ORDER_RETURN_STATE_FLAG_REFUNDED)) {
+                            $idOrderState = null;
+                            if ((float) $orderTotalPaid) {
+                                $idOrderState = Configuration::get('PS_OS_REFUND');
+                            } else {
+                                $idOrderState = Configuration::get('PS_OS_CANCELED');
+                            }
+
+                            $useExistingPayment = false;
+                            if (!$objOrder->hasInvoice()) {
+                                $useExistingPayment = true;
+                            }
+
+                            $objOrderHistory->changeIdOrderState($idOrderState, $objOrder, $useExistingPayment);
                             $objOrderHistory->addWithemail();
                         }
                     }
diff --git a/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
index 2442ace4e5..e89b31f63c 100644
--- a/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
+++ b/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
@@ -65,6 +65,14 @@
 								{displayPrice price=$orderInfo['total_paid_tax_incl'] currency=$orderInfo['id_currency']}
 							</div>
 						</div>
+						<div class="form-group row">
+							<div class="col-sm-3">
+								<strong>{l s='Total paid amount' mod='hotelreservationsystem'} :</strong>
+							</div>
+							<div class="col-sm-9">
+								{displayPrice price=$orderTotalPaid currency=$orderInfo['id_currency']}
+							</div>
+						</div>
 						<div class="form-group row">
 							<div class="col-sm-3">
 								<strong>{l s='Way of payment' mod='hotelreservationsystem'} :</strong>
@@ -115,7 +123,7 @@
 											{if !$isRefundCompleted}
 												<th>{l s='Rooms cancelation charges' mod='hotelreservationsystem'}</th>
 											{/if}
-											{if $hasOrderPaid}
+											{if $orderTotalPaid|floatval}
 												<th>{l s='Refund amount' mod='hotelreservationsystem'}</th>
 											{/if}
 										</tr>
@@ -133,7 +141,7 @@
 												{if !$isRefundCompleted}
 													<td>{displayPrice price=$booking['cancelation_charge'] currency=$orderCurrency['id']}</td>
 												{/if}
-												{if $hasOrderPaid}
+												{if $orderTotalPaid|floatval}
 													<td>
 														<div class="input-group">
 															{if $isRefundCompleted}
@@ -228,7 +236,7 @@
 							</div>
 
 							{* Fields to submit refund information *}
-							{if $hasOrderPaid}
+							{if $orderTotalPaid|floatval}
 								<div class="refunded_state_fields" style="display:none;">
 									<div class="form-group">
 										<div class="col-sm-3">
@@ -291,19 +299,17 @@
 											</div>
 										</div>
 									</div>
-									{if $orderReturnInfo['by_admin']}
-										<div class="form-group">
-											<div class="col-sm-3">
-											</div>
-											<div class="col-sm-3">
-												<div class="checkbox">
-													<label>
-														<input value="1" type="checkbox" name="generateDiscount" id="generateDiscount"/> &nbsp;{l s='Create Voucher' mod='hotelreservationsystem'}
-													</label>
-												</div>
+									<div class="form-group">
+										<div class="col-sm-3">
+										</div>
+										<div class="col-sm-3">
+											<div class="checkbox">
+												<label>
+													<input value="1" type="checkbox" name="generateDiscount" id="generateDiscount"/> &nbsp;{l s='Create Voucher' mod='hotelreservationsystem'}
+												</label>
 											</div>
 										</div>
-									{/if}
+									</div>
 								</div>
 							{/if}
 						{/if}