diff --git a/ChangeLog b/ChangeLog
index 84fd15df2e5..01f21acd838 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ English Dolibarr changelog
 For users:
 - Sessions timeout can be configured to overwrite PHP setup.
 - Support bookmark add of product cards.
+- Enhancement in stock management.
 - New view in ecm module.
 - Look enhancements for graphics (add transparency).
 - Added statistics report for supplier invoices.
@@ -13,13 +14,16 @@ For users:
 - Add an export definition to export interventions.
 - Can set umask file permissions on Unix/Linux/BSD systems.
 - Miscelanous bug fixes.
+- A lot of enhancement to increase productivity.
 
 For translators:
 - The errors language file contains only error or warning messages with 
   prefix Error or Warning.
+- HTML Output is by default in UTF8.
 
 For developers:
 - Update skeletons.
+- Add an experimental Cash Desk module.
 
 
 ***** Changelog for 2.4 compared to 2.2 *****
diff --git a/htdocs/admin/cashdesk.php b/htdocs/admin/cashdesk.php
index 748e34e685b..4787bd14e48 100644
--- a/htdocs/admin/cashdesk.php
+++ b/htdocs/admin/cashdesk.php
@@ -39,7 +39,12 @@ $langs->load("cashdesk");
  */
 if ($_POST["action"] == 'set')
 {
-	dolibarr_set_const($db,"CASHDESK_ID_THIRDPARTY",$_POST["socid"]);
+	if ($_POST["CASHDESK_ID_THIRDPARTY"] < 0) $_POST["CASHDESK_ID_THIRDPARTY"]='';
+	if ($_POST["CASHDESK_ID_WAREHOUSE"] < 0)  $_POST["CASHDESK_ID_WAREHOUSE"]='';
+
+	dolibarr_set_const($db,"CASHDESK_ID_THIRDPARTY",$_POST["CASHDESK_ID_THIRDPARTY"]);
+	dolibarr_set_const($db,"CASHDESK_ID_WAREHOUSE",$_POST["CASHDESK_ID_WAREHOUSE"]);
+
 	dolibarr_syslog("admin/cashdesk: level ".$_POST["level"]);
 }
 
@@ -72,7 +77,7 @@ print "</tr>\n";
 $var=!$var;
 print '<tr '.$bc[$var].'><td width=\"50%\">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
 print '<td colspan="2">';
-print $form->select_societes($conf->global->CASHDESK_ID_THIRDPARTY,'socid','',1);
+print $form->select_societes($conf->global->CASHDESK_ID_THIRDPARTY,'CASHDESK_ID_THIRDPARTY','',1);
 print '</td></tr>';
 if ($conf->global->MAIN_MODULE_BANQUE)
 {
@@ -88,7 +93,7 @@ if ($conf->global->MAIN_MODULE_STOCK)
 	$var=!$var;
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskIdWareHouse").'</td>';
 	print '<td colspan="2">';
-	$formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE,'CASHDESK_ID_WAREHOUSE');
+	$formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE,'CASHDESK_ID_WAREHOUSE','',1);
 	print '</td></tr>';
 }