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

htdocs/adherents/class/adherent.class.php

@@ -441,7 +441,7 @@ class Adherent extends CommonObject
 	 *  @param	string	$errors_to			erros to
 	 *  @param	string	$moreinheader		Add more html headers
 	 *  @deprecated since V18
-	 *  @see sendEmail
+	 *  @see sendEmail()
 	 *  @return	int							<0 if KO, >0 if OK
 	 */
 	public function send_an_email($text, $subject, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = -1, $errors_to = '', $moreinheader = '')

htdocs/comm/propal/list.php

@@ -196,7 +196,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
 	'p.ref'=>'Ref',
-	'p.ref_client'=>'CustomerRef',
+	'p.ref_client'=>'RefCustomer',
 	'pd.description'=>'Description',
 	's.nom'=>"ThirdParty",
 	's.name_alias'=>"AliasNameShort",

htdocs/core/modules/member/mod_member_advanced.php

@@ -122,7 +122,7 @@ class mod_member_advanced extends ModeleNumRefMembers
 	 *  Return next value
 	 *
 	 *  @param  Societe		$objsoc		Object third party
-	 *  @param  Member		$object		Object we need next value for
+	 *  @param  Adherent	$object		Object we need next value for
 	 *  @return	string					Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $object)

htdocs/core/modules/member/mod_member_simple.php

@@ -120,7 +120,7 @@ class mod_member_simple extends ModeleNumRefMembers
 	 *  Return next value
 	 *
 	 *  @param  Societe		$objsoc		Object third party
-	 *  @param  Member		$object		Object we need next value for
+	 *  @param  Adherent	$object		Object we need next value for
 	 *  @return	string					Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $object)

htdocs/core/modules/modFacture.class.php

@@ -239,7 +239,7 @@ class modFacture extends DolibarrModules
 		$this->import_fields_array[$r] = array(
 			'f.ref' => 'InvoiceRef*',
 			'f.ref_ext' => 'ExternalRef',
-			'f.ref_client' => 'CustomerRef',
+			'f.ref_client' => 'RefCustomer',
 			'f.type' => 'Type*',
 			'f.fk_soc' => 'Customer*',
 			'f.datec' => 'InvoiceDateCreation',

htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php

@@ -386,6 +386,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						}
 					}
 				}
+
+				// Extrafields in note
+				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+				if (!empty($extranote)) {
+					$notetoshow = dol_concatdesc($notetoshow, $extranote);
+				}
+
 				if ($notetoshow) {
 					$tab_top -= 2;
 

htdocs/expensereport/class/expensereport_ik.class.php

@@ -197,9 +197,9 @@ class ExpenseReportIk extends CommonObject
 		$default_range = (int) $userauthor->default_range; // if not defined, then 0
 		$ranges = $this->getRangesByCategory($fk_c_exp_tax_cat);
 		// prevent out of range -1 indice
-		$indice = $default_range > 0 ? $default_range - 1 : 0;
+		$indice = $default_range  - 1;
 		// substract 1 because array start from 0
-		if (empty($ranges) || !isset($ranges[$indice])) {
+		if (empty($ranges) || $indice < 0 || !isset($ranges[$indice])) {
 			return false;
 		} else {
 			return $ranges[$indice];

htdocs/langs/fr_FR/boxes.lang

@@ -52,7 +52,7 @@ BoxTitleOldestActionsToDo=Événements %s les plus anciens à faire, non termin
 BoxTitleLastContracts=Les %s derniers contrats modifiés
 BoxTitleLastModifiedDonations=Les %s derniers dons modifiés
 BoxTitleLastModifiedExpenses=Les %s dernières notes de frais modifiées
-BoxTitleLatestModifiedBoms=Les %s derières BOMS modifiées
+BoxTitleLatestModifiedBoms=Les %s dernières BOMS modifiées
 BoxTitleLatestModifiedMos=Les %s derniers ordres de fabrication modifiés
 BoxTitleLastOutstandingBillReached=Clients dont l'en-cours autorisé est dépassé
 BoxGlobalActivity=Activité globale (factures, propositions, commandes)