diff --git a/ChangeLog b/ChangeLog
index 1f5c8ce59e6..56c0d1fd06b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,27 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 6.0.4 compared to 6.0.3 *****
+FIX: #7737
+FIX: #7751
+FIX: #7756 Add better error message
+FIX: #7786
+FIX: #7806
+FIX: #7824
+FIX: add line bad price and ref
+FIX: A lot of several fix on local taxes and NPR tax
+FIX: createfromorder
+FIX: CSS for IE10
+FIX: external user cannot be set as internal
+FIX: Filter type on actioncomm with multiselect doesn't work
+FIX: list of donation not filtered on multicompany
+FIX: list of module not complete when module mb_strlen not available
+FIX: Locatax were not propagated when cloning order or proposal
+FIX: Searching translation should not be case sensitive
+FIX: Search into language is ok for file into external modules two.
+FIX: test for filter fk_status
+FIX: too much users on holiday list
+FIX: Wrong alias sql
 
 
 ***** ChangeLog for 7.0.0 compared to 6.0.* *****
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index fc824046a42..c25c6efd688 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2011 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2017      Frédéric France       <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -189,6 +190,6 @@ else
 	print $langs->trans("ErrorUnknown");
 }
 
-$db->close();
-
 llxFooter();
+
+$db->close();
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 4cc3b82c0c8..ad260ac6f66 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -211,9 +211,11 @@ OppStatusPENDING=Pending
 OppStatusWON=Won
 OppStatusLOST=Lost
 Budget=Budget
+AllowToLinkFromOtherCompany=Allow to link project from other company<br /><br /><u>Supported values :</u><br />- "all" : Link all projects<br />- A list of thirdparty id separated with commas : Link all projects with these thirdparty defined<br />Example : 11524,4795,53<br /><br />N.B.: Leave empty to disable this configuration
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
+
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index b9778b73a42..17091527e80 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -274,6 +274,12 @@ elseif ($action == 'updateoptions')
 		}
 	}
 }
+else if ($action == "linkOtherCompany")
+{
+	$projectToSelect = GETPOST('projectToSelect');
+	
+	dolibarr_set_const($db, 'PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY', $projectToSelect, 'chaine', 0, '', $conf->entity);	//Allow to disable this configuration if empty value
+}
 
 
 /*
@@ -912,37 +918,17 @@ print '</tr>';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("AllowToSelectProjectFromOtherCompany").'</td>';
 
-print '<td align="center">&nbsp;</td>';
-print '<td align="center">';
-echo ajax_constantonoff('PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY');
+print '<td align="right" width="60" colspan="2">';
+
+print '<form action="project.php" method="POST">';
+print '<input type="hidden" id="action" name="action" value="linkOtherCompany" />';
+print '<input type="text" id="projectToSelect" name="projectToSelect" value="'.$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.'"/>&nbsp;';
+print $form->textwithpicto('', $langs->trans('AllowToLinkFromOtherCompany'));
+print '<input type="submit" class="button" name="PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY" value="'.$langs->trans("Modify").'">';
+print '</form>';
 print '</td>';
-print '</tr>';
-
-/* Kept as hidden feature because this will be "probaly be supported by standard event feature in a future
-
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("AllowCommentOnProject").'</td>';
-
-print '<td align="center" width="300">';
-echo ajax_constantonoff('PROJECT_ALLOW_COMMENT_ON_PROJECT');
-print '</td>';
-print '<td align="center" width="20">&nbsp;</td>';
-print '</tr>';
-
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("AllowCommentOnTask").'</td>';
-
-print '<td align="center" width="300">';
-echo ajax_constantonoff('PROJECT_ALLOW_COMMENT_ON_TASK');
-print '</td>';
-print '<td align="center" width="20">&nbsp;</td>';
-print '</tr>';
-*/
 
 print '</table></form>';
 
-
-
-
 llxFooter();
 $db->close();