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

htdocs/comm/multiprix.php

@@ -105,7 +105,10 @@ if ($_socid > 0)
 		print '<option value="'.$i.'"' ;
 		if($i == $objsoc->price_level)
 		print 'selected';
-		print '>'.$i.'</option>';
+		print '>'.$i;
+		$keyforlabel='PRODUIT_MULTIPRICES_LABEL'.$i;
+		if (! empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
+		print '</option>';
 	}
 	print '</select>';
 	print '</td></tr>';