diff --git a/ChangeLog b/ChangeLog
index a8c32a72670..911775b0a54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,8 +24,8 @@ Following changes may create regressions for some external modules, but were nec
 * Removed hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless. 
 * Reference of object including a "/" are no more allowed. It is never used by default but to support setup that introduced it, the "/" will be replaced 
   by a "_" automatically when a reference (with a custom numbering mask that use it) is generated.  
-  
-  
+* Library jflot (replace with chartjs) and geoip (replaced with geoip2) were removed.  
+* Hidden constant COMMANDE_VALID_AFTER_CLOSE_PROPAL were renamed into ORDER_VALID_AFTER_CLOSE_PROPAL.
 
 ***** ChangeLog for 11.0.3 compared to 11.0.2 *****
 FIX: unit price for selected supplier products not set. NaN was used.
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index a4b4cdbfd11..4f5f8c8f1e1 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -931,7 +931,7 @@ class Commande extends CommonOrder
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -2;
 		}
-		if (!empty($conf->global->COMMANDE_REQUIRE_SOURCE) && $this->source < 0)
+		if (!empty($conf->global->ORDER_REQUIRE_SOURCE) && $this->source < 0)
 		{
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Source"));
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
@@ -1412,8 +1412,8 @@ class Commande extends CommonOrder
 
 			if (!$error)
 			{
-				// Ne pas passer par la commande provisoire
-				if ($conf->global->COMMANDE_VALID_AFTER_CLOSE_PROPAL == 1)
+				// Validate immediatly the order
+				if (! empty($conf->global->ORDER_VALID_AFTER_CLOSE_PROPAL))
 				{
 					$this->fetch($ret);
 					$this->valid($user);