diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 4913731efb5..1ef37552f1f 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2633,7 +2633,7 @@ if ($action == 'create' && $usercancreate)
 			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
 
 			// Show online payment link
-			$useonlinepayment = ((!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled)) && !empty($conf->facture->enabled));
+			$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 			if (!empty($conf->global->ORDER_HIDE_ONLINE_PAYMENT_ON_ORDER)) $useonlinepayment = 0;
 			if ($object->statut != Commande::STATUS_DRAFT && $useonlinepayment)
 			{
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 5f8f90ba72b..d6d4da28c9e 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -742,80 +742,85 @@ if ($ispaymentok)
 			$currencyCodeType = $_SESSION['currencyCodeType'];
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
-			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
-				include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
-				$invoice = new Facture($db);
-				$result = $invoice->createFromOrder($object, $user);
-				if ($result > 0) {
-					$object->classifyBilled($user);
-					$invoice->validate($user);
-					// Creation of payment line
-					include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
-					$paiement = new Paiement($db);
-					$paiement->datepaye = $now;
-					if ($currencyCodeType == $conf->currency) {
-						$paiement->amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
-					} else {
-						$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching
-
-						$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
-						$ispostactionok = -1;
-						$error++; // Not yet supported
-					}
-					$paiement->paiementid = $paymentTypeId;
-					$paiement->num_payment = '';
-					$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
-					$paiement->ext_payment_id = $TRANSACTIONID;
-					$paiement->ext_payment_site = $service;
-
-					if (!$error) {
-						$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
-						if ($paiement_id < 0) {
-							$postactionmessages[] = $paiement->error . ' ' . join("<br>\n", $paiement->errors);
-							$ispostactionok = -1;
-							$error++;
+			if (!empty($conf->banque->enabled)) {
+				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0 ) {
+					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+					$invoice = new Facture($db);
+					$result = $invoice->createFromOrder($object, $user);
+					if ($result > 0) {
+						$object->classifyBilled($user);
+						$invoice->validate($user);
+						// Creation of payment line
+						include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+						$paiement = new Paiement($db);
+						$paiement->datepaye = $now;
+						if ($currencyCodeType == $conf->currency) {
+							$paiement->amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
 						} else {
-							$postactionmessages[] = 'Payment created';
-							$ispostactionok = 1;
+							$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching
+
+							$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+							$ispostactionok = -1;
+							$error++; // Not yet supported
 						}
-					}
+						$paiement->paiementid = $paymentTypeId;
+						$paiement->num_payment = '';
+						$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
+						$paiement->ext_payment_id = $TRANSACTIONID;
+						$paiement->ext_payment_site = '';
 
-					if (!$error && !empty($conf->banque->enabled)) {
-						$bankaccountid = 0;
-						if ($paymentmethod == 'paybox') $bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
-						elseif ($paymentmethod == 'paypal') $bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
-						elseif ($paymentmethod == 'stripe') $bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
-
-						if ($bankaccountid > 0) {
-							$label = '(CustomerInvoicePayment)';
-							if ($object->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
-							$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
-							if ($result < 0) {
+						if (!$error) {
+							$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
+							if ($paiement_id < 0) {
 								$postactionmessages[] = $paiement->error . ' ' . join("<br>\n", $paiement->errors);
 								$ispostactionok = -1;
 								$error++;
 							} else {
-								$postactionmessages[] = 'Bank transaction of payment created';
+								$postactionmessages[] = 'Payment created';
 								$ispostactionok = 1;
 							}
-						} else {
-							$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
-							$ispostactionok = -1;
-							$error++;
 						}
-					}
 
-					if (!$error) {
-						$db->commit();
+						if (!$error && !empty($conf->banque->enabled)) {
+							$bankaccountid = 0;
+							if ($paymentmethod == 'paybox') $bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+							elseif ($paymentmethod == 'paypal') $bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+							elseif ($paymentmethod == 'stripe') $bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+
+							if ($bankaccountid > 0) {
+								$label = '(CustomerInvoicePayment)';
+								if ($object->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+								$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
+								if ($result < 0) {
+									$postactionmessages[] = $paiement->error . ' ' . join("<br>\n", $paiement->errors);
+									$ispostactionok = -1;
+									$error++;
+								} else {
+									$postactionmessages[] = 'Bank transaction of payment created';
+									$ispostactionok = 1;
+								}
+							} else {
+								$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+								$ispostactionok = -1;
+								$error++;
+							}
+						}
+
+						if (!$error) {
+							$db->commit();
+						} else {
+							$db->rollback();
+						}
 					} else {
-						$db->rollback();
+						$postactionmessages[] = 'Failed to create invoice form order ' . $tmptag['ORD'] . '.';
+						$ispostactionok = -1;
 					}
 				} else {
-					$postactionmessages[] = 'Failed to create invoice form order ' . $tmptag['ORD'] . '.';
+					$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type" (' . $paymentType . ') to record the payment of order ' . $tmptag['ORD'] . '. May be payment was already recorded.';
 					$ispostactionok = -1;
 				}
 			} else {
-				$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type" (' . $paymentType . ') to record the payment of order ' . $tmptag['ORD'] . '. May be payment was already recorded.';
+				$postactionmessages[] = 'Invoice module is not enable';
 				$ispostactionok = -1;
 			}
 		} else {