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

htdocs/comm/propal/list.php

@@ -1144,7 +1144,7 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
-	if (isModEnabled('categorie') && $user->hasRight('categorie', 'read') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
+	if (isModEnabled('categorie') && $user->hasRight('categorie', 'read') && ($user->hasRight('product', 'read') || $user->hasRight('service', 'read'))) {
 		$searchCategoryProductOperator = -1;
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$tmptitle = $langs->trans('IncludingProductWithTag');

htdocs/commande/card.php

@@ -695,20 +695,6 @@ if (empty($reshook)) {
 
 		$tva_tx = GETPOST('tva_tx', 'alpha');
 
-		// Prepare a price equivalent for minimum price check
-		$pu_equivalent = $pu_ht;
-		$pu_equivalent_ttc = $pu_ttc;
-		$currency_tx = $object->multicurrency_tx;
-
-		// Check if we have a foreing currency
-		// If so, we update the pu_equiv as the equivalent price in base currency
-		if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
-			$pu_equivalent = $pu_ht_devise * $currency_tx;
-		}
-		if ($pu_ttc == '' && $pu_ttc_devise != '' && $currency_tx != '') {
-			$pu_equivalent_ttc = $pu_ttc_devise * $currency_tx;
-		}
-
 		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS', 2);
 
 		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha'), '', 2) : 0);
@@ -1000,6 +986,20 @@ if (empty($reshook)) {
 			$fournprice = price2num(GETPOST('fournprice'.$predef) ? GETPOST('fournprice'.$predef) : '');
 			$buyingprice = price2num(GETPOST('buying_price'.$predef) != '' ? GETPOST('buying_price'.$predef) : ''); // If buying_price is '0', we muste keep this value
 
+			// Prepare a price equivalent for minimum price check
+			$pu_equivalent = $pu_ht;
+			$pu_equivalent_ttc = $pu_ttc;
+			$currency_tx = $object->multicurrency_tx;
+
+			// Check if we have a foreing currency
+			// If so, we update the pu_equiv as the equivalent price in base currency
+			if ($pu_ht == '' && $pu_ht_devise != '' && $currency_tx != '') {
+				$pu_equivalent = $pu_ht_devise * $currency_tx;
+			}
+			if ($pu_ttc == '' && $pu_ttc_devise != '' && $currency_tx != '') {
+				$pu_equivalent_ttc = $pu_ttc_devise * $currency_tx;
+			}
+
 			// Local Taxes
 			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
 			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty);

htdocs/imports/import.php

@@ -1147,7 +1147,7 @@ if ($step == 4 && $datatoimport) {
 		$entity = (!empty($objimport->array_import_entities[0][$code]) ? $objimport->array_import_entities[0][$code] : $objimport->array_import_icon[0]);
 
 		$entityicon = !empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity; // $entityicon must string name of picto of the field like 'project', 'company', 'contact', 'modulename', ...
-		$entitylang = $entitytolang[$entity] ? $entitytolang[$entity] : $objimport->array_import_label[0]; // $entitylang must be a translation key to describe object the field is related to, like 'Company', 'Contact', 'MyModyle', ...
+		$entitylang = !empty($entitytolang[$entity]) ? $entitytolang[$entity] : $objimport->array_import_label[0]; // $entitylang must be a translation key to describe object the field is related to, like 'Company', 'Contact', 'MyModyle', ...
 
 		print '<td class="nowraponall hideonsmartphone" style="font-weight: normal">=> </td>';
 		print '<td class="nowraponall" style="font-weight: normal">';

htdocs/install/step1.php

@@ -84,22 +84,34 @@ if (@file_exists($forcedfile)) {
 	// If forced install is enabled, replace the post values. These are empty because form fields are disabled.
 	if ($force_install_noedit) {
 		$main_dir = detect_dolibarr_main_document_root();
-		if (!empty($argv[1])) {
-			$main_dir = $argv[1]; // override when executing the script in command line
+		if (!empty($argv[3])) {
+			$main_dir = $argv[3]; // override when executing the script in command line
 		}
 		if (!empty($force_install_main_data_root)) {
 			$main_data_dir = $force_install_main_data_root;
 		} else {
 			$main_data_dir = detect_dolibarr_main_data_root($main_dir);
 		}
+		if (!empty($argv[4])) {
+			$main_data_dir = $argv[4]; // override when executing the script in command line
+		}
 		$main_url = detect_dolibarr_main_url_root();
+		if (!empty($argv[5])) {
+			$main_url = $argv[5]; // override when executing the script in command line
+		}
 
 		if (!empty($force_install_databaserootlogin)) {
 			$userroot = parse_database_login($force_install_databaserootlogin);
 		}
+		if (!empty($argv[6])) {
+			$userroot = $argv[6]; // override when executing the script in command line
+		}
 		if (!empty($force_install_databaserootpass)) {
 			$passroot = parse_database_pass($force_install_databaserootpass);
 		}
+		if (!empty($argv[7])) {
+			$passroot = $argv[7]; // override when executing the script in command line
+		}
 	}
 	if ($force_install_noedit == 2) {
 		if (!empty($force_install_type)) {

htdocs/langs/fr_FR/admin.lang

@@ -904,9 +904,9 @@ Permission609=Supprimer les étiquettes
 Permission611=Lire les attributs des variantes produits
 Permission612=Créer/mettre à jour les attributs des variantes produits
 Permission613=Supprimer les attributs des variantes produits
-Permission650=Lire les Nomenclatures (BOM)
-Permission651=Créer/modifier les Nomenclatures (BOM)
-Permission652=Supprimer les Nomenclatures (BOM)
+Permission651=Lire les Nomenclatures (BOM)
+Permission652=Créer/modifier les Nomenclatures (BOM)
+Permission653=Supprimer les Nomenclatures (BOM)
 Permission660=Lire les ordres de fabrication (OF)
 Permission661=Créer/mettre à jour les ordres de fabrication (OF)
 Permission662=Supprimer les ordres de fabrication (OF)