diff --git a/admin/themes/default/template/controllers/orders/form.tpl b/admin/themes/default/template/controllers/orders/form.tpl
index ae6a612e5..58fb8718c 100644
--- a/admin/themes/default/template/controllers/orders/form.tpl
+++ b/admin/themes/default/template/controllers/orders/form.tpl
@@ -2163,7 +2163,7 @@
 							<label for="is_full_payment_off">{l s="No"}</label>
 							<a class="slide-button btn"></a>
 						</span>
-						<p class="help-block">{l s='Keep this option enabled for full payment and disable it to take partial payment of the order.'}</p>
+						<p class="help-block">{l s='Keep this option enabled for full payment and disable it to take partial payment of the booking.'}</p>
 					</div>
 				</div>
 				<div class="form-group" {if $order_total <= 0}style="display: none;"{/if}>
@@ -2203,7 +2203,7 @@
 								<option value="{$payment_module->displayName}" data-name="{$payment_module->name}" data-payment-type="{$payment_module->payment_type}">
 							{/foreach}
 						</datalist>
-						<p class="help-block">{l s='Select or type the payment method using which booking will be created.'}</p>
+						<p class="help-block">{l s='Select or type the payment method using which payment for booking will be made.'}</p>
 					</div>
 				</div>
 				<div class="form-group" {if $order_total <= 0}style="display: none;"{/if}>
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 62dd3c54b..7afc35105 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -1007,7 +1007,7 @@ abstract class PaymentModuleCore extends Module
                     $new_history = new OrderHistory();
                     $new_history->id_order = (int)$order->id;
                     if ($order_status->logable && $order->is_advance_payment && $order->advance_paid_amount < $order->total_paid_tax_incl) {
-                        $new_history->changeIdOrderState((int)Configuration::get('PS_OS_PARTIAL_PAYMENT'), $order, true);
+                        $new_history->changeIdOrderState((int)Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED'), $order, true);
                     } else {
                         $new_history->changeIdOrderState((int)$id_order_state, $order, true);
                     }
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index be56ad4b7..a863d9058 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -963,10 +963,9 @@ class AdminOrdersControllerCore extends AdminController
             if ($this->tabAccess['edit'] === '1') {
                 $objCart = new Cart($id_cart);
                 if (Validate::isLoadedObject($objCart)) {
+                    $orderTotal = $objCart->getOrderTotal(true, Cart::BOTH);
                     if ($objCart->is_advance_payment) {
-                        $orderTotal = $objCart->getOrderTotal(true, Cart::ADVANCE_PAYMENT);
-                    } else {
-                        $orderTotal = $objCart->getOrderTotal(true, Cart::BOTH);
+                        $advancePaymentAmount = $objCart->getOrderTotal(true, Cart::ADVANCE_PAYMENT);
                     }
 
                     // Validate data if required
@@ -1014,51 +1013,50 @@ class AdminOrdersControllerCore extends AdminController
 
                         // Set payment module details
                         $objPaymentModule = new BoOrder();
+                        $objPaymentModule->displayName = $moduleName;
+
                         if ($orderTotal > 0) {
                             $objPaymentModule->payment_type = $paymentType;
-                            $objPaymentModule->displayName = $moduleName;
-                        } else {
-                            $objPaymentModule->name = 'free_order';
-                            $objPaymentModule->displayName = $this->l('Free order');
-                        }
 
-                        // Set order state
-                        if ($orderTotal > 0) {
+                            // Set order state
                             if ($isFullPayment) {
                                 $idOrderState = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
                             } else {
                                 if ($paymentAmount <= 0) {
                                     $idOrderState = Configuration::get('PS_OS_AWAITING_PAYMENT');
-                                } elseif (($paymentAmount > 0) && ($paymentAmount < $orderTotal)) {
-                                    $idOrderState = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
-                                } else {
+                                } elseif (($paymentAmount >= $orderTotal)) {
                                     $idOrderState = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
+                                } else {
+                                    $idOrderState = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
                                 }
                             }
-                        } else {
-                            $idOrderState = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
-                        }
 
-                        // Set amount paid
-                        if ($orderTotal > 0) {
-                            if ($isFullPayment) {
-                                $amountPaid = $orderTotal;
-                            } else {
-                                $amountPaid = $paymentAmount;
-                            }
+                            // Set amount paid
+                            $amountPaid = $isFullPayment ? $orderTotal : $paymentAmount;
+
+                            // Set transaction ID
+                            $extraVars = $paymentTransactionId ? array('transaction_id' => $paymentTransactionId) : array();
                         } else {
+                            // Set order state
+                            if ($objCart->is_advance_payment) {
+                                if ($advancePaymentAmount <= $orderTotal) {
+                                    $idOrderState = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
+                                } else {
+                                    $objPaymentModule->name = 'free_order';
+                                    $objPaymentModule->displayName = $this->l('Free order');
+                                    $idOrderState = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
+                                }
+                            } else {
+                                $objPaymentModule->name = 'free_order';
+                                $objPaymentModule->displayName = $this->l('Free order');
+                                $idOrderState = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
+                            }
+
+                            // Set amount paid
                             $amountPaid = 0;
-                        }
 
-                        // Set transaction ID
-                        if ($orderTotal > 0) {
-                            if ($paymentTransactionId) {
-                                $paymentTransactionId = array('transaction_id' => $paymentTransactionId);
-                            } else {
-                                $paymentTransactionId = array();
-                            }
-                        } else {
-                            $paymentTransactionId = null;
+                            // Set transaction ID
+                            $extraVars = null;
                         }
 
                         $bad_delivery = false;
@@ -1080,7 +1078,7 @@ class AdminOrdersControllerCore extends AdminController
                                 $amountPaid,
                                 $objPaymentModule->displayName,
                                 $this->l('Manual order -- Employee:').' '.substr($objEmployee->firstname, 0, 1).'. '.$objEmployee->lastname,
-                                $paymentTransactionId,
+                                $extraVars,
                                 null,
                                 false,
                                 $objCart->secure_key