diff --git a/ChangeLog b/ChangeLog
index 191cc035520..63a3740a7c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@ For users:
 - New: Allow to search thirds and products from barcodes directly from the permanent mini search left box.
 - New: Allow to search product from barcodes directly from invoices, proposals... through AJAX.
 - New: Can make one invoice for several orders.
+- New: POS module can works with only one payment method (cach, chq, credit card). 
 New experimental modules:
 - New: Add margin and commissions management module.
 
diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css
index 36ea938fd70..19af67cd8eb 100644
--- a/htdocs/cashdesk/css/style.css
+++ b/htdocs/cashdesk/css/style.css
@@ -348,7 +348,7 @@ p.titre {
 	height: 40px;
 }
 
-.bouton_mode_reglement {
+.bouton_mode_reglement, .bouton_mode_reglement_disabled {
 	width: 150px;
 	height: 40px;
 }
diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
index 0b42d4a78fd..81576a92630 100644
--- a/htdocs/cashdesk/index_verif.php
+++ b/htdocs/cashdesk/index_verif.php
@@ -56,7 +56,7 @@ if (! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_BILL &&
 	exit;
 }
 
-if (! empty($_POST['txtUsername']) && ! empty($conf->banque->enabled) && (empty($conf_fkaccount_cash) || empty($conf_fkaccount_cheque) || empty($conf_fkaccount_cb)))
+if (! empty($_POST['txtUsername']) && ! empty($conf->banque->enabled) && (empty($conf_fkaccount_cash) && empty($conf_fkaccount_cheque) && empty($conf_fkaccount_cb)))
 {
 	$langs->load("errors");
 	$retour=$langs->trans("ErrorModuleSetupNotComplete");
@@ -65,7 +65,6 @@ if (! empty($_POST['txtUsername']) && ! empty($conf->banque->enabled) && (empty(
 }
 
 
-
 // Check password
 $auth = new Auth($db);
 $retour = $auth->verif($username, $password);
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index ec465c4bd6b..51242c37015 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -182,9 +182,32 @@ $langs->load("cashdesk");
 <fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("PaymentMode"); ?></legend>
 		<table>
 			<tr>
-			<td><input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Cash"); ?>" onclick="javascript: verifClic('ESP');" /></td>
-			<td><input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("CreditCard"); ?>" onclick="javascript: verifClic('CB');" /></td>
-			<td><input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Cheque"); ?>" onclick="javascript: verifClic('CHQ');" /></td>
+			<?php
+			print '<td>';
+			if (empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH) || $conf->global->CASHDESK_ID_BANKACCOUNT_CASH < 0)
+			{
+				$langs->load("errors");
+				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cash").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
+			}
+			else print '<input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
+			print '</td>';
+			print '<td>';
+			if (empty($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE) || $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE < 0)
+			{
+				$langs->load("errors");
+				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
+			}
+			else print '<input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
+			print '</td>';
+			print '<td>';
+			if (empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB) || $conf->global->CASHDESK_ID_BANKACCOUNT_CB < 0)
+			{
+				$langs->load("errors");
+				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cheque").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
+			}
+			else print '<input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cheque").'" onclick="javascript: verifClic(\'CHQ\');" />';
+			print '</td>';
+			?>
 			</tr>
 		</table>
 		<table>