Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0

Conflicts:
	htdocs/product/composition/card.php

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

@@ -6051,7 +6051,7 @@ class Form
 			$urlforajaxcall = DOL_URL_ROOT.'/core/ajax/selectobject.php';
 
 			// No immediate load of all database
-			$urloption = 'htmlname='.$htmlname.'&outjson=1&objectdesc='.$objectdesc.'&filter='.urlencode($objecttmp->filter).($moreparams ? $moreparams : '');
+			$urloption = 'htmlname='.$htmlname.'&outjson=1&objectdesc='.$objectdesc.'&filter='.urlencode($objecttmp->filter);
 			// Activate the auto complete using ajax call.
 			$out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());
 			$out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';

htdocs/core/lib/ajax.lib.php

@@ -41,9 +41,10 @@
  *                                      - Ex: array('show'=> )
  *                                      - Ex: array('update_textarea'=> )
  *                                      - Ex: array('option_disabled'=> id to disable and warning to show if we select a disabled value (this is possible when using autocomplete ajax)
+ * @param string	$moreparams			More params provided to ajax call
  * @return string   					Script
  */
-function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLength = 2, $autoselect = 0, $ajaxoptions = array())
+function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLength = 2, $autoselect = 0, $ajaxoptions = array(), $moreparams = '')
 {
     if (empty($minLength)) $minLength = 1;
 
@@ -55,7 +56,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 
     // Input search_htmlname is original field
     // Input htmlname is a second input field used when using ajax autocomplete.
-	$script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />';
+	$script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" '.($moreparams ? $moreparams : '').' />';
 
 	$script .= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n";
 	$script .= '<script>'."\n";

htdocs/core/menus/standard/eldy.lib.php

@@ -1752,7 +1752,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if (empty($conf->global->PROJECT_HIDE_TASKS))
 				{
 					// Project affected to user
-					$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->rights->projet->lire);
+					$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->rights->projet->lire, '',  'project', 'tasks');
 					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
 					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->rights->projet->lire);
 				    $newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);

htdocs/langs/en_US/main.lang

@@ -353,8 +353,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)

htdocs/langs/fr_FR/main.lang

@@ -355,8 +355,8 @@ PriceUTTC=P.U TTC
 Amount=Montant
 AmountInvoice=Montant facture
 AmountInvoiced=Montant facturé
-AmountInvoicedHT=Montant facturé (TTC)
+AmountInvoicedHT=Montant facturé (HT)
-AmountInvoicedTTC=Montant facturé (HT)
+AmountInvoicedTTC=Montant facturé (TTC)
 AmountPayment=Montant paiement
 AmountHTShort=Montant HT
 AmountTTCShort=Montant TTC

htdocs/product/composition/card.php

@@ -66,7 +66,7 @@ if ($id > 0 || !empty($ref))
 
 if ($cancel) $action = '';
 
-// Action association d'un sousproduit
+// Add subproduct to product
 if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->service->creer))
 {
 	$error = 0;

htdocs/projet/info.php

@@ -63,7 +63,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $id = GETPOST("id", 'int');
 $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-$result = restrictedArea($user, 'projet', $id, '');
+$result = restrictedArea($user, 'projet', $id, 'projet&project');
 
 if (!$user->rights->projet->lire)	accessforbidden();