diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 85212d9c5ba..314aaff7177 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -503,7 +503,10 @@ if ($nboftargetok) {
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
 
-		$ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/install/mssql`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/install/mssql`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/install/sqlite3`;
+
+		$ret=`rm -fr $BUILDROOT/$PROJECT/node_modules`;
 
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ansible`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`;
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 90e779009de..4742aebfde0 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -547,9 +547,8 @@ if (empty($reshook))
 
 				if ($id > 0)
 				{
-					// Insertion contact par defaut si defini
-					if (GETPOST('contactid') > 0)
-					{
+					// Insert default contacts if defined
+					if (GETPOST('contactid') > 0) {
 						$result = $object->add_contact(GETPOST('contactid'), 'CUSTOMER', 'external');
 						if ($result < 0)
 						{
@@ -1344,7 +1343,8 @@ if (empty($reshook))
 		{
 			if ($object->id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-				$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
 			if ($result >= 0) {
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 4d70b11cdfe..af3679de945 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -79,7 +79,8 @@ if ($action == 'addcontact' && $user->rights->propale->creer)
 	if ($object->id > 0)
 	{
 		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
 	if ($result >= 0)
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index c37f9eff99f..16e53e0a23b 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -459,8 +459,7 @@ if (empty($reshook))
 			// Insert default contacts if defined
 			if ($object_id > 0)
 			{
-				if (GETPOST('contactid', 'int'))
-				{
+				if (GETPOST('contactid', 'int')) {
 					$result = $object->add_contact(GETPOST('contactid', 'int'), 'CUSTOMER', 'external');
 					if ($result < 0) {
 						setEventMessages($langs->trans("ErrorFailedToAddContact"), null, 'errors');
@@ -1367,7 +1366,8 @@ if (empty($reshook))
 		{
 			if ($object->id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-				$result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
+				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
 			if ($result >= 0) {
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index a3c31d4cf7b..7df7dbea130 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -56,7 +56,8 @@ if ($action == 'addcontact' && $user->rights->commande->creer)
 	if ($result > 0 && $id > 0)
 	{
 		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
 	if ($result >= 0)
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 01b5d4ea3a0..def74e173a3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2664,7 +2664,8 @@ if (empty($reshook))
 
 			if ($result > 0 && $id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-				$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
 			if ($result >= 0) {
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 57532174db7..6b8758bc472 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -62,7 +62,8 @@ if ($action == 'addcontact' && $user->rights->facture->creer)
 	if ($result > 0 && $id > 0)
 	{
 		$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
 	if ($result >= 0)
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 68582d2fb33..a92ac8a1e73 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -946,7 +946,8 @@ if (empty($reshook))
 		if ($action == 'addcontact')
 		{
 			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-			$result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
+			$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+			$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 
 			if ($result >= 0)
 			{
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 24b0ff54bf6..c837769819a 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -63,7 +63,8 @@ if ($action == 'addcontact' && $user->rights->contrat->creer)
 	if ($result > 0 && $id > 0)
 	{
 		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
 	if ($result >= 0)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index bc1c17d417f..6127319d537 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -936,11 +936,11 @@ abstract class CommonObject
 	/**
 	 *  Add a link between element $this->element and a contact
 	 *
-	 *  @param	int		$fk_socpeople       Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
-	 *  @param 	int		$type_contact 		Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL
-	 *  @param  string	$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
-	 *  @param  int		$notrigger			Disable all triggers
-	 *  @return int                 		<0 if KO, >0 if OK
+	 *  @param	int			$fk_socpeople       Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
+	 *  @param 	int|string	$type_contact 		Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL
+	 *  @param  string		$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
+	 *  @param  int			$notrigger			Disable all triggers
+	 *  @return int         	        		<0 if KO, >0 if OK
 	 */
 	public function add_contact($fk_socpeople, $type_contact, $source = 'external', $notrigger = 0)
 	{
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 05f29acb109..fc24f1aa02a 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -155,7 +155,7 @@ if ($permission)
 			<?php
 			$tmpobject = $object;
 			if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc;
-			$formcompany->selectTypeContact($tmpobject, $preselectedtypeofcontact, 'type', 'external', 'position', 0, 'minwidth100imp');
+			$formcompany->selectTypeContact($tmpobject, $preselectedtypeofcontact, 'typecontact', 'external', 'position', 0, 'minwidth100imp');
 			?>
 		</div>
 		<div class="tagtd noborderbottom">&nbsp;</div>
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 172455c2c35..07c0146c2a8 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -734,7 +734,8 @@ if (empty($reshook))
 			if ($result > 0 && $id > 0)
 			{
 				$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-				$result = $object->add_contact($contactid, GETPOST('type', 'int'), GETPOST('source', 'alpha'));
+				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
 			if ($result >= 0)
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 9b617d06f1b..bace3d10231 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -59,7 +59,8 @@ if ($action == 'addcontact' && $user->rights->ficheinter->creer)
 	if ($result > 0 && $id > 0)
 	{
 		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$result = $object->add_contact($contactid, GETPOST('type', 'int'), GETPOST('source', 'alpha'));
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
 	if ($result >= 0)
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index e03fae8857d..cf6543c96e0 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1432,7 +1432,8 @@ if (empty($reshook))
 			if ($object->id > 0)
 			{
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-				$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
 			if ($result >= 0)
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 08a40ad52b8..3e52f35d8bb 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -58,7 +58,8 @@ if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer)
 	if ($result > 0 && $id > 0)
 	{
 		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
 	if ($result >= 0)
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index e2b939dd14a..b439e5cad45 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1604,7 +1604,8 @@ if (empty($reshook))
 			if ($result > 0 && $id > 0)
 			{
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-				$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
 			if ($result >= 0)
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 83f145c4c6b..99010c977dc 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -58,7 +58,8 @@ if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer)
 	if ($result > 0 && $id > 0)
 	{
 		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
 	if ($result >= 0)
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 06a1d11955c..e298adcd40c 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -66,7 +66,8 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 	if ($result > 0 && $id > 0)
 	{
   		$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+  		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+  		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
 	if ($result >= 0)
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 3f44422f158..253c2c787e4 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -72,11 +72,13 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 				$contactsofproject = $projectstatic->getListContactId('internal');
 				foreach ($contactsofproject as $key => $val)
 				{
-					$result = $object->add_contact($val, GETPOST("type"), GETPOST("source"));
+					$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+					$result = $object->add_contact($val, $type, GETPOST("source", 'aZ09'));
 				}
 			}
 		} else {
-  			$result = $object->add_contact($idfortaskuser, GETPOST("type"), GETPOST("source"));
+			$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+			$result = $object->add_contact($idfortaskuser, $typeid, GETPOST("source", 'aZ09'));
 		}
 	}
 
@@ -449,6 +451,7 @@ if ($id > 0 || !empty($ref))
 		foreach (array('internal', 'external') as $source)
 		{
 			$tab = $object->liste_contact(-1, $source);
+
 			$num = count($tab);
 
 			$i = 0;
@@ -489,7 +492,7 @@ if ($id > 0 || !empty($ref))
 					$userstatic->photo = $tab[$i]['photo'];
 					$userstatic->login = $tab[$i]['login'];
 					$userstatic->email = $tab[$i]['email'];
-					$userstatic->statut = $tab[$i]['statucontact'];
+					$userstatic->statut = $tab[$i]['statuscontact'];
 
 					print $userstatic->getNomUrl(-1);
 				}
@@ -499,8 +502,7 @@ if ($id > 0 || !empty($ref))
 					$contactstatic->lastname = $tab[$i]['lastname'];
 					$contactstatic->firstname = $tab[$i]['firstname'];
 					$contactstatic->email = $tab[$i]['email'];
-					$contactstatic->statut = $tab[$i]['statucontact'];
-
+					$contactstatic->statut = $tab[$i]['statuscontact'];
 					print $contactstatic->getNomUrl(1);
 				}
 				print '</td>';
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index afce3dd9947..0330579f06c 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -55,7 +55,8 @@ if ($action == 'addcontact' && $user->rights->resource->write)
 	if ($result > 0 && $id > 0)
 	{
 		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$result = $object->add_contact($contactid, GETPOST('type', 'int'), GETPOST('source', 'alpha'));
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
 	if ($result >= 0)
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index c40de9060ef..0d1ae48e9e3 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -71,7 +71,8 @@ if ($action == 'addcontact' && $user->rights->societe->creer)
 	if ($result > 0 && $id > 0)
 	{
 		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
 	if ($result >= 0)
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index a7bb7f0e955..c67476f8c00 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -194,7 +194,8 @@ if (empty($reshook)) {
 				$type_contact = GETPOST("type", 'alpha');
 
 				if ($contactid > 0 && $type_contact) {
-					$result = $object->add_contact($contactid, GETPOST("type"), 'external');
+					$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+					$result = $object->add_contact($contactid, $typeid, 'external');
 				}
 
 				// altairis: link ticket to project
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index dacac9f5225..13419cf795e 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -71,7 +71,8 @@ if ($action == 'addcontact' && $user->rights->ticket->write) {
 
 	if ($result > 0 && ($id > 0 || (!empty($track_id)))) {
 		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-		$result = $object->add_contact($contactid, $type, $source);
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
 	if ($result >= 0) {