Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0

htdocs/core/class/html.form.class.php

@@ -5312,6 +5312,7 @@ class Form
 				$i = 0;
 
 				print '<br><form action="" method="POST" name="LinkedOrder">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
 				print '<table class="noborder">';
 				print '<tr class="liste_titre">';
 				print '<td class="nowrap"></td>';

htdocs/expensereport/card.php

@@ -1813,7 +1813,7 @@ else
 						// Select project
 						if (! empty($conf->projet->enabled))
 						{
-    						print '<td align="center">';
+    						print '<td>';
     						$formproject->select_projects(-1, $fk_projet, 'fk_projet', 0, 0, 1, 1);
     						print '</td>';
 						}

htdocs/langs/en_US/admin.lang

@@ -179,7 +179,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -1602,4 +1602,4 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
-SamePriceAlsoForSharedCompanies=If you use the multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+SamePriceAlsoForSharedCompanies=If you use the multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
\ No newline at end of file