diff --git a/ChangeLog b/ChangeLog
index 1d5f7402645..a3b8e1193ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -170,6 +170,8 @@ Dolibarr better:
 - If you used warehouse/stock module, recheck setup of stock increase/decrease rules of the
   warehouse module and your Point Of Sale module if you use one.
 
+***** ChangeLog for 3.6.3 compared to 3.6.2 *****
+- Fix: ref_ext was not saved when recording a customer order from web service
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 06f381a41a9..b7207f0cd42 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -676,12 +676,13 @@ class Commande extends CommonOrder
         $sql.= ", entity";
         $sql.= ")";
         $sql.= " VALUES ('(PROV)',".$this->socid.", '".$this->db->idate($now)."', ".$user->id;
-        $sql.= ", ".($this->fk_project?$this->fk_project:"null");
+        $sql.= ", ".($this->fk_project>0?$this->fk_project:"null");
         $sql.= ", '".$this->db->idate($date)."'";
         $sql.= ", ".($this->source>=0 && $this->source != '' ?$this->source:'null');
         $sql.= ", '".$this->db->escape($this->note_private)."'";
         $sql.= ", '".$this->db->escape($this->note_public)."'";
-        $sql.= ", '".$this->db->escape($this->ref_client)."'";
+        $sql.= ", ".($this->ref_ext?"'".$this->db->escape($this->ref_ext)."'":"null");
+        $sql.= ", ".($this->ref_client?"'".$this->db->escape($this->ref_client)."'":"null");
         $sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
         $sql.= ", '".$this->modelpdf."'";
         $sql.= ", ".($this->cond_reglement_id>0?"'".$this->cond_reglement_id."'":"null");
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index b04e3abaa88..a0456f6b677 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -29,7 +29,11 @@
  *  \brief      File that include conf.php file and commons lib like functions.lib.php
  */
 
+<<<<<<< HEAD
 if (! defined('DOL_VERSION')) define('DOL_VERSION','3.7.0');
+=======
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.3');
+>>>>>>> refs/remotes/origin/3.6
 if (! defined('EURO')) define('EURO',chr(128));
 
 // Define syslog constants